Migrate Java tests to Truth.
RELNOTES: None.
PiperOrigin-RevId: 157446717
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
index 21afd0a..26d7565 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
@@ -15,11 +15,7 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.devtools.build.lib.skyframe.FileArtifactValue.create;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
import static org.junit.Assert.fail;
import com.google.common.base.Predicate;
@@ -201,7 +197,7 @@
create(createDerivedArtifact("no-read"));
fail();
} catch (IOException e) {
- assertSame(exception, e);
+ assertThat(e).isSameAs(exception);
}
}
@@ -226,7 +222,7 @@
evaluateArtifactValue(createSourceArtifact("bad"));
fail();
} catch (MissingInputFileException e) {
- assertThat(e.getMessage()).contains(exception.getMessage());
+ assertThat(e).hasMessageThat().contains(exception.getMessage());
}
}
@@ -236,7 +232,7 @@
Path path = artifact.getPath();
writeFile(path, "hello"); //Non-empty file.
FileArtifactValue value = create(artifact);
- assertArrayEquals(path.getMD5Digest(), value.getDigest());
+ assertThat(value.getDigest()).isEqualTo(path.getMD5Digest());
try {
value.getModifiedTime();
fail("mtime for non-empty file should not be stored.");
@@ -252,8 +248,8 @@
FileSystemUtils.createDirectoryAndParents(path);
path.setLastModifiedTime(1L);
FileArtifactValue value = create(artifact);
- assertNull(value.getDigest());
- assertEquals(1L, value.getModifiedTime());
+ assertThat(value.getDigest()).isNull();
+ assertThat(value.getModifiedTime()).isEqualTo(1L);
}
// Empty files are the same as normal files -- mtime is not stored.
@@ -264,8 +260,8 @@
writeFile(path, "");
path.setLastModifiedTime(1L);
FileArtifactValue value = create(artifact);
- assertArrayEquals(path.getMD5Digest(), value.getDigest());
- assertEquals(0L, value.getSize());
+ assertThat(value.getDigest()).isEqualTo(path.getMD5Digest());
+ assertThat(value.getSize()).isEqualTo(0L);
}
@Test
@@ -326,10 +322,10 @@
TreeFileArtifact treeFileArtifact2 = createFakeTreeFileArtifact(artifact, "child2", "hello2");
TreeArtifactValue value = (TreeArtifactValue) evaluateArtifactValue(artifact);
- assertNotNull(value.getChildValues().get(treeFileArtifact1));
- assertNotNull(value.getChildValues().get(treeFileArtifact2));
- assertNotNull(value.getChildValues().get(treeFileArtifact1).getDigest());
- assertNotNull(value.getChildValues().get(treeFileArtifact2).getDigest());
+ assertThat(value.getChildValues().get(treeFileArtifact1)).isNotNull();
+ assertThat(value.getChildValues().get(treeFileArtifact2)).isNotNull();
+ assertThat(value.getChildValues().get(treeFileArtifact1).getDigest()).isNotNull();
+ assertThat(value.getChildValues().get(treeFileArtifact2).getDigest()).isNotNull();
}
@Test
@@ -349,10 +345,10 @@
ActionsTestUtil.createDummySpawnActionTemplate(artifact1, artifact2));
TreeArtifactValue value = (TreeArtifactValue) evaluateArtifactValue(artifact2);
- assertNotNull(value.getChildValues().get(treeFileArtifact1));
- assertNotNull(value.getChildValues().get(treeFileArtifact2));
- assertNotNull(value.getChildValues().get(treeFileArtifact1).getDigest());
- assertNotNull(value.getChildValues().get(treeFileArtifact2).getDigest());
+ assertThat(value.getChildValues().get(treeFileArtifact1)).isNotNull();
+ assertThat(value.getChildValues().get(treeFileArtifact2)).isNotNull();
+ assertThat(value.getChildValues().get(treeFileArtifact1).getDigest()).isNotNull();
+ assertThat(value.getChildValues().get(treeFileArtifact2).getDigest()).isNotNull();
}
@Test
@@ -377,10 +373,10 @@
ActionsTestUtil.createDummySpawnActionTemplate(artifact2, artifact3));
TreeArtifactValue value = (TreeArtifactValue) evaluateArtifactValue(artifact3);
- assertNotNull(value.getChildValues().get(treeFileArtifact1));
- assertNotNull(value.getChildValues().get(treeFileArtifact2));
- assertNotNull(value.getChildValues().get(treeFileArtifact1).getDigest());
- assertNotNull(value.getChildValues().get(treeFileArtifact2).getDigest());
+ assertThat(value.getChildValues().get(treeFileArtifact1)).isNotNull();
+ assertThat(value.getChildValues().get(treeFileArtifact2)).isNotNull();
+ assertThat(value.getChildValues().get(treeFileArtifact1).getDigest()).isNotNull();
+ assertThat(value.getChildValues().get(treeFileArtifact2).getDigest()).isNotNull();
}
private void file(Path path, String contents) throws Exception {
@@ -438,12 +434,12 @@
private void assertValueMatches(FileStatus file, byte[] digest, FileArtifactValue value)
throws IOException {
- assertEquals(file.getSize(), value.getSize());
+ assertThat(value.getSize()).isEqualTo(file.getSize());
if (digest == null) {
- assertNull(value.getDigest());
- assertEquals(file.getLastModifiedTime(), value.getModifiedTime());
+ assertThat(value.getDigest()).isNull();
+ assertThat(value.getModifiedTime()).isEqualTo(file.getLastModifiedTime());
} else {
- assertArrayEquals(digest, value.getDigest());
+ assertThat(value.getDigest()).isEqualTo(digest);
}
}
