expectThrows was renamed to assertThrows

context: junit-team/junit4@627b85a Fixes #942 RELNOTES: N/A ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=186266107
google · Feb 20, 2018 · ebef066 · ebef066
1 parent 38ff1bc
commit ebef066
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 42 deletions.
diff --git a/annotation/src/test/java/com/google/errorprone/BugPatternValidatorTest.java b/annotation/src/test/java/com/google/errorprone/BugPatternValidatorTest.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.expectThrows;
 
 import com.google.errorprone.BugPattern.Category;
 import com.google.errorprone.BugPattern.LinkType;
@@ -197,7 +196,7 @@ final class BugPatternTestClass {}
 
     BugPattern annotation = BugPatternTestClass.class.getAnnotation(BugPattern.class);
     ValidationException e =
-        expectThrows(ValidationException.class, () -> BugPatternValidator.validate(annotation));
+        assertThrows(ValidationException.class, () -> BugPatternValidator.validate(annotation));
     assertThat(e.getMessage()).contains("Name must not contain whitespace");
   }
 }
diff --git a/check_api/src/test/java/com/google/errorprone/ErrorProneOptionsTest.java b/check_api/src/test/java/com/google/errorprone/ErrorProneOptionsTest.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.expectThrows;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.errorprone.ErrorProneOptions.Severity;
@@ -57,7 +56,7 @@ public void malformedOptionThrowsProperException() throws Exception {
     badArgs.forEach(
         arg -> {
           InvalidCommandLineOptionException expected =
-              expectThrows(
+              assertThrows(
                   InvalidCommandLineOptionException.class,
                   () -> ErrorProneOptions.processArgs(Arrays.asList(arg)));
           assertThat(expected.getMessage()).contains("invalid flag");

diff --git a/check_api/src/test/java/com/google/errorprone/apply/ImportStatementsTest.java b/check_api/src/test/java/com/google/errorprone/apply/ImportStatementsTest.java
@@ -17,8 +17,8 @@
 package com.google.errorprone.apply;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.expectThrows;
 
 import com.google.common.collect.ImmutableList;
 import com.sun.source.tree.TreeVisitor;
@@ -518,7 +518,7 @@ public OrganizedImports organizeImports(List<Import> imports) {
             });
 
     imports.add("import java.util.List");
-    IllegalStateException exception = expectThrows(IllegalStateException.class, imports::toString);
+    IllegalStateException exception = assertThrows(IllegalStateException.class, imports::toString);
     assertEquals(
         "Expected 1 import(s) in the organized imports but it contained 0", exception.getMessage());
   }

diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/AbstractExpectedExceptionChecker.java b/core/src/main/java/com/google/errorprone/bugpatterns/AbstractExpectedExceptionChecker.java
@@ -241,14 +241,12 @@ public Fix build(List<? extends StatementTree> throwingStatements) {
         return baseFix;
       }
       SuggestedFix.Builder fix = SuggestedFix.builder().merge(baseFix);
+      fix.addStaticImport("org.junit.Assert.assertThrows");
       StringBuilder fixPrefix = new StringBuilder();
-      if (newAsserts.isEmpty()) {
-        fix.addStaticImport("org.junit.Assert.assertThrows");
-        fixPrefix.append("assertThrows");
-      } else {
-        fix.addStaticImport("org.junit.Assert.expectThrows");
-        fixPrefix.append(String.format("%s thrown = expectThrows", exceptionClass));
+      if (!newAsserts.isEmpty()) {
+        fixPrefix.append(String.format("%s thrown = ", exceptionClass));
       }
+      fixPrefix.append("assertThrows");
       fixPrefix.append(String.format("(%s.class, () -> ", exceptionClass));
       boolean useExpressionLambda =
           throwingStatements.size() == 1

diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/AssertionFailureIgnored.java b/core/src/main/java/com/google/errorprone/bugpatterns/AssertionFailureIgnored.java
@@ -86,7 +86,7 @@ public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState
 
   // Provide a fix for one of the classic blunders:
   // rewrite `try { ..., fail(); } catch (AssertionError e) { ... }`
-  // to `AssertionError e = expectThrows(AssertionError.class, () -> ...); ...`.
+  // to `AssertionError e = assertThrows(AssertionError.class, () -> ...); ...`.
   private static Optional<Fix> buildFix(
       JCTry tryStatement, MethodInvocationTree tree, VisitorState state) {
     if (!ASTHelpers.getSymbol(tree).getSimpleName().contentEquals("fail")) {
@@ -132,13 +132,13 @@ private static Optional<Fix> buildFix(
                   state.getSourceForNode(catchTree.getParameter().getType())))
           .replace(endPosition, state.getEndPosition(catchTree), (expression ? "" : "}") + ");\n");
     } else {
-      fix.addStaticImport("org.junit.Assert.expectThrows")
+      fix.addStaticImport("org.junit.Assert.assertThrows")
           .prefixWith(tryStatement, state.getSourceForNode(catchTree.getParameter()))
           .replace(
               tryStatement.getStartPosition(),
               startPosition,
               String.format(
-                  " = expectThrows(%s.class, () -> ",
+                  " = assertThrows(%s.class, () -> ",
                   state.getSourceForNode(catchTree.getParameter().getType())))
           .replace(
               /* startPos= */ endPosition,

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/AssertionFailureIgnoredTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/AssertionFailureIgnoredTest.java
@@ -132,12 +132,11 @@ public void refactoring() throws IOException {
             "out/Test.java", //
             "import static com.google.common.truth.Truth.assertThat;",
             "import static org.junit.Assert.assertThrows;",
-            "import static org.junit.Assert.expectThrows;",
             "import java.io.IOException;",
             "import org.junit.Assert;",
             "class Test {",
             "  void f() {",
-            "    AssertionError t = expectThrows(AssertionError.class, () -> ",
+            "    AssertionError t = assertThrows(AssertionError.class, () -> ",
             "      System.err.println());",
             "    assertThat(t).isInstanceOf(AssertionError.class);",
             "    assertThrows(AssertionError.class, () -> ",
@@ -193,12 +192,11 @@ public void refactoringStatements() throws IOException {
             "out/Test.java", //
             "import static com.google.common.truth.Truth.assertThat;",
             "import static org.junit.Assert.assertThrows;",
-            "import static org.junit.Assert.expectThrows;",
             "import java.io.IOException;",
             "import org.junit.Assert;",
             "class Test {",
             "  void f() {",
-            "    AssertionError t = expectThrows(AssertionError.class, () -> {",
+            "    AssertionError t = assertThrows(AssertionError.class, () -> {",
             "      System.err.println();",
             "      System.err.println();",
             "    });",

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/ExpectedExceptionCheckerTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/ExpectedExceptionCheckerTest.java
@@ -59,7 +59,7 @@ public void expect() throws IOException {
             "out/ExceptionTest.java",
             "import static com.google.common.truth.Truth.assertThat;",
             "import static org.hamcrest.MatcherAssert.assertThat;",
-            "import static org.junit.Assert.expectThrows;",
+            "import static org.junit.Assert.assertThrows;",
             "",
             "import java.io.IOException;",
             "import java.nio.file.*;",
@@ -74,7 +74,7 @@ public void expect() throws IOException {
             "    if (true) {",
             "      Path p = Paths.get(\"NOSUCH\");",
             "      IOException thrown =",
-            "          expectThrows(IOException.class, () -> Files.readAllBytes(p));",
+            "          assertThrows(IOException.class, () -> Files.readAllBytes(p));",
             "      assertThat(thrown,",
             "          CoreMatchers.is(CoreMatchers.instanceOf(IOException.class)));",
             "      assertThat(thrown.getCause(),",
@@ -117,7 +117,7 @@ public void noExceptionType() throws IOException {
             "out/ExceptionTest.java",
             "import static com.google.common.truth.Truth.assertThat;",
             "import static org.hamcrest.MatcherAssert.assertThat;",
-            "import static org.junit.Assert.expectThrows;",
+            "import static org.junit.Assert.assertThrows;",
             "",
             "import java.io.IOException;",
             "import java.nio.file.*;",
@@ -131,7 +131,7 @@ public void noExceptionType() throws IOException {
             "  public void test() throws Exception {",
             "    Path p = Paths.get(\"NOSUCH\");",
             "    Files.readAllBytes(p);",
-            "    Throwable thrown = expectThrows(Throwable.class, () -> Files.readAllBytes(p));",
+            "    Throwable thrown = assertThrows(Throwable.class, () -> Files.readAllBytes(p));",
             "    assertThat(thrown, CoreMatchers.is(CoreMatchers.instanceOf(IOException.class)));",
             "  }",
             "}")
@@ -255,7 +255,7 @@ public void isA_hasCauseThat() throws IOException {
         .addOutputLines(
             "out/ExceptionTest.java",
             "import static com.google.common.truth.Truth.assertThat;",
-            "import static org.junit.Assert.expectThrows;",
+            "import static org.junit.Assert.assertThrows;",
             "",
             "import java.io.IOException;",
             "import java.nio.file.*;",
@@ -269,7 +269,7 @@ public void isA_hasCauseThat() throws IOException {
             "  public void test() throws Exception {",
             "    Path p = Paths.get(\"NOSUCH\");",
             "    IOException thrown =",
-            "        expectThrows(IOException.class, () -> Files.readAllBytes(p));",
+            "        assertThrows(IOException.class, () -> Files.readAllBytes(p));",
             "    assertThat(thrown).hasCauseThat().isInstanceOf(IOException.class);",
             "    assertThat(thrown).hasCauseThat().isInstanceOf(IOException.class);",
             "    assertThat(Files.exists(p)).isFalse();",
@@ -308,7 +308,7 @@ public void typedMatcher() throws IOException {
             "out/ExceptionTest.java",
             "import static com.google.common.truth.Truth.assertThat;",
             "import static org.hamcrest.MatcherAssert.assertThat;",
-            "import static org.junit.Assert.expectThrows;",
+            "import static org.junit.Assert.assertThrows;",
             "",
             "import java.io.IOException;",
             "import java.nio.file.*;",
@@ -323,7 +323,7 @@ public void typedMatcher() throws IOException {
             "  public void test() throws Exception {",
             "    Path p = Paths.get(\"NOSUCH\");",
             "    IOException thrown =",
-            "        expectThrows(IOException.class, () -> Files.readAllBytes(p));",
+            "        assertThrows(IOException.class, () -> Files.readAllBytes(p));",
             "    assertThat(thrown, matcher);",
             "    assertThat(Files.exists(p)).isFalse();",
             "  }",

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/JUnit4TestNotRunTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/JUnit4TestNotRunTest.java
@@ -198,14 +198,14 @@ public void containsExpectAsIdentifier_shouldBeTest() {
     compilationHelper
         .addSourceLines(
             "Test.java",
-            "import static org.junit.Assert.expectThrows;",
+            "import static org.junit.Assert.assertThrows;",
             "import org.junit.runner.RunWith;",
             "import org.junit.runners.JUnit4;",
             "@RunWith(JUnit4.class)",
             "public class Test {",
             "  // BUG: Diagnostic contains: @Test",
             "  public void shouldDoSomething() {",
-            "    expectThrows(null, null);",
+            "    assertThrows(null, null);",
             "  }",
             "}")
         .doTest();
@@ -223,7 +223,7 @@ public void containsQualifiedExpect_shouldBeTest() {
             "public class Test {",
             "  // BUG: Diagnostic contains: @Test",
             "  public void shouldDoSomething() {",
-            "    Assert.expectThrows(null, null);",
+            "    Assert.assertThrows(null, null);",
             "  }",
             "}")
         .doTest();

diff --git a/core/src/test/java/com/google/errorprone/scanner/ScannerSupplierTest.java b/core/src/test/java/com/google/errorprone/scanner/ScannerSupplierTest.java
@@ -22,7 +22,7 @@
 import static com.google.errorprone.BugPattern.SeverityLevel.ERROR;
 import static com.google.errorprone.scanner.BuiltInCheckerSuppliers.getSuppliers;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.Assert.expectThrows;
+import static org.junit.Assert.assertThrows;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Predicates;
@@ -161,7 +161,7 @@ public void plusDisallowsDuplicates() throws Exception {
     ScannerSupplier ss2 = ScannerSupplier.fromBugCheckerClasses(OtherArrayEquals.class);
 
     IllegalArgumentException thrown =
-        expectThrows(IllegalArgumentException.class, () -> ss1.plus(ss2));
+        assertThrows(IllegalArgumentException.class, () -> ss1.plus(ss2));
     assertThat(thrown)
         .hasMessageThat()
         .contains(
@@ -198,7 +198,7 @@ public void plusDisallowsDifferentSeverities() throws Exception {
     ScannerSupplier ss2 = ScannerSupplier.fromBugCheckerClasses(class2);
 
     IllegalArgumentException thrown =
-        expectThrows(IllegalArgumentException.class, () -> ss1.plus(ss2));
+        assertThrows(IllegalArgumentException.class, () -> ss1.plus(ss2));
 
     assertThat(class1).isNotEqualTo(class2);
     assertThat(thrown)
@@ -468,7 +468,7 @@ public void applyOverridesThrowsExceptionWhenDisablingNonDisablableCheck() throw
         ErrorProneOptions.processArgs(ImmutableList.of("-Xep:ArrayEquals:OFF"));
 
     InvalidCommandLineOptionException exception =
-        expectThrows(InvalidCommandLineOptionException.class, () -> ss.applyOverrides(epOptions));
+        assertThrows(InvalidCommandLineOptionException.class, () -> ss.applyOverrides(epOptions));
     assertThat(exception.getMessage()).contains("may not be disabled");
   }
 
@@ -481,7 +481,7 @@ public void applyOverridesThrowsExceptionWhenDemotingNonDisablableCheck() throws
         ErrorProneOptions.processArgs(ImmutableList.of("-Xep:ArrayEquals:WARN"));
 
     InvalidCommandLineOptionException exception =
-        expectThrows(InvalidCommandLineOptionException.class, () -> ss.applyOverrides(epOptions));
+        assertThrows(InvalidCommandLineOptionException.class, () -> ss.applyOverrides(epOptions));
     assertThat(exception.getMessage()).contains("may not be demoted to a warning");
   }
 
@@ -613,7 +613,7 @@ public void disablingPackageLocation_unsuppressible() throws Exception {
         ErrorProneOptions.processArgs(ImmutableList.of("-Xep:PackageLocation:OFF"));
 
     InvalidCommandLineOptionException exception =
-        expectThrows(InvalidCommandLineOptionException.class, () -> ss.applyOverrides(epOptions));
+        assertThrows(InvalidCommandLineOptionException.class, () -> ss.applyOverrides(epOptions));
     assertThat(exception.getMessage()).contains("may not be disabled");
   }
 

diff --git a/docs/bugpattern/AssertionFailureIgnored.md b/docs/bugpattern/AssertionFailureIgnored.md
@@ -11,15 +11,15 @@ try {
 }
 ```
 
-To avoid this issue, prefer JUnit's `assertThrows()` or `expectThrows()` API:
+To avoid this issue, prefer JUnit's `assertThrows()` API:
 
 ```java
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.expectThrows;
+import static org.junit.Assert.assertThrows;
 
 @Test
 public void testFailsWithAssertionError() {
-  AssertionError thrown = expectThrows(
+  AssertionError thrown = assertThrows(
       AssertionError.class,
       () -> {
         doSomething();

diff --git a/docs/bugpattern/ExpectedExceptionChecker.md b/docs/bugpattern/ExpectedExceptionChecker.md
@@ -18,16 +18,16 @@ public void testRemoveFails() {
 }
 ```
 
-To avoid this issue, prefer JUnit's `assertThrows()` or `expectThrows()` API:
+To avoid this issue, prefer JUnit's `assertThrows()` API:
 
 ```java
-import static org.junit.Assert.expectThrows;
+import static org.junit.Assert.assertThrows;
 
 @Test
 public void testRemoveFails() {
   AppendOnlyList list = new AppendOnlyList();
   list.add(0, "a");
-  UnsupportedOperationException thrown = expectThrows(
+  UnsupportedOperationException thrown = assertThrows(
       UnsupportedOperationException.class,
       () -> {
         list.remove(0);