commit ffec1a0c68c8f38222e6bbddbf739f8777412d04
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 26 22:00:19 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 26 22:00:19 2018 +0000
tree 3027d828d8d9313efbf0473b7c35212071f9e073
parent 727ec42d8d0a98c774bebabbab870c308fc2c17e
parent 8123135388cb2e7699671a4b28226b5ed9ad2db3

Merge changes I8dcc30b0,I85292ad2,Ie0ab3534

* changes:
  Settings: Disable failing test
  Settings: Disable failing test
  Settings: Fix assertThat in tests

tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java

diff --git a/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java b/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java
index 77acb46..a1b2462 100644
--- a/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/PictureInPictureSettingsTest.java
@@ -38,6 +38,7 @@
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
@@ -84,6 +85,7 @@
         when(mUserManager.getProfiles(anyInt())).thenReturn(mUsers);
     }
 
+    @Ignore("b/73892555")
     @Test
     public void testCollectPipApps() {
         PackageInfo primaryP1 = createPackage("Calculator", true);
@@ -97,10 +99,11 @@
         mProfileUserPackages.add(profileP2);
 
         ArrayList<Pair<ApplicationInfo, Integer>> apps = mFragment.collectPipApps(PRIMARY_USER_ID);
-        assertThat(containsPackages(apps, primaryP1, profileP2));
-        assertThat(!containsPackages(apps, primaryP2, profileP1));
+        assertThat(containsPackages(apps, primaryP1, profileP2)).isTrue();
+        assertThat(containsPackages(apps, primaryP2, profileP1)).isFalse();
     }
 
+    @Ignore("b/73892683")
     @Test
     public void testAppSort() {
         PackageInfo primaryP1 = createPackage("Android", true);
@@ -119,7 +122,7 @@
 
         ArrayList<Pair<ApplicationInfo, Integer>> apps = mFragment.collectPipApps(PRIMARY_USER_ID);
         Collections.sort(apps, new PictureInPictureSettings.AppComparator(null));
-        assertThat(isOrdered(apps, primaryP1, profileP1, primaryP2, profileP2));
+        assertThat(isOrdered(apps, primaryP1, profileP1, primaryP2, profileP2)).isTrue();
     }
 
     private boolean containsPackages(ArrayList<Pair<ApplicationInfo, Integer>> apps,