diff options
| author |  Liam Miller-Cushon <cushon@google.com> | 2015-10-19 20:42:20 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2015-10-20 16:36:36 +0000 |
| commit | 45dafc0fec2df4865dc27355d258ab7fd8706a82 (patch) | |
| tree | 436f844662b1b46dcfecb1ff2e57cdd5e1ac291c /src | |
| parent | e70fb66ae033981144bed6af533fd800c281d6b7 (diff) | |
Fix tests with precompiled jars in srcs
--
MOS_MIGRATED_REVID=105791077
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java index 734fdc6e3e..1ff708ef8e 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java @@ -115,7 +115,6 @@ import com.google.devtools.build.lib.skyframe.PrecomputedValue; import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor; import com.google.devtools.build.lib.skyframe.SkyValueDirtinessChecker; import com.google.devtools.build.lib.testutil.FoundationTestCase; -import com.google.devtools.build.lib.testutil.MoreAsserts; import com.google.devtools.build.lib.testutil.TestConstants; import com.google.devtools.build.lib.testutil.TestRuleClassProvider; import com.google.devtools.build.lib.util.BlazeClock; @@ -1106,8 +1105,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { */ protected void assertSameContentsWithCommonElements(Iterable<Artifact> artifacts, Iterable<String> common, String... expectedInputs) { - MoreAsserts.assertSameContents(Iterables.concat(Lists.newArrayList(expectedInputs), common), - ActionsTestUtil.prettyArtifactNames(artifacts)); + assertThat(Iterables.concat(Lists.newArrayList(expectedInputs), common)) + .containsExactlyElementsIn(ActionsTestUtil.prettyArtifactNames(artifacts)); } /** @@ -1116,8 +1115,8 @@ public abstract class BuildViewTestCase extends FoundationTestCase { */ protected void assertSameContentsWithCommonElements(Iterable<String> artifacts, String[] expectedInputs, Iterable<String> common) { - MoreAsserts.assertSameContents(Iterables.concat(Lists.newArrayList(expectedInputs), common), - artifacts); + assertThat(Iterables.concat(Lists.newArrayList(expectedInputs), common)) + .containsExactlyElementsIn(artifacts); } /** |