switched from AssertException to @test(expected = IllegalArgumentException.class)

Author: autayeu

src/test/java/pl/project13/jgit/DescribeCommandOptionsTest.java

@@ -22,47 +22,28 @@
 import org.mockito.Matchers;
 import pl.project13.maven.git.GitCommitIdMojo;
 import pl.project13.maven.git.GitDescribeConfig;
-import pl.project13.test.utils.AssertException;
 
 import static org.mockito.Mockito.*;
 
 public class DescribeCommandOptionsTest {
 
 
-  @Test
+  @Test(expected = IllegalArgumentException.class)
   public void abbrev_shouldVerifyLengthContract_failOn41() throws Exception {
     // given
     final Repository repo = mock(Repository.class);
     final int length = 41;
 
-    // when
-    AssertException.CodeBlock block = new AssertException.CodeBlock() {
-      @Override
-      public void run() throws Exception {
-        DescribeCommand.on(repo).abbrev(length);
-      }
-    };
-
-    // then
-    AssertException.thrown(IllegalArgumentException.class, block);
+    DescribeCommand.on(repo).abbrev(length);
   }
 
-  @Test
+  @Test(expected = IllegalArgumentException.class)
   public void abbrev_shouldVerifyLengthContract_failOnMinus12() throws Exception {
     // given
     final Repository repo = mock(Repository.class);
     final int length = -12;
 
-    // when
-    AssertException.CodeBlock block = new AssertException.CodeBlock() {
-      @Override
-      public void run() {
-        DescribeCommand.on(repo).abbrev(length);
-      }
-    };
-
-    // then
-    AssertException.thrown(IllegalArgumentException.class, block);
+    DescribeCommand.on(repo).abbrev(length);
   }
 
   @Test
@@ -88,4 +69,4 @@ public void apply_shouldDelegateToAllOptions() throws Exception {
     verify(spiedCommand).tags(Matchers.eq(true));
     verify(spiedCommand).forceLongFormat(Matchers.eq(true));
   }
-}
+}

src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java

@@ -29,7 +29,6 @@
 import org.eclipse.jgit.api.ResetCommand;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import pl.project13.test.utils.AssertException;
 
 import java.io.File;
 import java.nio.charset.Charset;
@@ -154,7 +153,7 @@ public void shouldUseChildProjectRepoIfInvokedFromChild(boolean useNativeGit) th
     assertGitPropertiesPresentInProject(targetProject.getProperties());
   }
 
-  @Test
+  @Test(expected = MojoExecutionException.class)
   @Parameters(method = "useNativeGit")
   public void shouldFailWithExceptionWhenNoGitRepoFound(boolean useNativeGit) throws Exception {
     // given
@@ -168,16 +167,7 @@ public void shouldFailWithExceptionWhenNoGitRepoFound(boolean useNativeGit) thro
     alterMojoSettings("skipPoms", false);
     alterMojoSettings("useNativeGit", useNativeGit);
 
-    // when
-    AssertException.CodeBlock block = new AssertException.CodeBlock() {
-      @Override
-      public void run() throws Exception {
-        mojo.execute();
-      }
-    };
-
-    // then
-    AssertException.thrown(MojoExecutionException.class, block);
+    mojo.execute();
   }
 
   @Test