Fixed the unit tests: fail() causes the method to exit, so that not a…

…ll tests were run
cdk · Aug 28, 2015 · cec4cb4 · cec4cb4
1 parent 857b0c0
commit cec4cb4
Showing 1 changed file with 30 additions and 59 deletions.
diff --git a/tool/smarts/src/test/java/org/openscience/cdk/smiles/smarts/parser/SMARTSSearchTest.java b/tool/smarts/src/test/java/org/openscience/cdk/smiles/smarts/parser/SMARTSSearchTest.java
@@ -1680,46 +1680,29 @@ public void testPeriodicGroupNumber() throws Exception {
         Assert.assertEquals(3, results[1]);
     }
 
-    @Test
+    @Test(expected=IllegalArgumentException.class)
     public void testInvalidPeriodicGroupNumber() throws Exception {
-        try {
-            int[] results = match("[G19]", "CCN");
-            Assert.fail();
-        } catch (IllegalArgumentException pe) {
-            Assert.assertTrue(true);
-        }
-
-        try {
-            int[] results = match("[G0]", "CCN");
-            Assert.fail();
-        } catch (IllegalArgumentException pe) {
-            Assert.assertTrue(true);
-        }
+        match("[G19]", "CCN");
+    }
 
-        try {
-            int[] results = match("[G345]", "CCN");
-            Assert.fail();
-        } catch (IllegalArgumentException pe) {
-            Assert.assertTrue(true);
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testInvalidPeriodicGroupNumber_2() throws Exception {
+        match("[G0]", "CCN");
+    }
 
+    @Test(expected=IllegalArgumentException.class)
+    public void testInvalidPeriodicGroupNumber_3() throws Exception {
+        match("[G345]", "CCN");
     }
 
-    @Test
+    @Test(expected=IllegalArgumentException.class)
     public void testNonPeriodicGroupNumber() throws Exception {
-        try {
-            int[] results = match("[G]", "CCN");
-            Assert.fail("Should throw an exception if G is not followed by a number");
-        } catch (IllegalArgumentException pe) {
-            Assert.assertTrue(true);
-        }
+        match("[G]", "CCN"); // Should throw an exception if G is not followed by a number
+    }
 
-        try {
-            int[] results = match("[GA]", "CCN");
-            Assert.fail("Should throw an exception if G is not followed by a number");
-        } catch (IllegalArgumentException pe) {
-            Assert.assertTrue(true);
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testNonPeriodicGroupNumber_2() throws Exception {
+        match("[GA]", "CCN"); // Should throw an exception if G is not followed by a number
     }
 
     @Test
@@ -1766,36 +1749,24 @@ public void testHybridizationNumber() throws Exception {
 
     }
 
-    @Test
+    @Test(expected=IllegalArgumentException.class)
     public void testBadHybridizationNumber() throws Exception {
+    	match("[^]", "CCN"); // Should throw an exception if ^ is not followed by a number
+    }
 
-        try {
-            int[] results = match("[^]", "CCN");
-            Assert.fail("Should throw an exception if ^ is not followed by a number");
-        } catch (IllegalArgumentException pe) {
-            Assert.assertTrue(true);
-        }
-
-        try {
-            int[] results = match("[^X]", "CCN");
-            Assert.fail("Should throw an exception if ^ is not followed by a number");
-        } catch (IllegalArgumentException pe) {
-            Assert.assertTrue(true);
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testBadHybridizationNumber_2() throws Exception {
+    	match("[^X]", "CCN"); // Should throw an exception if ^ is not followed by a number
+    }
 
-        try {
-            int[] results = match("[^0]", "CCN");
-            Assert.fail("Should throw an exception if ^ is not between 1 & 8");
-        } catch (IllegalArgumentException pe) {
-            Assert.assertTrue(true);
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testBadHybridizationNumber_3() throws Exception {
+    	match("[^0]", "CCN"); // Should throw an exception if ^ is not followed by a number
+    }
 
-        try {
-            int[] results = match("[^9]", "CCN");
-            Assert.fail("Should throw an exception if ^ is not between 1 & 8");
-        } catch (IllegalArgumentException pe) {
-            Assert.assertTrue(true);
-        }
+    @Test(expected=IllegalArgumentException.class)
+    public void testBadHybridizationNumber_4() throws Exception {
+    	match("[^9]", "CCN"); // Should throw an exception if ^ is not followed by a number
     }
 
     /**