Merge "Remove custom Robolectric util class."

tests/robotests/src/com/android/settings/MasterClearTest.java

@@ -18,7 +18,6 @@ package com.android.settings;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
@@ -51,7 +50,6 @@ import android.widget.ScrollView;
 
 import androidx.fragment.app.FragmentActivity;
 
-import com.android.settings.testutils.Robolectric;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowUtils;
 
@@ -61,6 +59,7 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowActivity;
@@ -358,8 +357,9 @@ public class MasterClearTest {
         when(mPackageManager.resolveActivity(any(), eq(0))).thenReturn(resolveInfo);
 
         Intent actualIntent = mMasterClear.getAccountConfirmationIntent();
-        assertEquals(TEST_CONFIRMATION_PACKAGE, actualIntent.getComponent().getPackageName());
+        assertThat(TEST_CONFIRMATION_PACKAGE).isEqualTo(
-        assertEquals(TEST_CONFIRMATION_CLASS, actualIntent.getComponent().getClassName());
+                actualIntent.getComponent().getPackageName());
+        assertThat(TEST_CONFIRMATION_CLASS).isEqualTo(actualIntent.getComponent().getClassName());
     }
 
     @Test

tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java

@@ -32,13 +32,13 @@ import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem;
 import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.ItemViewHolder;
 import com.android.settings.datetime.timezone.RegionSearchPicker.RegionItem;
 import com.android.settings.datetime.timezone.model.TimeZoneData;
-import com.android.settings.testutils.Robolectric;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import libcore.util.CountryZonesFinder;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;

tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java

@@ -29,13 +29,13 @@ import android.view.View;
 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.SettingsShadowResourcesImpl;
 
 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)

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()))
+                        new IntentBuilder(application).build());
-                .setup().get();
+
+        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(
+        final Intent intent =
-                application,
+                SetupChooseLockPassword.modifyIntentForSetup(
-                new IntentBuilder(application).build());
+                        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(
+        final Intent intent =
-                SetupChooseLockPattern.class,
                 SetupChooseLockPattern.modifyIntentForSetup(
                         application,
                         new IntentBuilder(application)
                                 .setUserId(UserHandle.myUserId())
-                                .build()))
+                                .build());
-                .setup().get();
+        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(
+        final Intent intent =
-                SetupChooseLockPattern.class,
                 SetupChooseLockPattern.modifyIntentForSetup(
                         application,
                         new IntentBuilder(application)
                                 .setUserId(UserHandle.myUserId())
                                 .setForFingerprint(true)
-                                .build()))
+                                .build());
-                .setup().get();
+
+        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)

tests/robotests/src/com/android/settings/testutils/Robolectric.java

@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils;
-
-
-import android.content.Intent;
-
-import androidx.fragment.app.FragmentActivity;
-
-import org.robolectric.android.controller.ActivityController;
-import org.robolectric.util.ReflectionHelpers;
-
-// TODO(b/111195450) - Duplicated from org.robolectric.Robolectric.
-@Deprecated
-public class Robolectric {
-
-    /**
-     * This method is internal and shouldn't be called by developers.
-     */
-    @Deprecated
-    public static void reset() {
-        // No-op- is now handled in the test runner. Users should not be calling this method anyway.
-    }
-
-    public static <T extends FragmentActivity> ActivityController<T> buildActivity(
-            Class<T> activityClass) {
-        return buildActivity(activityClass, null);
-    }
-
-    public static <T extends FragmentActivity> ActivityController<T> buildActivity(
-            Class<T> activityClass, Intent intent) {
-        return ActivityController.of(ReflectionHelpers.callConstructor(activityClass), intent);
-    }
-
-    public static <T extends FragmentActivity> T setupActivity(Class<T> activityClass) {
-        return buildActivity(activityClass).setup().get();
-    }
-}
-