diff options
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/actions')
9 files changed, 30 insertions, 33 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/actions/ActionExecutionStatusReporterTest.java b/src/test/java/com/google/devtools/build/lib/actions/ActionExecutionStatusReporterTest.java index 8af46e4aea..cbcac8d35b 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/ActionExecutionStatusReporterTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/ActionExecutionStatusReporterTest.java @@ -102,7 +102,7 @@ public class ActionExecutionStatusReporterTest { private void verifyOutput(String... lines) throws Exception { collector.clear(); statusReporter.showCurrentlyExecutingActions(""); - assertThat(Splitter.on("\n").omitEmptyStrings().trimResults().split( + assertThat(Splitter.on('\n').omitEmptyStrings().trimResults().split( Iterables.getOnlyElement(collector).getMessage().replaceAll(" +", " "))) .containsExactlyElementsIn(Arrays.asList(lines)).inOrder(); } @@ -110,7 +110,7 @@ public class ActionExecutionStatusReporterTest { private void verifyWarningOutput(String... lines) throws Exception { collector.clear(); statusReporter.warnAboutCurrentlyExecutingActions(); - assertThat(Splitter.on("\n").omitEmptyStrings().trimResults().split( + assertThat(Splitter.on('\n').omitEmptyStrings().trimResults().split( Iterables.getOnlyElement(collector).getMessage().replaceAll(" +", " "))) .containsExactlyElementsIn(Arrays.asList(lines)).inOrder(); } diff --git a/src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java b/src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java index d493e42b70..0ba34cb057 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/ArtifactTest.java @@ -281,8 +281,8 @@ public class ArtifactTest { new PathFragment("c")); fail(); } catch (IllegalArgumentException e) { - assertEquals("c: illegal execPath doesn't end with b/c at /a/b/c with root /a[derived]", - e.getMessage()); + assertThat(e).hasMessage( + "c: illegal execPath doesn't end with b/c at /a/b/c with root /a[derived]"); } } diff --git a/src/test/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElementTest.java b/src/test/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElementTest.java index 28f185c9d5..4a95baa4ce 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElementTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/ConcurrentMultimapWithHeadElementTest.java @@ -15,6 +15,7 @@ package com.google.devtools.build.lib.actions; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import com.google.common.testing.GcFinalization; @@ -39,7 +40,7 @@ public class ConcurrentMultimapWithHeadElementTest { @Test public void testSmoke() throws Exception { ConcurrentMultimapWithHeadElement<String, String> multimap = - new ConcurrentMultimapWithHeadElement<String, String>(); + new ConcurrentMultimapWithHeadElement<>(); assertEquals("val", multimap.putAndGet("key", "val")); assertEquals("val", multimap.get("key")); assertEquals("val", multimap.putAndGet("key", "val2")); @@ -53,29 +54,29 @@ public class ConcurrentMultimapWithHeadElementTest { @Test public void testDuplicate() throws Exception { ConcurrentMultimapWithHeadElement<String, String> multimap = - new ConcurrentMultimapWithHeadElement<String, String>(); + new ConcurrentMultimapWithHeadElement<>(); assertEquals("val", multimap.putAndGet("key", "val")); assertEquals("val", multimap.get("key")); assertEquals("val", multimap.putAndGet("key", "val")); multimap.remove("key", "val"); - assertEquals(null, multimap.get("key")); + assertNull(multimap.get("key")); } @Test public void testDuplicateWithEqualsObject() throws Exception { ConcurrentMultimapWithHeadElement<String, String> multimap = new ConcurrentMultimapWithHeadElement<>(); - assertEquals(new String("val"), multimap.putAndGet("key", new String("val"))); - assertEquals(new String("val"), multimap.get("key")); - assertEquals(new String("val"), multimap.putAndGet("key", new String("val"))); - multimap.remove("key", new String("val")); - assertEquals(null, multimap.get("key")); + assertEquals("val", multimap.putAndGet("key", "val")); + assertEquals("val", multimap.get("key")); + assertEquals("val", multimap.putAndGet("key", "val")); + multimap.remove("key", "val"); + assertNull(multimap.get("key")); } @Test public void testFailedRemoval() throws Exception { ConcurrentMultimapWithHeadElement<String, String> multimap = - new ConcurrentMultimapWithHeadElement<String, String>(); + new ConcurrentMultimapWithHeadElement<>(); assertEquals("val", multimap.putAndGet("key", "val")); multimap.remove("key", "val2"); assertEquals("val", multimap.get("key")); @@ -84,7 +85,7 @@ public class ConcurrentMultimapWithHeadElementTest { @Test public void testNotEmpty() throws Exception { ConcurrentMultimapWithHeadElement<String, String> multimap = - new ConcurrentMultimapWithHeadElement<String, String>(); + new ConcurrentMultimapWithHeadElement<>(); assertEquals("val", multimap.putAndGet("key", "val")); multimap.remove("key", "val2"); assertEquals("val", multimap.get("key")); @@ -94,9 +95,9 @@ public class ConcurrentMultimapWithHeadElementTest { public void testKeyRemoved() throws Exception { String key = new String("key"); ConcurrentMultimapWithHeadElement<String, String> multimap = - new ConcurrentMultimapWithHeadElement<String, String>(); + new ConcurrentMultimapWithHeadElement<>(); assertEquals("val", multimap.putAndGet(key, "val")); - WeakReference<String> weakKey = new WeakReference<String>(key); + WeakReference<String> weakKey = new WeakReference<>(key); multimap.remove(key, "val"); key = null; GcFinalization.awaitClear(weakKey); @@ -105,7 +106,7 @@ public class ConcurrentMultimapWithHeadElementTest { @Test public void testKeyRemovedAndAddedConcurrently() throws Exception { final ConcurrentMultimapWithHeadElement<String, String> multimap = - new ConcurrentMultimapWithHeadElement<String, String>(); + new ConcurrentMultimapWithHeadElement<>(); // Because we have two threads racing, run the test many times. Before fixed, there was a 90% // chance of failure in 10,000 runs. for (int i = 0; i < 10000; i++) { @@ -129,7 +130,7 @@ public class ConcurrentMultimapWithHeadElementTest { private class StressTester extends AbstractQueueVisitor { private final ConcurrentMultimapWithHeadElement<Boolean, Integer> multimap = - new ConcurrentMultimapWithHeadElement<Boolean, Integer>(); + new ConcurrentMultimapWithHeadElement<>(); private final AtomicInteger actionCount = new AtomicInteger(0); private StressTester() { diff --git a/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java b/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java index 50d0f25188..788ee82b21 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/ExecutableSymlinkActionTest.java @@ -14,6 +14,7 @@ package com.google.devtools.build.lib.actions; +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 static org.junit.Assert.assertTrue; @@ -81,7 +82,7 @@ public class ExecutableSymlinkActionTest { action.execute(createContext()); fail(); } catch (ActionExecutionException e) { - assertTrue(e.getMessage().contains("'some-dir' is not a file")); + assertThat(e.getMessage()).contains("'some-dir' is not a file"); } } diff --git a/src/test/java/com/google/devtools/build/lib/actions/FailActionTest.java b/src/test/java/com/google/devtools/build/lib/actions/FailActionTest.java index 7838fca951..4afc7bdaf6 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/FailActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/FailActionTest.java @@ -14,9 +14,9 @@ package com.google.devtools.build.lib.actions; +import static com.google.common.truth.Truth.assertThat; import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.NULL_ACTION_OWNER; import static com.google.devtools.build.lib.testutil.MoreAsserts.assertSameContents; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import static org.junit.Assert.fail; @@ -60,7 +60,7 @@ public class FailActionTest { failAction.execute(null); fail(); } catch (ActionExecutionException e) { - assertEquals(errorMessage, e.getMessage()); + assertThat(e).hasMessage(errorMessage); } } diff --git a/src/test/java/com/google/devtools/build/lib/actions/RootTest.java b/src/test/java/com/google/devtools/build/lib/actions/RootTest.java index c8fc14bf82..a88a3ef2e5 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/RootTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/RootTest.java @@ -19,6 +19,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import com.google.common.testing.EqualsTester; import com.google.devtools.build.lib.testutil.Scratch; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; @@ -122,8 +123,7 @@ public class RootTest { public void assertEqualsAndHashCode(boolean expected, Object a, Object b) { if (expected) { - assertTrue(a.equals(b)); - assertTrue(a.hashCode() == b.hashCode()); + new EqualsTester().addEqualityGroup(b, a).testEquals(); } else { assertFalse(a.equals(b)); assertFalse(a.hashCode() == b.hashCode()); diff --git a/src/test/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCacheTest.java b/src/test/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCacheTest.java index 5fc1f4f169..05b26fb9ec 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCacheTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/cache/CompactPersistentActionCacheTest.java @@ -77,7 +77,7 @@ public class CompactPersistentActionCacheTest { String key = "key"; putKey(key); ActionCache.Entry readentry = cache.get(key); - assertTrue(readentry != null); + assertNotNull(readentry); assertEquals(cache.get(key).toString(), readentry.toString()); assertFalse(mapFile.exists()); } @@ -102,7 +102,7 @@ public class CompactPersistentActionCacheTest { CompactPersistentActionCache newcache = new CompactPersistentActionCache(dataRoot, clock); ActionCache.Entry readentry = newcache.get(key); - assertTrue(readentry != null); + assertNotNull(readentry); assertEquals(cache.get(key).toString(), readentry.toString()); } diff --git a/src/test/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexerTest.java b/src/test/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexerTest.java index 7fc0cb1327..f18607c62f 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexerTest.java +++ b/src/test/java/com/google/devtools/build/lib/actions/cache/PersistentStringIndexerTest.java @@ -91,7 +91,7 @@ public class PersistentStringIndexerTest { private void assertContent() { for (int i = 0; i < psi.size(); i++) { if(mappings.get(i) != null) { - assertEquals(mappings.get(i), psi.getStringForIndex(i)); + assertThat(mappings).containsEntry(i, psi.getStringForIndex(i)); } } } @@ -295,7 +295,7 @@ public class PersistentStringIndexerTest { } // Corrupt the journal with a negative size value. - byte[] journalCopy = Arrays.copyOf(journalContent, journalContent.length); + byte[] journalCopy = journalContent.clone(); // Flip this bit to make the key size negative. journalCopy[95] = -2; FileSystemUtils.writeContent(journalPath, journalCopy); diff --git a/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java b/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java index 42780a60d9..340d176af3 100644 --- a/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java +++ b/src/test/java/com/google/devtools/build/lib/actions/util/TestAction.java @@ -152,15 +152,10 @@ public class TestAction extends AbstractAction { /** No-op action that has exactly one output, and can be a middleman action. */ public static class DummyAction extends TestAction { - private static final Runnable NOOP = new Runnable() { - @Override - public void run() {} - }; - private final MiddlemanType type; public DummyAction(Collection<Artifact> inputs, Artifact output, MiddlemanType type) { - super(NOOP, inputs, ImmutableList.of(output)); + super(NO_EFFECT, inputs, ImmutableList.of(output)); this.type = type; } |