diff options
| author |  cushon <cushon@google.com> | 2018-02-24 14:05:37 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-24 14:07:29 -0800 |
| commit | 978cb00899ec7ddaa0512c6b5c8a2dae8bfc1146 (patch) | |
| tree | c458687c04e96432c0da9f2d6155062e57653739 /src/test/java/com/google/devtools/build/lib/packages | |
| parent | 9817539fbd399bbc2751d7527d3b1c0a104a5ad6 (diff) | |
expectThrows has been renamed to assertThrows
More information: https://github.com/junit-team/junit5/issues/531
PiperOrigin-RevId: 186900384
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/packages')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/SkylarkInfoTest.java | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkInfoTest.java b/src/test/java/com/google/devtools/build/lib/packages/SkylarkInfoTest.java index 2dceca75f6..da4d7e19d6 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/SkylarkInfoTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/SkylarkInfoTest.java @@ -16,7 +16,6 @@ package com.google.devtools.build.lib.packages; import static com.google.common.truth.Truth.assertThat; import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows; -import static com.google.devtools.build.lib.testutil.MoreAsserts.expectThrows; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -92,10 +91,12 @@ public class SkylarkInfoTest { @Test public void schemafulValuesMustMatchLayoutArity() throws Exception { SkylarkProvider provider = makeProvider(); - IllegalArgumentException expected = expectThrows( - IllegalArgumentException.class, - () -> SkylarkInfo.createSchemaful( - provider, layoutF1F2, new Object[]{4}, Location.BUILTIN)); + IllegalArgumentException expected = + assertThrows( + IllegalArgumentException.class, + () -> + SkylarkInfo.createSchemaful( + provider, layoutF1F2, new Object[] {4}, Location.BUILTIN)); assertThat(expected).hasMessageThat() .contains("Layout has length 2, but number of given values was 1"); } @@ -171,9 +172,8 @@ public class SkylarkInfoTest { SkylarkInfo info1 = makeSchemalessInfoWithF1F2Values(provider1, 4, 5); SkylarkInfo info2 = makeSchemalessInfoWithF1F2Values(provider2, 4, 5); EvalException expected = - expectThrows( - EvalException.class, - () -> info1.getConcatter().concat(info1, info2, Location.BUILTIN)); + assertThrows( + EvalException.class, () -> info1.getConcatter().concat(info1, info2, Location.BUILTIN)); assertThat(expected).hasMessageThat() .contains("Cannot use '+' operator on instances of different providers"); } @@ -184,9 +184,8 @@ public class SkylarkInfoTest { SkylarkInfo info1 = makeSchemalessInfoWithF1F2Values(provider1, 4, 5); SkylarkInfo info2 = makeSchemalessInfoWithF1F2Values(provider1, 4, null); EvalException expected = - expectThrows( - EvalException.class, - () -> info1.getConcatter().concat(info1, info2, Location.BUILTIN)); + assertThrows( + EvalException.class, () -> info1.getConcatter().concat(info1, info2, Location.BUILTIN)); assertThat(expected).hasMessageThat() .contains("Cannot use '+' operator on provider instances with overlapping field(s): f1"); } |