Merge "Settings: Annotate JUnit4 test with @Test"
This commit is contained in:
committed by
Android (Google) Code Review
commit
db88fb8de5
@@ -355,6 +355,7 @@ public class MasterClearTest {
|
|||||||
assertEquals(TEST_CONFIRMATION_CLASS, actualIntent.getComponent().getClassName());
|
assertEquals(TEST_CONFIRMATION_CLASS, actualIntent.getComponent().getClassName());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
public void testShowAccountCredentialConfirmation() {
|
public void testShowAccountCredentialConfirmation() {
|
||||||
// Finally mock out the startActivityForResultCall
|
// Finally mock out the startActivityForResultCall
|
||||||
doNothing().when(mMasterClear)
|
doNothing().when(mMasterClear)
|
||||||
|
@@ -61,6 +61,7 @@ import com.android.settingslib.wifi.WifiTrackerFactory;
|
|||||||
import com.google.common.collect.Lists;
|
import com.google.common.collect.Lists;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
|
import org.junit.Ignore;
|
||||||
import org.junit.Rule;
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
@@ -342,6 +343,8 @@ public class WifiSettingsUiTest {
|
|||||||
onView(withId(resourceId(ID, PASSWORD))).check(matches(isDisplayed()));
|
onView(withId(resourceId(ID, PASSWORD))).check(matches(isDisplayed()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Ignore("b/73796195")
|
||||||
|
@Test
|
||||||
public void onConnectedChanged_shouldNotFetchAPs() {
|
public void onConnectedChanged_shouldNotFetchAPs() {
|
||||||
setWifiState(WifiManager.WIFI_STATE_ENABLED);
|
setWifiState(WifiManager.WIFI_STATE_ENABLED);
|
||||||
when(mWifiTracker.isConnected()).thenReturn(true);
|
when(mWifiTracker.isConnected()).thenReturn(true);
|
||||||
|
Reference in New Issue
Block a user