PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Test Fix SettingRobolectricTest Fail"

Browse Source 
This reverts commit 818f77cd1f.

Reason for revert: Underlying issue fixed in ag/23454315.

Bug: b/275023433
Test: atest SettingsGlobalRoboTests

Change-Id: I1af272efd00b3c5bd35310512f5712d5d1c7d834
This commit is contained in:
Eric Rahm
2023-07-13 12:05:20 +00:00
parent 7cd9300c1d
commit 802b922593
142 changed files with 130 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java
View File

@@ -18,15 +18,11 @@ package com.android.settings.datetime.timezone;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import android.app.Activity;
import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.utils.ActivityControllerWrapper;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,8 +36,7 @@ public class BaseTimeZonePreferenceControllerTest {
@Before
public void setUp() {
mActivity = spy((Activity) ActivityControllerWrapper.setup(
Robolectric.buildActivity(Activity.class)).get());
mActivity = Robolectric.setupActivity(Activity.class);
}
@Test

5
tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java
View File

@@ -23,8 +23,6 @@ import android.icu.util.TimeZone;
import androidx.preference.Preference;
import com.android.settings.utils.ActivityControllerWrapper;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -38,8 +36,7 @@ public class FixedOffsetPreferenceControllerTest {
@Before
public void setUp() {
mActivity = (Activity) ActivityControllerWrapper.setup(
Robolectric.buildActivity(Activity.class)).get();
mActivity = Robolectric.setupActivity(Activity.class);
}
@Test

7
tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java
View File

@@ -18,14 +18,10 @@ package com.android.settings.datetime.timezone;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import android.app.Activity;
import androidx.preference.Preference;
import com.android.settings.utils.ActivityControllerWrapper;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -39,8 +35,7 @@ public class RegionPreferenceControllerTest {
@Before
public void setUp() {
mActivity = spy((Activity) ActivityControllerWrapper.setup(
Robolectric.buildActivity(Activity.class)).get());
mActivity = Robolectric.setupActivity(Activity.class);
}
@Test

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

@@ -33,7 +33,6 @@ 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.utils.ActivityControllerWrapper;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -143,8 +142,7 @@ public class RegionSearchPickerTest {
@Implements(Fragment.class)
public static class ShadowFragment {
private FragmentActivity mActivity = (FragmentActivity) ActivityControllerWrapper.setup(
Robolectric.buildActivity(FragmentActivity.class)).get();
private FragmentActivity mActivity = Robolectric.setupActivity(FragmentActivity.class);
@Implementation
public final FragmentActivity getActivity() {

5
tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java
View File

@@ -23,8 +23,6 @@ import android.icu.util.TimeZone;
import androidx.preference.Preference;
import com.android.settings.utils.ActivityControllerWrapper;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -38,8 +36,7 @@ public class RegionZonePreferenceControllerTest {
@Before
public void setUp() {
mActivity = (Activity) ActivityControllerWrapper.setup(
Robolectric.buildActivity(Activity.class)).get();
mActivity = Robolectric.setupActivity(Activity.class);
}
@Test