Merge "Settings: Annotate JUnit4 test with @Test"

tests/robotests/src/com/android/settings/MasterClearTest.java

@@ -355,6 +355,7 @@ public class MasterClearTest {
         assertEquals(TEST_CONFIRMATION_CLASS, actualIntent.getComponent().getClassName());
     }
 
+    @Test
     public void testShowAccountCredentialConfirmation() {
         // Finally mock out the startActivityForResultCall
         doNothing().when(mMasterClear)

tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java

@@ -61,6 +61,7 @@ import com.android.settingslib.wifi.WifiTrackerFactory;
 import com.google.common.collect.Lists;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -342,6 +343,8 @@ public class WifiSettingsUiTest {
         onView(withId(resourceId(ID, PASSWORD))).check(matches(isDisplayed()));
     }
 
+    @Ignore("b/73796195")
+    @Test
     public void onConnectedChanged_shouldNotFetchAPs() {
         setWifiState(WifiManager.WIFI_STATE_ENABLED);
         when(mWifiTracker.isConnected()).thenReturn(true);