Merge "Update Truth from 0.44 to 1.0" into androidx-master-dev
diff --git a/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt b/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
index 7826733..2a3e0c8 100644
--- a/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
@@ -83,7 +83,7 @@
const val OKHTTP_MOCKWEBSERVER = "com.squareup.okhttp3:mockwebserver:3.11.0"
const val REACTIVE_STREAMS = "org.reactivestreams:reactive-streams:1.0.0"
const val RX_JAVA = "io.reactivex.rxjava2:rxjava:2.2.9"
-const val TRUTH = "com.google.truth:truth:0.44"
+const val TRUTH = "com.google.truth:truth:1.0"
const val XERIAL = "org.xerial:sqlite-jdbc:3.25.2"
const val XPP3 = "xpp3:xpp3:1.1.4c"
const val XMLPULL = "xmlpull:xmlpull:1.1.3.1"
diff --git a/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/Camera2ConfigTest.java b/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/Camera2ConfigTest.java
index d9a2f18..e72f62f 100644
--- a/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/Camera2ConfigTest.java
+++ b/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/Camera2ConfigTest.java
@@ -117,7 +117,7 @@
Camera2Config config = new Camera2Config(builder.build());
assertThat(config.getCameraEventCallback(/*valueIfMissing=*/ null))
- .isSameAs(CAMERA_EVENT_CALLBACKS);
+ .isSameInstanceAs(CAMERA_EVENT_CALLBACKS);
}
@Test
diff --git a/camera/camera-core/src/androidTest/java/androidx/camera/core/SessionConfigTest.java b/camera/camera-core/src/androidTest/java/androidx/camera/core/SessionConfigTest.java
index db8164e..4524b79 100644
--- a/camera/camera-core/src/androidTest/java/androidx/camera/core/SessionConfigTest.java
+++ b/camera/camera-core/src/androidTest/java/androidx/camera/core/SessionConfigTest.java
@@ -108,7 +108,7 @@
sessionConfig.getRepeatingCaptureConfig().getSurfaces());
assertThat(surfaces.size()).isAtLeast(repeatingSurfaces.size());
- assertThat(surfaces).containsAllIn(repeatingSurfaces);
+ assertThat(surfaces).containsAtLeastElementsIn(repeatingSurfaces);
}
@Test
diff --git a/room/integration-tests/incremental-annotation-processing/src/test/kotlin/androidx/room/gradle/RoomIncrementalAnnotationProcessingTest.kt b/room/integration-tests/incremental-annotation-processing/src/test/kotlin/androidx/room/gradle/RoomIncrementalAnnotationProcessingTest.kt
index e921567..8b7b094 100644
--- a/room/integration-tests/incremental-annotation-processing/src/test/kotlin/androidx/room/gradle/RoomIncrementalAnnotationProcessingTest.kt
+++ b/room/integration-tests/incremental-annotation-processing/src/test/kotlin/androidx/room/gradle/RoomIncrementalAnnotationProcessingTest.kt
@@ -282,20 +282,20 @@
}
private fun assertFilesExist(vararg files: File) {
- expect.that(files.filter { it.exists() }).named("Existing files")
+ expect.withMessage("Existing files").that(files.filter { it.exists() })
.containsExactlyElementsIn(files)
}
private fun assertChangedFiles(vararg files: File) {
- expect.that(changedFiles).named("Changed files").containsAtLeastElementsIn(files)
+ expect.withMessage("Changed files").that(changedFiles).containsAtLeastElementsIn(files)
}
private fun assertUnchangedFiles(vararg files: File) {
- expect.that(unchangedFiles).named("Unchanged files").containsAtLeastElementsIn(files)
+ expect.withMessage("Unchanged files").that(unchangedFiles).containsAtLeastElementsIn(files)
}
private fun assertDeletedFiles(vararg files: File) {
- expect.that(deletedFiles).named("Deleted files").containsAtLeastElementsIn(files)
+ expect.withMessage("Deleted files").that(deletedFiles).containsAtLeastElementsIn(files)
}
private fun searchAndReplace(file: File, search: String, replace: String) {
