expectThrows has been renamed to assertThrows
More information: https://github.com/junit-team/junit5/issues/531
PiperOrigin-RevId: 186900384
diff --git a/src/test/java/com/google/devtools/build/lib/actions/ArtifactFactoryTest.java b/src/test/java/com/google/devtools/build/lib/actions/ArtifactFactoryTest.java
index 088740b..2475185 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/ArtifactFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/ArtifactFactoryTest.java
@@ -205,10 +205,10 @@
.getSourceArtifact(PathFragment.create("/foo"), absoluteRoot)
.getExecPath())
.isEqualTo(PathFragment.create("/foo"));
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IllegalArgumentException.class,
() -> artifactFactory.getSourceArtifact(PathFragment.create("/foo"), root));
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IllegalArgumentException.class,
() -> artifactFactory.getSourceArtifact(PathFragment.create("foo"), absoluteRoot));
}
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 a0261e9..13cdbc7 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
@@ -296,7 +296,7 @@
@Test
public void testWeirdArtifact() throws Exception {
Path execRoot = scratch.getFileSystem().getPath("/");
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IllegalArgumentException.class,
() ->
new Artifact(
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java b/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java
index 8980635..97fd4ef 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/platform/PlatformInfoTest.java
@@ -15,7 +15,7 @@
package com.google.devtools.build.lib.analysis.platform;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.expectThrows;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import com.google.common.testing.EqualsTester;
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
@@ -60,7 +60,7 @@
builder.addConstraint(ConstraintValueInfo.create(setting3, makeLabel("//constraint:value6")));
PlatformInfo.DuplicateConstraintException exception =
- expectThrows(PlatformInfo.DuplicateConstraintException.class, () -> builder.build());
+ assertThrows(PlatformInfo.DuplicateConstraintException.class, () -> builder.build());
assertThat(exception)
.hasMessageThat()
.contains(
diff --git a/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetFingerprintCacheTest.java b/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetFingerprintCacheTest.java
index cdf0a6f..2570af9 100644
--- a/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetFingerprintCacheTest.java
+++ b/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetFingerprintCacheTest.java
@@ -149,14 +149,14 @@
// Make sure a ParametrizedMapFn doesn't get blacklisted until it exceeds its instance count
cache.addNestedSetToFingerprint(new IntParametrizedMapFn(1), new Fingerprint(), nestedSet);
cache.addNestedSetToFingerprint(new IntParametrizedMapFn(2), new Fingerprint(), nestedSet);
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IllegalArgumentException.class,
() ->
cache.addNestedSetToFingerprint(
new IntParametrizedMapFn(3), new Fingerprint(), nestedSet));
// Make sure a capturing method reference gets blacklisted
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IllegalArgumentException.class,
() -> {
for (int i = 0; i < 2; ++i) {
@@ -166,7 +166,7 @@
});
// Do make sure that a capturing lambda gets blacklisted
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IllegalArgumentException.class,
() -> {
for (int i = 0; i < 2; ++i) {
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 2dceca7..da4d7e1 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 @@
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 @@
@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 @@
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 @@
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");
}
diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/PathPackageLocatorTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/PathPackageLocatorTest.java
index a9b224f..73c3c37 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/PathPackageLocatorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/PathPackageLocatorTest.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.lib.pkgcache;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.expectThrows;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import static org.junit.Assert.fail;
import com.google.common.collect.ImmutableList;
@@ -273,7 +273,7 @@
createBuildFile(nonExistentRoot1, "X");
// The package isn't found
// The package is found, because we didn't drop the root:
- expectThrows(
+ assertThrows(
NoSuchPackageException.class,
() -> locator.getPackageBuildFile(PackageIdentifier.createInMainRepo("X")));
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
index 694747b..814a46f 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java
@@ -19,7 +19,7 @@
import static com.google.common.truth.Truth.assertWithMessage;
import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.getFirstArtifactEndingWith;
import static com.google.devtools.build.lib.actions.util.ActionsTestUtil.prettyArtifactNames;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.expectThrows;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import com.google.common.base.Joiner;
import com.google.common.base.Predicate;
@@ -116,7 +116,7 @@
"--android_crosstool_top=//android/crosstool:everything");
AssertionError noToolchainError =
- expectThrows(AssertionError.class, () -> getConfiguredTarget("//test/skylark:test"));
+ assertThrows(AssertionError.class, () -> getConfiguredTarget("//test/skylark:test"));
assertThat(noToolchainError)
.hasMessageThat()
.contains("No default_toolchain found for cpu 'doesnotexist'");
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/LinuxSandboxUtilTest.java b/src/test/java/com/google/devtools/build/lib/runtime/LinuxSandboxUtilTest.java
index def19f9..7267551 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/LinuxSandboxUtilTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/LinuxSandboxUtilTest.java
@@ -15,7 +15,7 @@
package com.google.devtools.build.lib.runtime;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.expectThrows;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSortedMap;
@@ -37,7 +37,7 @@
ImmutableList<String> commandArguments = ImmutableList.of("echo", "hello, flo");
Exception e =
- expectThrows(
+ assertThrows(
IllegalStateException.class,
() ->
LinuxSandboxUtil.commandLineBuilder(linuxSandboxPath, commandArguments)
diff --git a/src/test/java/com/google/devtools/build/lib/shell/CommandResultTest.java b/src/test/java/com/google/devtools/build/lib/shell/CommandResultTest.java
index 3f26285..e66f05d 100644
--- a/src/test/java/com/google/devtools/build/lib/shell/CommandResultTest.java
+++ b/src/test/java/com/google/devtools/build/lib/shell/CommandResultTest.java
@@ -16,7 +16,7 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth8.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.expectThrows;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import java.time.Duration;
import org.junit.Test;
@@ -30,7 +30,7 @@
@Test
public void testBuilder_WithNoStderr() {
Exception e =
- expectThrows(
+ assertThrows(
IllegalStateException.class,
() ->
CommandResult.builder()
@@ -43,7 +43,7 @@
@Test
public void testBuilder_WithNoStdout() {
Exception e =
- expectThrows(
+ assertThrows(
IllegalStateException.class,
() ->
CommandResult.builder()
@@ -56,7 +56,7 @@
@Test
public void testBuilder_WithNoTerminationStatus() {
Exception e =
- expectThrows(
+ assertThrows(
IllegalStateException.class,
() ->
CommandResult.builder()
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/ObjectCodecsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/ObjectCodecsTest.java
index 15ff943..8abb4c8 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/ObjectCodecsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/ObjectCodecsTest.java
@@ -15,7 +15,7 @@
package com.google.devtools.build.lib.skyframe.serialization;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.expectThrows;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
@@ -233,7 +233,7 @@
ObjectCodecRegistry.newBuilder().setAllowDefaultCodec(false).build(),
ImmutableMap.of());
SerializationException.NoCodecException expected =
- expectThrows(
+ assertThrows(
SerializationException.NoCodecException.class, () -> underTest.serialize("X", "Y"));
assertThat(expected)
.hasMessageThat()
@@ -248,7 +248,7 @@
ObjectCodecRegistry.newBuilder().setAllowDefaultCodec(false).build(),
ImmutableMap.of());
SerializationException.NoCodecException expected =
- expectThrows(
+ assertThrows(
SerializationException.NoCodecException.class,
() -> underTest.deserialize(ByteString.copyFromUtf8("X"), serialized));
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
index 0524bb3..83d7e93 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
@@ -15,7 +15,7 @@
package com.google.devtools.build.lib.skylark;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.expectThrows;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
@@ -1599,9 +1599,8 @@
"my_rule(name = 'main', exe = ':tool.sh')"
);
- AssertionError expected = expectThrows(
- AssertionError.class,
- () -> createRuleContext("//third_party/foo:main"));
+ AssertionError expected =
+ assertThrows(AssertionError.class, () -> createRuleContext("//third_party/foo:main"));
assertThat(expected).hasMessageThat()
.contains("cfg parameter is mandatory when executable=True is provided.");
}
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
index 6d78fe5..edb8d48 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
@@ -16,7 +16,7 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.expectThrows;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import static org.junit.Assert.fail;
import com.google.common.collect.ImmutableList;
@@ -2088,8 +2088,7 @@
"main_rule(name='main')");
AssertionError expected =
- expectThrows(AssertionError.class,
- () -> getConfiguredTarget("//test:main"));
+ assertThrows(AssertionError.class, () -> getConfiguredTarget("//test:main"));
assertThat(expected).hasMessageThat()
.contains("invalid configuration fragment name 'notarealfragment'");
@@ -2114,8 +2113,7 @@
"main_rule(name='main')");
AssertionError expected =
- expectThrows(AssertionError.class,
- () -> getConfiguredTarget("//test:main"));
+ assertThrows(AssertionError.class, () -> getConfiguredTarget("//test:main"));
assertThat(expected).hasMessageThat()
.contains("has to declare 'apple' as a required fragment in target configuration");
@@ -2140,8 +2138,7 @@
"main_rule(name='main')");
AssertionError expected =
- expectThrows(AssertionError.class,
- () -> getConfiguredTarget("//test:main"));
+ assertThrows(AssertionError.class, () -> getConfiguredTarget("//test:main"));
assertThat(expected).hasMessageThat()
.contains("invalid configuration field name 'notarealfield' on fragment 'apple'");
@@ -2167,8 +2164,7 @@
"main_rule(name='main')");
AssertionError expected =
- expectThrows(AssertionError.class,
- () -> getConfiguredTarget("//test:main"));
+ assertThrows(AssertionError.class, () -> getConfiguredTarget("//test:main"));
assertThat(expected).hasMessageThat()
.contains("When an attribute value is a function, "
@@ -2195,8 +2191,7 @@
"main_rule(name='main')");
AssertionError expected =
- expectThrows(AssertionError.class,
- () -> getConfiguredTarget("//test:main"));
+ assertThrows(AssertionError.class, () -> getConfiguredTarget("//test:main"));
assertThat(expected).hasMessageThat()
.contains("argument 'default' has type 'SkylarkLateBoundDefault', but should be 'int'");
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java b/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java
index 3cd9099..36f8911 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/EnvironmentTest.java
@@ -15,7 +15,7 @@
package com.google.devtools.build.lib.syntax;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.expectThrows;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import static org.junit.Assert.fail;
import com.google.common.collect.ImmutableMap;
@@ -100,9 +100,7 @@
public void testBuilderRequiresSemantics() throws Exception {
try (Mutability mut = Mutability.create("test")) {
IllegalArgumentException expected =
- expectThrows(
- IllegalArgumentException.class,
- () -> Environment.builder(mut).build());
+ assertThrows(IllegalArgumentException.class, () -> Environment.builder(mut).build());
assertThat(expected).hasMessageThat()
.contains("must call either setSemantics or useDefaultSemantics");
}
@@ -366,9 +364,7 @@
private static void assertCheckStateFailsWithMessage(
Extension left, Object right, String substring) {
IllegalStateException expected =
- expectThrows(
- IllegalStateException.class,
- () -> left.checkStateEquals(right));
+ assertThrows(IllegalStateException.class, () -> left.checkStateEquals(right));
assertThat(expected).hasMessageThat().contains(substring);
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/MutabilityTest.java b/src/test/java/com/google/devtools/build/lib/syntax/MutabilityTest.java
index 63438cd..67c3e0e 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/MutabilityTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/MutabilityTest.java
@@ -15,7 +15,7 @@
package com.google.devtools.build.lib.syntax;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.devtools.build.lib.testutil.MoreAsserts.expectThrows;
+import static com.google.devtools.build.lib.testutil.MoreAsserts.assertThrows;
import com.google.devtools.build.lib.events.Location;
import com.google.devtools.build.lib.syntax.Mutability.Freezable;
@@ -45,9 +45,7 @@
private void assertCheckMutableFailsBecauseFrozen(Freezable value, Mutability mutability) {
MutabilityException expected =
- expectThrows(
- MutabilityException.class,
- () -> Mutability.checkMutable(value, mutability));
+ assertThrows(MutabilityException.class, () -> Mutability.checkMutable(value, mutability));
assertThat(expected).hasMessageThat().contains("trying to mutate a frozen object");
}
@@ -150,9 +148,7 @@
mutability.lock(dummy, locA);
mutability.lock(dummy, locB);
MutabilityException expected =
- expectThrows(
- MutabilityException.class,
- () -> Mutability.checkMutable(dummy, mutability));
+ assertThrows(MutabilityException.class, () -> Mutability.checkMutable(dummy, mutability));
assertThat(expected).hasMessageThat().contains(
"trying to mutate a locked object (is it currently being iterated over by a for loop or "
+ "comprehension?)\nObject locked at the following location(s): /a:1, /b:1");
@@ -167,9 +163,7 @@
mutability.lock(dummy, locA);
IllegalArgumentException expected =
- expectThrows(
- IllegalArgumentException.class,
- () -> mutability.unlock(dummy, locB));
+ assertThrows(IllegalArgumentException.class, () -> mutability.unlock(dummy, locB));
assertThat(expected).hasMessageThat().contains(
"trying to unlock an object for a location at which it was not locked (/b:1)");
}
@@ -194,9 +188,8 @@
DummyFreezable dummy = new DummyFreezable(mutability1);
IllegalArgumentException expected =
- expectThrows(
- IllegalArgumentException.class,
- () -> Mutability.checkMutable(dummy, mutability2));
+ assertThrows(
+ IllegalArgumentException.class, () -> Mutability.checkMutable(dummy, mutability2));
assertThat(expected).hasMessageThat().contains(
"trying to mutate an object from a different context");
}
@@ -209,9 +202,7 @@
Location loc = Location.fromPathFragment(PathFragment.create("/a"));
IllegalArgumentException expected =
- expectThrows(
- IllegalArgumentException.class,
- () -> mutability2.lock(dummy, loc));
+ assertThrows(IllegalArgumentException.class, () -> mutability2.lock(dummy, loc));
assertThat(expected).hasMessageThat().contains(
"trying to lock an object from a different context");
}
@@ -224,9 +215,7 @@
Location loc = Location.fromPathFragment(PathFragment.create("/a"));
IllegalArgumentException expected =
- expectThrows(
- IllegalArgumentException.class,
- () -> mutability2.unlock(dummy, loc));
+ assertThrows(IllegalArgumentException.class, () -> mutability2.unlock(dummy, loc));
assertThat(expected).hasMessageThat().contains(
"trying to unlock an object from a different context");
}
@@ -240,9 +229,7 @@
mutability1.lock(dummy, loc);
IllegalArgumentException expected =
- expectThrows(
- IllegalArgumentException.class,
- () -> mutability2.isLocked(dummy));
+ assertThrows(IllegalArgumentException.class, () -> mutability2.isLocked(dummy));
assertThat(expected).hasMessageThat().contains(
"trying to check the lock of an object from a different context");
}
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/MoreAsserts.java b/src/test/java/com/google/devtools/build/lib/testutil/MoreAsserts.java
index 54c1c46..85b3b79 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/MoreAsserts.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/MoreAsserts.java
@@ -441,17 +441,12 @@
}
/*
- * These methods will be in JUnit 4.13. Instead of patching Bazel's JUnit jar to contain the
+ * This method will be in JUnit 4.13. Instead of patching Bazel's JUnit jar to contain the
* <a href="https://github.com/junit-team/junit4/commit/bdb1799">patch</a>, we define it here.
* Once JUnit 4.13 is released, we will switcher callers to use org.junit.Assert#assertThrows
* instead. See https://github.com/bazelbuild/bazel/issues/3729.
*/
- public static void assertThrows(
- Class<? extends Throwable> expectedThrowable, ThrowingRunnable runnable) {
- expectThrows(expectedThrowable, runnable);
- }
-
- public static <T extends Throwable> T expectThrows(
+ public static <T extends Throwable> T assertThrows(
Class<T> expectedThrowable, ThrowingRunnable runnable) {
try {
runnable.run();
diff --git a/src/test/java/com/google/devtools/build/lib/unix/UnixPathEqualityTest.java b/src/test/java/com/google/devtools/build/lib/unix/UnixPathEqualityTest.java
index 2d81e13..003e309 100644
--- a/src/test/java/com/google/devtools/build/lib/unix/UnixPathEqualityTest.java
+++ b/src/test/java/com/google/devtools/build/lib/unix/UnixPathEqualityTest.java
@@ -93,8 +93,8 @@
Path a = unixFs.getPath("/a");
Path b = otherUnixFs.getPath("/b");
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> a.renameTo(b));
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> a.relativeTo(b));
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> a.createSymbolicLink(b));
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> a.renameTo(b));
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> a.relativeTo(b));
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> a.createSymbolicLink(b));
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
index 47ae76a..39c75ea 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/FileSystemTest.java
@@ -1087,12 +1087,12 @@
// Test the Paths
@Test
public void testGetPathOnlyAcceptsAbsolutePath() {
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> testFS.getPath("not-absolute"));
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> testFS.getPath("not-absolute"));
}
@Test
public void testGetPathOnlyAcceptsAbsolutePathFragment() {
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IllegalArgumentException.class, () -> testFS.getPath(PathFragment.create("not-absolute")));
}
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentTest.java b/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentTest.java
index 02446c0..9470604 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentTest.java
@@ -154,12 +154,12 @@
@Test
public void testGetChildRejectsInvalidBaseNames() {
PathFragment pf = create("../some/path");
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> pf.getChild("."));
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> pf.getChild(".."));
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> pf.getChild("x/y"));
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> pf.getChild("/y"));
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> pf.getChild("y/"));
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> pf.getChild(""));
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> pf.getChild("."));
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> pf.getChild(".."));
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> pf.getChild("x/y"));
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> pf.getChild("/y"));
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> pf.getChild("y/"));
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> pf.getChild(""));
}
@Test
@@ -307,13 +307,13 @@
assertThat(create("foo/bar/baz").subFragment(2).getPathString()).isEqualTo("baz");
assertThat(create("foo/bar/baz").subFragment(3).getPathString()).isEqualTo("");
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IndexOutOfBoundsException.class, () -> create("foo/bar/baz").subFragment(3, 2));
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IndexOutOfBoundsException.class, () -> create("foo/bar/baz").subFragment(4, 4));
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IndexOutOfBoundsException.class, () -> create("foo/bar/baz").subFragment(3, 2));
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IndexOutOfBoundsException.class, () -> create("foo/bar/baz").subFragment(4));
}
@@ -356,12 +356,12 @@
PathFragment.checkAllPathsAreUnder(ImmutableList.<PathFragment>of(), create("a"));
// Check fails when some path does not start with startingWithPath:
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IllegalArgumentException.class,
() -> PathFragment.checkAllPathsAreUnder(toPathsSet("a/b", "b/c"), create("a")));
// Check fails when some path is equal to startingWithPath:
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IllegalArgumentException.class,
() -> PathFragment.checkAllPathsAreUnder(toPathsSet("a/b", "a"), create("a")));
}
@@ -407,14 +407,14 @@
public void testToRelative() {
assertThat(create("/foo/bar").toRelative()).isEqualTo(create("foo/bar"));
assertThat(create("/").toRelative()).isEqualTo(create(""));
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> create("foo").toRelative());
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("foo").toRelative());
}
@Test
public void testGetDriveStr() {
assertThat(create("/foo/bar").getDriveStr()).isEqualTo("/");
assertThat(create("/").getDriveStr()).isEqualTo("/");
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> create("foo").getDriveStr());
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("foo").getDriveStr());
}
static List<PathFragment> toPaths(List<String> strs) {
@@ -540,8 +540,8 @@
assertThat(create("/a/b").getSegment(1)).isEqualTo("b");
assertThat(create("/a/b/c").getSegment(2)).isEqualTo("c");
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> create("").getSegment(0));
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> create("a/b").getSegment(2));
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("").getSegment(0));
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("a/b").getSegment(2));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentWindowsTest.java b/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentWindowsTest.java
index b2a8a52..e5347a1 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentWindowsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/PathFragmentWindowsTest.java
@@ -112,14 +112,14 @@
@Test
public void testRelativeTo() throws Exception {
assertThat(create("").relativeTo("").getPathString()).isEqualTo("");
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> create("").relativeTo("a"));
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("").relativeTo("a"));
assertThat(create("a").relativeTo("")).isEqualTo(create("a"));
assertThat(create("a").relativeTo("a").getPathString()).isEqualTo("");
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> create("a").relativeTo("b"));
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("a").relativeTo("b"));
assertThat(create("a/b").relativeTo("a")).isEqualTo(create("b"));
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> create("C:/").relativeTo(""));
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("C:/").relativeTo(""));
assertThat(create("C:/").relativeTo("C:/").getPathString()).isEqualTo("");
}
@@ -239,13 +239,13 @@
public void testToRelative() {
assertThat(create("C:/foo/bar").toRelative()).isEqualTo(create("foo/bar"));
assertThat(create("C:/").toRelative()).isEqualTo(create(""));
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> create("foo").toRelative());
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("foo").toRelative());
}
@Test
public void testGetDriveStr() {
assertThat(create("C:/foo/bar").getDriveStr()).isEqualTo("C:/");
assertThat(create("C:/").getDriveStr()).isEqualTo("C:/");
- MoreAsserts.expectThrows(IllegalArgumentException.class, () -> create("foo").getDriveStr());
+ MoreAsserts.assertThrows(IllegalArgumentException.class, () -> create("foo").getDriveStr());
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/vfs/RootTest.java b/src/test/java/com/google/devtools/build/lib/vfs/RootTest.java
index e9605b3..3588b38 100644
--- a/src/test/java/com/google/devtools/build/lib/vfs/RootTest.java
+++ b/src/test/java/com/google/devtools/build/lib/vfs/RootTest.java
@@ -62,7 +62,7 @@
assertThat(root.relativize(fs.getPath("/foo/bar"))).isEqualTo(PathFragment.create("bar"));
assertThat(root.relativize(PathFragment.create("/foo/bar")))
.isEqualTo(PathFragment.create("bar"));
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IllegalArgumentException.class, () -> root.relativize(PathFragment.create("foo")));
}
@@ -77,11 +77,11 @@
assertThat(root.relativize(fs.getPath("/foo"))).isEqualTo(PathFragment.create("/foo"));
assertThat(root.relativize(PathFragment.create("/foo"))).isEqualTo(PathFragment.create("/foo"));
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IllegalArgumentException.class, () -> root.getRelative(PathFragment.create("foo")));
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IllegalArgumentException.class, () -> root.getRelative(PathFragment.create("foo")));
- MoreAsserts.expectThrows(
+ MoreAsserts.assertThrows(
IllegalArgumentException.class, () -> root.relativize(PathFragment.create("foo")));
}
