1 files changed, 5 insertions, 17 deletions
diff --git a/javatests/dagger/android/support/AndroidSupportInjectionTest.java b/javatests/dagger/android/support/AndroidSupportInjectionTest.java
index f7d300992..25c5e9460 100644
--- a/javatests/dagger/android/support/AndroidSupportInjectionTest.java
+++ b/javatests/dagger/android/support/AndroidSupportInjectionTest.java
@@ -20,25 +20,21 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
 import android.app.Application;
-import android.os.Build;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
 import dagger.android.AndroidInjector;
 import dagger.android.HasAndroidInjector;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadows.support.v4.SupportFragmentTestUtil;
 
-@RunWith(AndroidJUnit4.class)
-// Robolectric requires Java9 to run API 29 and above, so use API 28 instead
-@Config(sdk = Build.VERSION_CODES.P)
+@RunWith(RobolectricTestRunner.class)
 public final class AndroidSupportInjectionTest {
   @Test
   public void injectFragment_simpleApplication() {
     Fragment fragment = new Fragment();
-    startFragment(fragment);
+    SupportFragmentTestUtil.startFragment(fragment);
 
     try {
       AndroidSupportInjection.inject(fragment);
@@ -60,7 +56,7 @@ public final class AndroidSupportInjectionTest {
   @Config(application = ApplicationReturnsNull.class)
   public void fragmentInjector_returnsNull() {
     Fragment fragment = new Fragment();
-    startFragment(fragment);
+    SupportFragmentTestUtil.startFragment(fragment);
 
     try {
       AndroidSupportInjection.inject(fragment);
@@ -79,12 +75,4 @@ public final class AndroidSupportInjectionTest {
       assertThat(e).hasMessageThat().contains("fragment");
     }
   }
-
-  void startFragment(Fragment fragment) {
-    Robolectric.setupActivity(FragmentActivity.class)
-        .getSupportFragmentManager()
-        .beginTransaction()
-        .add(fragment, "")
-        .commitNow();
-  }
 }