1 files changed, 19 insertions, 6 deletions
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowServiceManagerTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowServiceManagerTest.java
index 68778c584..8c172775c 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowServiceManagerTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowServiceManagerTest.java
@@ -19,11 +19,6 @@ import org.robolectric.annotation.Config;
 /** Tests for {@link ShadowServiceManager}. */
 @RunWith(AndroidJUnit4.class)
 public final class ShadowServiceManagerTest {
-  
-  @Test
-  public void getService_available_shouldReturnNonNull() {
-    assertThat(ServiceManager.getService(Context.INPUT_METHOD_SERVICE)).isNotNull();
-  }
 
   @Test
   @Config(sdk = VERSION_CODES.S)
@@ -32,12 +27,30 @@ public final class ShadowServiceManagerTest {
   }
 
   @Test
-  public void getService_unavailableService_shouldReturnNull() {
+  public void getService_available_shouldReturnNonNull() {
+    assertThat(ServiceManager.getService(Context.INPUT_METHOD_SERVICE)).isNotNull();
+  }
+
+  @Test
+  public void getService_unavailable_shouldReturnNull() {
     ShadowServiceManager.setServiceAvailability(Context.INPUT_METHOD_SERVICE, false);
+
     assertThat(ServiceManager.getService(Context.INPUT_METHOD_SERVICE)).isNull();
   }
 
   @Test
+  public void checkService_available_shouldReturnNonNull() {
+    assertThat(ServiceManager.checkService(Context.INPUT_METHOD_SERVICE)).isNotNull();
+  }
+
+  @Test
+  public void checkService_unavailable_shouldReturnNull() {
+    ShadowServiceManager.setServiceAvailability(Context.INPUT_METHOD_SERVICE, false);
+
+    assertThat(ServiceManager.checkService(Context.INPUT_METHOD_SERVICE)).isNull();
+  }
+
+  @Test
   public void getService_multipleThreads_binderRace() throws Exception {
     ExecutorService e = Executors.newFixedThreadPool(4);
     final AtomicReference<Exception> thrownException = new AtomicReference<>();