Remove custom Robolectric util class.

We directly use Robolectric/ActivityController to
setup an FragmentActivity lifecycle.

So, I removed the custom Robolectric in robotests/testutils.

Change-Id: Ib93265f719e1eb9606c9ad6f05c1dd1957302e8b
Fixes: 111195450
Test: robotests

tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java

@@ -31,7 +31,6 @@ import com.android.settings.R;
 import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
 import com.android.settings.password.ChooseLockPassword.IntentBuilder;
 import com.android.settings.password.SetupChooseLockPassword.SetupChooseLockPasswordFragment;
-import com.android.settings.testutils.Robolectric;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
@@ -42,6 +41,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Shadows;
+import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
@@ -74,11 +74,12 @@ public class SetupChooseLockPasswordTest {
     @Test
     public void createActivity_shouldNotCrash() {
         // Basic sanity test for activity created without crashing
-        Robolectric.buildActivity(SetupChooseLockPassword.class,
+        final Intent intent =
                 SetupChooseLockPassword.modifyIntentForSetup(
                         application,
-                        new IntentBuilder(application).build()))
-                .setup().get();
+                        new IntentBuilder(application).build());
+
+        ActivityController.of(new SetupChooseLockPassword(), intent).setup().get();
     }
 
     @Test
@@ -119,7 +120,7 @@ public class SetupChooseLockPasswordTest {
         intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
 
         SetupChooseLockPassword activity =
-                Robolectric.buildActivity(SetupChooseLockPassword.class, intent).setup().get();
+                ActivityController.of(new SetupChooseLockPassword(), intent).setup().get();
 
         SetupChooseLockPasswordFragment fragment =
                 (SetupChooseLockPasswordFragment) activity.getSupportFragmentManager()
@@ -136,11 +137,12 @@ public class SetupChooseLockPasswordTest {
     }
 
     private SetupChooseLockPassword createSetupChooseLockPassword() {
-        Intent intent = SetupChooseLockPassword.modifyIntentForSetup(
-                application,
-                new IntentBuilder(application).build());
+        final Intent intent =
+                SetupChooseLockPassword.modifyIntentForSetup(
+                        application,
+                        new IntentBuilder(application).build());
         intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
-        return Robolectric.buildActivity(SetupChooseLockPassword.class, intent).setup().get();
+        return ActivityController.of(new SetupChooseLockPassword(), intent).setup().get();
     }
 
     @Implements(ChooseLockGenericController.class)

tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java

@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.robolectric.RuntimeEnvironment.application;
 
 import android.content.ComponentName;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.UserHandle;
 import android.view.View;
@@ -36,7 +37,6 @@ import com.android.settings.R;
 import com.android.settings.SetupRedactionInterstitial;
 import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment;
 import com.android.settings.password.ChooseLockPattern.IntentBuilder;
-import com.android.settings.testutils.Robolectric;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
@@ -47,6 +47,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Shadows;
+import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowPackageManager;
 import org.robolectric.util.ReflectionHelpers;
@@ -72,14 +73,13 @@ public class SetupChooseLockPatternTest {
                 PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                 PackageManager.DONT_KILL_APP);
 
-        mActivity = Robolectric.buildActivity(
-                SetupChooseLockPattern.class,
+        final Intent intent =
                 SetupChooseLockPattern.modifyIntentForSetup(
                         application,
                         new IntentBuilder(application)
                                 .setUserId(UserHandle.myUserId())
-                                .build()))
-                .setup().get();
+                                .build());
+        mActivity = ActivityController.of(new SetupChooseLockPattern(), intent).setup().get();
     }
 
     @Test
@@ -173,16 +173,17 @@ public class SetupChooseLockPatternTest {
 
     @Test
     public void skipButton_shouldNotBeVisible_duringFingerprintFlow() {
-        mActivity = Robolectric.buildActivity(
-                SetupChooseLockPattern.class,
+        final Intent intent =
                 SetupChooseLockPattern.modifyIntentForSetup(
                         application,
                         new IntentBuilder(application)
                                 .setUserId(UserHandle.myUserId())
                                 .setForFingerprint(true)
-                                .build()))
-                .setup().get();
+                                .build());
+
+        mActivity = ActivityController.of(new SetupChooseLockPattern(), intent).setup().get();
         Button skipButton = mActivity.findViewById(R.id.skip_button);
+
         assertThat(skipButton).isNotNull();
         assertThat(skipButton.getVisibility()).isEqualTo(View.GONE);
     }

tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java

@@ -22,7 +22,6 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
-import com.android.settings.testutils.Robolectric;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
@@ -32,6 +31,7 @@ import com.android.settings.testutils.shadow.ShadowUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)