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

Fix Robo test fail at NotificationAssistantPickerTest

Browse Source 
Fixes: 127764177
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NotificationAssistantPickerTest
Change-Id: I923a8c948c432fbb0b581a84f058a6d6bd0f7946
This commit is contained in:
Edgar Wang
2019-03-07 18:59:55 +08:00
parent 4b01c8468c
commit 5cbdce4b3f
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/robotests/src/com/android/settings/notification/NotificationAssistantPickerTest.java
View File

@@ -16,11 +16,11 @@
package com.android.settings.notification; package com.android.settings.notification;
import static org.junit.Assert.fail;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.RETURNS_SMART_NULLS; import static org.mockito.Mockito.RETURNS_SMART_NULLS;
@@ -40,16 +40,20 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.mockito.invocation.InvocationOnMock;
import org.robolectric.RobolectricTestRunner;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.mockito.invocation.InvocationOnMock;
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public class NotificationAssistantPickerTest { public class NotificationAssistantPickerTest {
private static final String TEST_PKG = "test.package";
private static final String TEST_SRV = "test.component";
private static final String TEST_CMP = TEST_PKG + "/" + TEST_SRV;
private static final String TEST_NAME = "Test name";
private static final ComponentName TEST_COMPONENT = ComponentName.unflattenFromString(TEST_CMP);
private NotificationAssistantPicker mFragment; private NotificationAssistantPicker mFragment;
@Mock @Mock
private Context mContext; private Context mContext;
@@ -57,15 +61,11 @@ public class NotificationAssistantPickerTest {
private PackageManager mPackageManager; private PackageManager mPackageManager;
@Mock @Mock
private NotificationBackend mNotificationBackend; private NotificationBackend mNotificationBackend;
private static final String TEST_PKG = "test.package";
private static final String TEST_SRV = "test.component";
private static final String TEST_CMP = TEST_PKG + "/" + TEST_SRV;
private static final String TEST_NAME = "Test name";
private static final ComponentName TEST_COMPONENT = ComponentName.unflattenFromString(TEST_CMP);
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
when(mContext.getPackageManager()).thenReturn(mPackageManager);
mFragment = new TestNotificationAssistantPicker(mContext, mPackageManager, mFragment = new TestNotificationAssistantPicker(mContext, mPackageManager,
mNotificationBackend); mNotificationBackend);
} }
@@ -132,7 +132,7 @@ public class NotificationAssistantPickerTest {
public void noDialogOnNoAssistantSelected() { public void noDialogOnNoAssistantSelected() {
when(mContext.getString(anyInt(), anyString())).thenAnswer( when(mContext.getString(anyInt(), anyString())).thenAnswer(
(InvocationOnMock invocation) -> { (InvocationOnMock invocation) -> {
return invocation.getArgument(1); return invocation.getArgument(1);
}); });
assertNull(mFragment.getConfirmationMessage( assertNull(mFragment.getConfirmationMessage(
new NotificationAssistantPicker.CandidateNone(mContext))); new NotificationAssistantPicker.CandidateNone(mContext)));