URIishTest: Use @Test annotation's `expected` argument

Specify the expected exception in the annotation, instead of
catching it and calling `fail()` when it wasn't raised.

Change-Id: I8a640c0e42353533e4e73b85b50c224dc060f2d7
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java
index 0fda72cf9d215ff846e928a3b5c5ce04b9eb4224..2078dd337bba984d73f67c987439a54369cd3251 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java
@@ -51,7 +51,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.io.IOException;
@@ -65,25 +64,15 @@ public class URIishTest {
        private static final String GIT_SCHEME = "git://";
 
        @SuppressWarnings("unused")
-       @Test
+       @Test(expected = URISyntaxException.class)
        public void shouldRaiseErrorOnEmptyURI() throws Exception {
-               try {
-                       new URIish("");
-                       fail("expecting an exception");
-               } catch (URISyntaxException e) {
-                       // expected
-               }
+               new URIish("");
        }
 
        @SuppressWarnings("unused")
-       @Test
+       @Test(expected = URISyntaxException.class)
        public void shouldRaiseErrorOnNullURI() throws Exception {
-               try {
-                       new URIish((String) null);
-                       fail("expecting an exception");
-               } catch (URISyntaxException e) {
-                       // expected
-               }
+               new URIish((String) null);
        }
 
        @Test
@@ -594,34 +583,19 @@ public class URIishTest {
                assertEquals(u, new URIish(str));
        }
 
-       @Test
+       @Test(expected = IllegalArgumentException.class)
        public void testGetNullHumanishName() {
-               try {
-                       new URIish().getHumanishName();
-                       fail("path must be not null");
-               } catch (IllegalArgumentException e) {
-                       // expected
-               }
+               new URIish().getHumanishName();
        }
 
-       @Test
+       @Test(expected = IllegalArgumentException.class)
        public void testGetEmptyHumanishName() throws URISyntaxException {
-               try {
-                       new URIish(GIT_SCHEME).getHumanishName();
-                       fail("empty path is useless");
-               } catch (IllegalArgumentException e) {
-                       // expected
-               }
+               new URIish(GIT_SCHEME).getHumanishName();
        }
 
-       @Test
+       @Test(expected = IllegalArgumentException.class)
        public void testGetAbsEmptyHumanishName() {
-               try {
-                       new URIish().getHumanishName();
-                       fail("empty path is useless");
-               } catch (IllegalArgumentException e) {
-                       // expected
-               }
+               new URIish().getHumanishName();
        }
 
        @Test