diff options
11 files changed, 36 insertions, 45 deletions
diff --git a/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/FakeZipFile.java b/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/FakeZipFile.java index 8b9bdf75bf..9b4a2dcb7c 100644 --- a/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/FakeZipFile.java +++ b/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/FakeZipFile.java @@ -17,7 +17,6 @@ package com.google.devtools.build.singlejar; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.junit.Assert.assertEquals; import com.google.devtools.build.singlejar.SingleJarTest.EntryMode; import java.io.ByteArrayInputStream; @@ -111,10 +110,10 @@ public final class FakeZipFile { assertThat(zipEntry).isNotNull(); switch (mode) { case EXPECT_DEFLATE: - assertEquals(ZipEntry.DEFLATED, zipEntry.getMethod()); + assertThat(zipEntry.getMethod()).isEqualTo(ZipEntry.DEFLATED); break; case EXPECT_STORED: - assertEquals(ZipEntry.STORED, zipEntry.getMethod()); + assertThat(zipEntry.getMethod()).isEqualTo(ZipEntry.STORED); break; default: // we don't care. diff --git a/src/test/java/com/google/devtools/build/lib/bazel/rules/genrule/GenRuleConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/bazel/rules/genrule/GenRuleConfiguredTargetTest.java index 154743bc52..645cb5bb73 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/rules/genrule/GenRuleConfiguredTargetTest.java +++ b/src/test/java/com/google/devtools/build/lib/bazel/rules/genrule/GenRuleConfiguredTargetTest.java @@ -18,8 +18,6 @@ import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.truth.Truth.assertThat; import static com.google.devtools.build.lib.testutil.TestConstants.GENRULE_SETUP; import static com.google.devtools.build.lib.testutil.TestConstants.GENRULE_SETUP_PATH; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import com.google.common.base.Predicate; @@ -485,11 +483,12 @@ public class GenRuleConfiguredTargetTest extends BuildViewTestCase { foundSrc = true; break; case "tool": - assertTrue(getHostConfiguration().equalsOrIsSupersetOf(prereq.getConfiguration())); + assertThat(getHostConfiguration().equalsOrIsSupersetOf(prereq.getConfiguration())) + .isTrue(); foundTool = true; break; case GENRULE_SETUP_PATH: - assertNull(prereq.getConfiguration()); + assertThat(prereq.getConfiguration()).isNull(); foundSetup = true; break; default: diff --git a/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java b/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java index 6b18d72a9c..c6b89f19c7 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/RuleClassTest.java @@ -25,7 +25,6 @@ import static com.google.devtools.build.lib.syntax.Type.BOOLEAN; import static com.google.devtools.build.lib.syntax.Type.INTEGER; import static com.google.devtools.build.lib.syntax.Type.STRING; import static com.google.devtools.build.lib.syntax.Type.STRING_LIST; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import com.google.common.base.Function; @@ -185,14 +184,14 @@ public class RuleClassTest extends PackageLoadingTestCase { assertThat(ruleClassA.getAttributeByName("my-sorted-stringlist-attr")) .isEqualTo(ruleClassA.getAttribute(6)); - assertEquals("", // default based on type - ruleClassA.getAttribute(0).getDefaultValue(null)); + // default based on type + assertThat(ruleClassA.getAttribute(0).getDefaultValue(null)).isEqualTo(""); assertThat(ruleClassA.getAttribute(1).getDefaultValue(null)) .isEqualTo(Label.parseAbsolute("//default:label")); assertThat(ruleClassA.getAttribute(2).getDefaultValue(null)).isEqualTo(Collections.emptyList()); assertThat(ruleClassA.getAttribute(3).getDefaultValue(null)).isEqualTo(42); - assertEquals(null, // default explicitly specified - ruleClassA.getAttribute(4).getDefaultValue(null)); + // default explicitly specified + assertThat(ruleClassA.getAttribute(4).getDefaultValue(null)).isNull(); assertThat(ruleClassA.getAttribute(5).getDefaultValue(null)).isEqualTo(Collections.emptyList()); assertThat(ruleClassA.getAttribute(6).getDefaultValue(null)).isEqualTo(Collections.emptyList()); } @@ -390,8 +389,8 @@ public class RuleClassTest extends PackageLoadingTestCase { assertThat(attributes.get("my-label-attr", BuildType.LABEL).toString()) .isEqualTo("//default:label"); assertThat(attributes.get("my-integer-attr", Type.INTEGER).intValue()).isEqualTo(42); - assertEquals("", // missing attribute -> default chosen based on type - attributes.get("my-string-attr", Type.STRING)); + // missing attribute -> default chosen based on type + assertThat(attributes.get("my-string-attr", Type.STRING)).isEmpty(); assertThat(attributes.get("my-labellist-attr", BuildType.LABEL_LIST)).isEmpty(); assertThat(attributes.get("my-stringlist-attr", Type.STRING_LIST)) .isEqualTo(Arrays.asList("foo", "bar")); diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java index 323ec54621..3273fb80f9 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CreateIncSymlinkActionTest.java @@ -16,7 +16,6 @@ package com.google.devtools.build.lib.rules.cpp; import static com.google.common.truth.Truth.assertThat; import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.NULL_ACTION_OWNER; -import static org.junit.Assert.assertEquals; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.Artifact; @@ -54,7 +53,7 @@ public class CreateIncSymlinkActionTest extends FoundationTestCase { d = new Artifact(PathFragment.create("d"), root); CreateIncSymlinkAction action2 = new CreateIncSymlinkAction(NULL_ACTION_OWNER, ImmutableMap.of(c, d, a, b), root.getPath()); - assertEquals(action1.computeKey(), action2.computeKey()); + assertThat(action2.computeKey()).isEqualTo(action1.computeKey()); } @Test @@ -100,7 +99,7 @@ public class CreateIncSymlinkActionTest extends FoundationTestCase { action.execute(null); symlink.stat(Symlinks.NOFOLLOW); assertThat(symlink.isSymbolicLink()).isTrue(); - assertEquals(symlink.readSymbolicLink(), b.getPath().asFragment()); + assertThat(b.getPath().asFragment()).isEqualTo(symlink.readSymbolicLink()); assertThat(rootDirectory.getRelative("a").exists()).isFalse(); } diff --git a/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java b/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java index caa4b42cd1..45ba27b47a 100644 --- a/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java +++ b/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java @@ -16,7 +16,6 @@ package com.google.devtools.build.lib.shell; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; import static com.google.devtools.build.lib.shell.TestUtil.assertArrayEquals; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import com.google.common.collect.ImmutableMap; @@ -397,10 +396,10 @@ public class CommandTest { assertThat(status.getTerminatingSignal()).isEqualTo(signal); switch (signal) { - case 1: assertEquals("Hangup", status.toShortString()); break; - case 2: assertEquals("Interrupt", status.toShortString()); break; - case 9: assertEquals("Killed", status.toShortString()); break; - case 15: assertEquals("Terminated", status.toShortString()); break; + case 1: assertThat(status.toShortString()).isEqualTo("Hangup"); break; + case 2: assertThat(status.toShortString()).isEqualTo("Interrupt"); break; + case 9: assertThat(status.toShortString()).isEqualTo("Killed"); break; + case 15: assertThat(status.toShortString()).isEqualTo("Terminated"); break; } } } 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 26d7565320..b8afb21ad9 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,7 +15,6 @@ package com.google.devtools.build.lib.skyframe; import static com.google.common.truth.Truth.assertThat; import static com.google.devtools.build.lib.skyframe.FileArtifactValue.create; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import com.google.common.base.Predicate; @@ -101,7 +100,7 @@ public class ArtifactFunctionTest extends ArtifactFunctionTestCase { @Test public void testMissingNonMandatoryArtifact() throws Throwable { Artifact input = createSourceArtifact("input1"); - assertNotNull(evaluateArtifactValue(input, /*mandatory=*/ false)); + assertThat(evaluateArtifactValue(input, /*mandatory=*/ false)).isNotNull(); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/syntax/LexerTest.java b/src/test/java/com/google/devtools/build/lib/syntax/LexerTest.java index bf9afdf2a3..bde212cc42 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/LexerTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/LexerTest.java @@ -14,7 +14,6 @@ package com.google.devtools.build.lib.syntax; import static com.google.common.truth.Truth.assertThat; -import static org.junit.Assert.assertEquals; import com.google.common.eventbus.EventBus; import com.google.devtools.build.lib.events.Event; @@ -421,11 +420,11 @@ public class LexerTest { @Test public void testTokenPositions() throws Exception { - // foo ( bar , { 1 : - assertEquals("[0,3) [3,4) [4,7) [7,8) [9,10) [10,11) [11,12)" - // 'quux' } ) NEWLINE EOF - + " [13,19) [19,20) [20,21) [20,21) [21,21)", - positions(tokens("foo(bar, {1: 'quux'})"))); + assertThat(positions(tokens("foo(bar, {1: 'quux'})"))).isEqualTo( + // foo ( bar , { 1 : + "[0,3) [3,4) [4,7) [7,8) [9,10) [10,11) [11,12)" + // 'quux' } ) NEWLINE EOF + + " [13,19) [19,20) [20,21) [20,21) [21,21)"); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/windows/WindowsFileSystemTest.java b/src/test/java/com/google/devtools/build/lib/windows/WindowsFileSystemTest.java index c66d9f3618..27261adea8 100644 --- a/src/test/java/com/google/devtools/build/lib/windows/WindowsFileSystemTest.java +++ b/src/test/java/com/google/devtools/build/lib/windows/WindowsFileSystemTest.java @@ -16,7 +16,6 @@ package com.google.devtools.build.lib.windows; import static com.google.common.truth.Truth.assertThat; import static com.google.devtools.build.lib.windows.WindowsFileSystem.SHORT_NAME_MATCHER; -import static org.junit.Assert.assertSame; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -290,8 +289,8 @@ public class WindowsFileSystemTest { assertThat(p.getPathString()).endsWith(longPath); assertThat(p).isEqualTo(fs.getPath(scratchRoot).getRelative(shortPath)); assertThat(p).isEqualTo(fs.getPath(scratchRoot).getRelative(longPath)); - assertSame(p, fs.getPath(scratchRoot).getRelative(shortPath)); - assertSame(p, fs.getPath(scratchRoot).getRelative(longPath)); + assertThat(fs.getPath(scratchRoot).getRelative(shortPath)).isSameAs(p); + assertThat(fs.getPath(scratchRoot).getRelative(longPath)).isSameAs(p); } @Test diff --git a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java index 78ab4a58aa..109b2fbac1 100644 --- a/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java @@ -21,7 +21,6 @@ import static com.google.devtools.build.lib.testutil.MoreAsserts.assertEventCoun import static com.google.devtools.build.lib.testutil.MoreAsserts.assertNoEvents; import static com.google.devtools.build.skyframe.EvaluationResultSubjectFactory.assertThatEvaluationResult; import static com.google.devtools.build.skyframe.GraphTester.CONCATENATE; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import com.google.common.base.Supplier; @@ -397,6 +396,7 @@ public class ParallelEvaluatorTest { SkyKey valueToEval = GraphTester.toSkyKey("a"); try { evaluator.eval(ImmutableList.of(valueToEval)); + fail("Expected RuntimeException"); } catch (RuntimeException re) { assertThat(re) .hasMessageThat() @@ -1671,7 +1671,7 @@ public class ParallelEvaluatorTest { } }); eval(/*keepGoing=*/false, topKey); - assertEquals(new StringValue("top"), eval(/*keepGoing=*/false, topKey)); + assertThat(eval(/*keepGoing=*/false, topKey)).isEqualTo(new StringValue("top")); } @Test diff --git a/tools/test/BUILD b/tools/test/BUILD index 419656dbeb..b9cd9077ff 100644 --- a/tools/test/BUILD +++ b/tools/test/BUILD @@ -26,6 +26,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib:vfs", "//src/test/java/com/google/devtools/build/lib:testutil", "//third_party:junit4", + "//third_party:truth", ], ) diff --git a/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/LcovMergerTest.java b/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/LcovMergerTest.java index 253164915d..f34e374f0a 100644 --- a/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/LcovMergerTest.java +++ b/tools/test/LcovMerger/javatests/com/google/devtools/lcovmerger/LcovMergerTest.java @@ -14,9 +14,7 @@ package com.google.devtools.lcovmerger; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static com.google.common.truth.Truth.assertThat; import com.google.devtools.build.lib.testutil.Scratch; import com.google.devtools.build.lib.vfs.FileSystemUtils; @@ -45,9 +43,9 @@ public class LcovMergerTest { File dir = new File("dir0"); LcovMerger merger = new LcovMerger(dir.getAbsolutePath(), merged.getAbsolutePath()); boolean success = merger.merge(); - assertFalse(success); + assertThat(success).isFalse(); - assertFalse(merged.exists()); + assertThat(merged.exists()).isFalse(); } @Test @@ -59,11 +57,11 @@ public class LcovMergerTest { File dir = new File("dir1"); LcovMerger merger = new LcovMerger(dir.getAbsolutePath(), merged.getAbsolutePath()); boolean success = merger.merge(); - assertTrue(success); + assertThat(success).isTrue(); - assertTrue(merged.exists()); + assertThat(merged.exists()).isTrue(); String readContent = new String(Files.readAllBytes(merged.toPath())).trim(); - assertEquals(content, readContent); + assertThat(readContent).isEqualTo(content); } @Test @@ -75,8 +73,8 @@ public class LcovMergerTest { File dir = new File("dir2"); LcovMerger merger = new LcovMerger(dir.getAbsolutePath(), merged.getAbsolutePath()); boolean success = merger.merge(); - assertFalse(success); + assertThat(success).isFalse(); - assertFalse(merged.exists()); + assertThat(merged.exists()).isFalse(); } } |