diff options
| author |  lberki <lberki@google.com> | 2017-06-01 10:05:42 +0200 |
|---|---|---|
| committer |  László Csomor <laszlocsomor@google.com> | 2017-06-01 14:08:58 +0200 |
| commit | 4a45ea8dfd5f10c2b5956784ceb2972713c271bc (patch) | |
| tree | 2466d3514af00ad97234efd91fb24d612c265a15 /src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java | |
| parent | 3c93e0e486ee93356acd0d5e02e65b20e71f31ac (diff) | |
Remove all imports of org.junit.Assert except for static imports of #fail().
RELNOTES: None.
PiperOrigin-RevId: 157685150
Diffstat (limited to 'src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java')
| -rw-r--r-- | src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java index e510cbfacd..8842f84b21 100644 --- a/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java +++ b/src/test/java/com/google/devtools/build/skyframe/MemoizingEvaluatorTest.java @@ -65,7 +65,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nullable; import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -2513,7 +2512,7 @@ public class MemoizingEvaluatorTest { public void runTest() { try { tester.eval(/*keepGoing=*/false, tops.toArray(new SkyKey[0])); - Assert.fail(); + fail(); } catch (InterruptedException e) { // Expected. } @@ -2887,7 +2886,7 @@ public class MemoizingEvaluatorTest { tester.invalidate(); try { tester.eval(/*keepGoing=*/false, value); - Assert.fail(); + fail(); } catch (InterruptedException e) { // Expected. } @@ -2986,7 +2985,7 @@ public class MemoizingEvaluatorTest { tester.invalidate(); try { tester.eval(/*keepGoing=*/false, tops.toArray(new SkyKey[0])); - Assert.fail(); + fail(); } catch (InterruptedException e) { // Expected. } @@ -3766,7 +3765,7 @@ public class MemoizingEvaluatorTest { tester.differencer.inject(ImmutableMap.of(key, val)); try { tester.evalAndGet("value"); - Assert.fail("injection over value with deps should have failed"); + fail("injection over value with deps should have failed"); } catch (IllegalStateException e) { assertThat(e).hasMessage( "existing entry for " + NODE_TYPE.getName() + ":value has deps: " @@ -3785,7 +3784,7 @@ public class MemoizingEvaluatorTest { tester.differencer.inject(ImmutableMap.of(key, val)); try { tester.evalAndGet("value"); - Assert.fail("injection over value with deps should have failed"); + fail("injection over value with deps should have failed"); } catch (IllegalStateException e) { assertThat(e).hasMessage( "existing entry for " + NODE_TYPE.getName() + ":value has deps: " |