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

Fix broken DreamPickerControllerTest

Browse Source 
The dream infos are cached at the time the controller is created, so
ensure that we mock out the dream infos before building the controller
instance.

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.dream.DreamPickerControllerTest"
Bug: 215660413
Change-Id: Ie86f701a46dfc9a0ef185459a1dbf9016c1194fc
This commit is contained in:
Lucas Silva
2022-01-21 15:42:09 +00:00
parent c70c0f255a
commit b92fa1fdaa
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/robotests/src/com/android/settings/dream/DreamPickerControllerTest.java
View File

@@ -36,7 +36,6 @@ import com.android.settingslib.dream.DreamBackend.DreamInfo;
import com.android.settingslib.widget.LayoutPreference; import com.android.settingslib.widget.LayoutPreference;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Answers; import org.mockito.Answers;
@@ -48,9 +47,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Ignore
public class DreamPickerControllerTest { public class DreamPickerControllerTest {
private DreamPickerController mController;
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock(answer = Answers.RETURNS_DEEP_STUBS)
private DreamBackend mBackend; private DreamBackend mBackend;
private Context mContext; private Context mContext;
@@ -65,31 +62,36 @@ public class DreamPickerControllerTest {
mPreference = new LayoutPreference(mContext, R.layout.dream_picker_layout); mPreference = new LayoutPreference(mContext, R.layout.dream_picker_layout);
when(mScreen.findPreference(anyString())).thenReturn(mPreference); when(mScreen.findPreference(anyString())).thenReturn(mPreference);
}
mController = new DreamPickerController( private DreamPickerController buildController() {
final DreamPickerController controller = new DreamPickerController(
mContext, mContext,
/* preferenceKey= */ "test", /* preferenceKey= */ "test",
mBackend); mBackend);
controller.displayPreference(mScreen);
mController.displayPreference(mScreen); return controller;
} }
@Test @Test
public void isDisabledIfNoDreamsAvailable() { public void isDisabledIfNoDreamsAvailable() {
when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(0)); when(mBackend.getDreamInfos()).thenReturn(new ArrayList<>(0));
assertThat(mController.isAvailable()).isFalse(); final DreamPickerController controller = buildController();
assertThat(controller.isAvailable()).isFalse();
} }
@Test @Test
public void isEnabledIfDreamsAvailable() { public void isEnabledIfDreamsAvailable() {
when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(new DreamInfo())); when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(new DreamInfo()));
assertThat(mController.isAvailable()).isTrue(); final DreamPickerController controller = buildController();
assertThat(controller.isAvailable()).isTrue();
} }
@Test @Test
public void testDreamDisplayedInList() { public void testDreamDisplayedInList() {
when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(new DreamInfo())); when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(new DreamInfo()));
mController.updateState(mPreference); final DreamPickerController controller = buildController();
controller.updateState(mPreference);
RecyclerView view = mPreference.findViewById(R.id.dream_list); RecyclerView view = mPreference.findViewById(R.id.dream_list);
assertThat(view.getAdapter().getItemCount()).isEqualTo(1); assertThat(view.getAdapter().getItemCount()).isEqualTo(1);
@@ -102,7 +104,8 @@ public class DreamPickerControllerTest {
mockDreamInfo.isActive = true; mockDreamInfo.isActive = true;
when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(mockDreamInfo)); when(mBackend.getDreamInfos()).thenReturn(Collections.singletonList(mockDreamInfo));
mController.updateState(mPreference); final DreamPickerController controller = buildController();
controller.updateState(mPreference);
Button view = mPreference.findViewById(R.id.preview_button); Button view = mPreference.findViewById(R.id.preview_button);
view.performClick(); view.performClick();