Fix some Error Prone warnings

cushon · cushon · commit 670be78a7f66 · 2018-02-27T14:07:45.000-08:00
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=186912758
diff --git a/core/src/test/java/com/google/googlejavaformat/java/CommandLineFlagsTest.java b/core/src/test/java/com/google/googlejavaformat/java/CommandLineFlagsTest.java
@@ -30,7 +30,7 @@ public class CommandLineFlagsTest {
   // TODO(eaftan): Disallow passing both -lines and -offset/-length, like clang-format.
 
   @Test
-  public void formatInPlaceRequiresAtLeastOneFile() {
+  public void formatInPlaceRequiresAtLeastOneFile() throws UsageException {
     try {
       Main.processArgs("-i");
       fail();
@@ -45,21 +45,13 @@ public void formatInPlaceRequiresAtLeastOneFile() {
       // expected
     }
 
-    try {
-      Main.processArgs("-i", "Foo.java");
-      Main.processArgs("-i", "Foo.java", "Bar.java");
-    } catch (UsageException e) {
-      fail();
-    }
+    Main.processArgs("-i", "Foo.java");
+    Main.processArgs("-i", "Foo.java", "Bar.java");
   }
 
   @Test
-  public void formatASubsetRequiresExactlyOneFile() {
-    try {
-      Main.processArgs("-lines", "10", "Foo.java");
-    } catch (UsageException e) {
-      fail();
-    }
+  public void formatASubsetRequiresExactlyOneFile() throws UsageException {
+    Main.processArgs("-lines", "10", "Foo.java");
 
     try {
       Main.processArgs("-lines", "10");
@@ -75,11 +67,7 @@ public void formatASubsetRequiresExactlyOneFile() {
       // expected
     }
 
-    try {
-      Main.processArgs("-offset", "10", "-length", "10", "Foo.java");
-    } catch (UsageException e) {
-      fail();
-    }
+    Main.processArgs("-offset", "10", "-length", "10", "Foo.java");
 
     try {
       Main.processArgs("-offset", "10", "-length", "10");
@@ -99,12 +87,8 @@ public void formatASubsetRequiresExactlyOneFile() {
   // TODO(eaftan): clang-format allows a single offset with no length, which means to format
   // up to the end of the file.  We should match that behavior.
   @Test
-  public void numberOfOffsetsMustMatchNumberOfLengths() {
-    try {
-      Main.processArgs("-offset", "10", "-length", "20", "Foo.java");
-    } catch (UsageException e) {
-      fail();
-    }
+  public void numberOfOffsetsMustMatchNumberOfLengths() throws UsageException {
+    Main.processArgs("-offset", "10", "-length", "20", "Foo.java");
 
     try {
       Main.processArgs("-offset", "10", "-length", "20", "-offset", "50", "Foo.java");
@@ -122,18 +106,10 @@ public void numberOfOffsetsMustMatchNumberOfLengths() {
   }
 
   @Test
-  public void noFilesToFormatRequiresEitherHelpOrVersion() {
-    try {
-      Main.processArgs("-version");
-    } catch (UsageException e) {
-      fail();
-    }
+  public void noFilesToFormatRequiresEitherHelpOrVersion() throws UsageException {
+    Main.processArgs("-version");
 
-    try {
-      Main.processArgs("-help");
-    } catch (UsageException e) {
-      fail();
-    }
+    Main.processArgs("-help");
 
     try {
       Main.processArgs();
