Migrate away from deprecated Truth APIs. am: 59a51049b1 (e86a11b9) · Commits · e / os / android_packages_apps_DocumentsUI

tests/functional/com/android/documentsui/archives/ArchiveHandleTest.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -555,7 +555,7 @@ public class ArchiveHandleTest {
		"application/zip");

		assertThat(transformToIterable(archiveHandle.getEntries()))
		.containsAllIn(sExpectEntries);
		.containsAtLeastElementsIn(sExpectEntries);
		}

		@Test
		@@ -565,7 +565,7 @@ public class ArchiveHandleTest {
		"application/x-gtar");

		assertThat(transformToIterable(archiveHandle.getEntries()))
		.containsAllIn(sExpectEntries);
		.containsAtLeastElementsIn(sExpectEntries);
		}

		@Test
		@@ -575,7 +575,7 @@ public class ArchiveHandleTest {
		"application/x-compressed-tar");

		assertThat(transformToIterable(archiveHandle.getEntries()))
		.containsAllIn(sExpectEntries);
		.containsAtLeastElementsIn(sExpectEntries);
		}

		@Test
		@@ -585,7 +585,7 @@ public class ArchiveHandleTest {
		"application/x-bzip-compressed-tar");

		assertThat(transformToIterable(archiveHandle.getEntries()))
		.containsAllIn(sExpectEntries);
		.containsAtLeastElementsIn(sExpectEntries);
		}

		@Test
		@@ -595,7 +595,7 @@ public class ArchiveHandleTest {
		"application/x-brotli-compressed-tar");

		assertThat(transformToIterable(archiveHandle.getEntries()))
		.containsAllIn(sExpectEntries);
		.containsAtLeastElementsIn(sExpectEntries);
		}

		@Test
		@@ -605,6 +605,6 @@ public class ArchiveHandleTest {
		"application/x-xz-compressed-tar");

		assertThat(transformToIterable(archiveHandle.getEntries()))
		.containsAllIn(sExpectEntries);
		.containsAtLeastElementsIn(sExpectEntries);
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -157,7 +157,7 @@ public class UserIdManagerTest {
		// Returns the both if there are system and managed users.
		UserId currentUser = UserId.of(systemUser);
		initializeUserIdManager(currentUser, Arrays.asList(systemUser, managedUser1));
		assertThat(mUserIdManager.getUserIds()).isSameAs(mUserIdManager.getUserIds());
		assertThat(mUserIdManager.getUserIds()).isSameInstanceAs(mUserIdManager.getUserIds());
		}

		@Test

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,6 +67,6 @@ public class RootInfoTest {

		RootInfo copied = RootInfo.copyRootInfo(rootInfo);
		assertThat(copied).isEqualTo(rootInfo);
		assertThat(copied).isNotSameAs(rootInfo);
		assertThat(copied).isNotSameInstanceAs(rootInfo);
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ public class UserIdTest extends AndroidTestCase {
		when(mockContext.createPackageContextAsUser("android", 0, differentUserHandle)).thenReturn(
		expectedContext);

		assertThat(UserId.of(differentUserHandle).asContext(mockContext)).isSameAs(
		assertThat(UserId.of(differentUserHandle).asContext(mockContext)).isSameInstanceAs(
		expectedContext);
		}

+2 −10

Original line number	Diff line number	Diff line
		@@ -41,19 +41,11 @@ public class ProvidersAccessTest extends AndroidTestCase {

		private static final UserId OTHER_USER = UserId.of(UserId.DEFAULT_USER.getIdentifier() + 1);
		private static final Correspondence<RootInfo, RootInfo> USER_ID_MIME_TYPES_CORRESPONDENCE =
		new Correspondence<RootInfo, RootInfo>() {
		@Override
		public boolean compare(@Nullable RootInfo actual, @Nullable RootInfo expected) {
		Correspondence.from((@Nullable RootInfo actual, @Nullable RootInfo expected) -> {
		return actual != null && expected != null
		&& Objects.equals(actual.userId, expected.userId)
		&& Objects.equals(actual.derivedMimeTypes, expected.derivedMimeTypes);
		}

		@Override
		public String toString() {
		return "has same userId and mimeTypes as in";
		}
		};
		}, "has same userId and mimeTypes as in");

		private static RootInfo mNull = buildForMimeTypes((String[]) null);
		private static RootInfo mEmpty = buildForMimeTypes();