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

Test Fix SettingRobolectricTest Fail

Browse Source 
Bug: b/275023433
Test: NA
Change-Id: If2dcb8f6c196327129ccc9375b190e394c994efa
This commit is contained in:
Vincent Wang
2023-05-03 14:31:15 +00:00
parent cf440dcae5
commit 818f77cd1f
149 changed files with 552 additions and 131 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,11 +18,15 @@ 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;
@@ -36,7 +40,8 @@ public class BaseTimeZonePreferenceControllerTest {
@Before
public void setUp() {
mActivity = Robolectric.setupActivity(Activity.class);
mActivity = spy((Activity) ActivityControllerWrapper.setup(
Robolectric.buildActivity(Activity.class)).get());
}
@Test

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

@@ -23,6 +23,8 @@ 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;
@@ -36,7 +38,8 @@ public class FixedOffsetPreferenceControllerTest {
@Before
public void setUp() {
mActivity = Robolectric.setupActivity(Activity.class);
mActivity = (Activity) ActivityControllerWrapper.setup(
Robolectric.buildActivity(Activity.class)).get();
}
@Test

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

@@ -18,10 +18,14 @@ 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;
@@ -35,7 +39,8 @@ public class RegionPreferenceControllerTest {
@Before
public void setUp() {
mActivity = Robolectric.setupActivity(Activity.class);
mActivity = spy((Activity) ActivityControllerWrapper.setup(
Robolectric.buildActivity(Activity.class)).get());
}
@Test

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

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

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

@@ -23,6 +23,8 @@ 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;
@@ -36,7 +38,8 @@ public class RegionZonePreferenceControllerTest {
@Before
public void setUp() {
mActivity = Robolectric.setupActivity(Activity.class);
mActivity = (Activity) ActivityControllerWrapper.setup(
Robolectric.buildActivity(Activity.class)).get();
}
@Test