Simplified the test cases by removing the unnecessary fail() calls in the catch blocks

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/branches/cli-1.x@661378 13f79535-47bb-0310-9956-ffa450edef68

Author: ebourg

src/test/org/apache/commons/cli/ApplicationTest.java

@@ -36,10 +36,7 @@
  */
 public class ApplicationTest extends TestCase {
 
-    /**
-     *	
-     */
-    public void testLs() {
+    public void testLs() throws Exception {
         // create the command line parser
         CommandLineParser parser = new PosixParser();
         Options options = new Options();
@@ -57,20 +54,15 @@ public void testLs() {
 
         String[] args = new String[]{ "--block-size=10" };
 
-        try {
-            CommandLine line = parser.parse( options, args );
-            assertTrue( line.hasOption( "block-size" ) );
-            assertEquals( line.getOptionValue( "block-size" ), "10" );
-        }
-        catch( ParseException exp ) {
-            fail( "Unexpected exception:" + exp.getMessage() );
-        }
+        CommandLine line = parser.parse( options, args );
+        assertTrue( line.hasOption( "block-size" ) );
+        assertEquals( line.getOptionValue( "block-size" ), "10" );
     }
 
     /**
      * Ant test
      */
-    public void testAnt() {
+    public void testAnt() throws Exception {
         // use the GNU parser
         CommandLineParser parser = new GnuParser( );
         Options options = new Options();
@@ -95,26 +87,20 @@ public void testAnt() {
             "-Dproperty=value", "-Dproperty1=value1",
             "-projecthelp" };
 
-        try {
-            CommandLine line = parser.parse( options, args );
-
-            // check multiple values
-            String[] opts = line.getOptionValues( "D" );
-            assertEquals( "property", opts[0] );
-            assertEquals( "value", opts[1] );
-            assertEquals( "property1", opts[2] );
-            assertEquals( "value1", opts[3] );
+        CommandLine line = parser.parse( options, args );
 
-            // check single value
-            assertEquals( line.getOptionValue( "buildfile"), "mybuild.xml" );
+        // check multiple values
+        String[] opts = line.getOptionValues( "D" );
+        assertEquals( "property", opts[0] );
+        assertEquals( "value", opts[1] );
+        assertEquals( "property1", opts[2] );
+        assertEquals( "value1", opts[3] );
 
-            // check option
-            assertTrue( line.hasOption( "projecthelp") );
-        }
-        catch( ParseException exp ) {
-            fail( "Unexpected exception:" + exp.getMessage() );
-        }
+        // check single value
+        assertEquals( line.getOptionValue( "buildfile"), "mybuild.xml" );
 
+        // check option
+        assertTrue( line.hasOption( "projecthelp") );
     }
 
 }

src/test/org/apache/commons/cli/ArgumentIsOptionTest.java

@@ -19,69 +19,58 @@
 
 import junit.framework.TestCase;
 
-public class ArgumentIsOptionTest extends TestCase {
+public class ArgumentIsOptionTest extends TestCase
+{
     private Options options = null;
     private CommandLineParser parser = null;
 
-    public void setUp() {
-        options = new Options().addOption("p", false, "Option p").addOption("attr",
-                true, "Option accepts argument");
+    public void setUp()
+    {
+        options = new Options().addOption("p", false, "Option p").addOption("attr", true, "Option accepts argument");
 
         parser = new PosixParser();
     }
 
-    public void testOptionAndOptionWithArgument() {
-        String[] args = new String[] {
+    public void testOptionAndOptionWithArgument() throws Exception
+    {
+        String[] args = new String[]{
                 "-p",
                 "-attr",
                 "p"
-            };
+        };
 
-        try {
-            CommandLine cl = parser.parse(options, args);
-            assertTrue("Confirm -p is set", cl.hasOption("p"));
-            assertTrue("Confirm -attr is set", cl.hasOption("attr"));
-            assertTrue("Confirm arg of -attr",
+        CommandLine cl = parser.parse(options, args);
+        assertTrue("Confirm -p is set", cl.hasOption("p"));
+        assertTrue("Confirm -attr is set", cl.hasOption("attr"));
+        assertTrue("Confirm arg of -attr",
                 cl.getOptionValue("attr").equals("p"));
-            assertTrue("Confirm all arguments recognized", cl.getArgs().length == 0);
-        }
-        catch (ParseException e) {
-            fail(e.toString());
-        }
+        assertTrue("Confirm all arguments recognized", cl.getArgs().length == 0);
     }
 
-    public void testOptionWithArgument() {
-        String[] args = new String[] {
+    public void testOptionWithArgument() throws Exception
+    {
+        String[] args = new String[]{
                 "-attr",
                 "p"
-            };
+        };
 
-        try {
-            CommandLine cl = parser.parse(options, args);
-            assertFalse("Confirm -p is set", cl.hasOption("p"));
-            assertTrue("Confirm -attr is set", cl.hasOption("attr"));
-            assertTrue("Confirm arg of -attr",
+        CommandLine cl = parser.parse(options, args);
+        assertFalse("Confirm -p is set", cl.hasOption("p"));
+        assertTrue("Confirm -attr is set", cl.hasOption("attr"));
+        assertTrue("Confirm arg of -attr",
                 cl.getOptionValue("attr").equals("p"));
-            assertTrue("Confirm all arguments recognized", cl.getArgs().length == 0);
-        }
-        catch (ParseException e) {
-            fail(e.toString());
-        }
+        assertTrue("Confirm all arguments recognized", cl.getArgs().length == 0);
     }
 
-    public void testOption() {
-        String[] args = new String[] {
+    public void testOption() throws Exception
+    {
+        String[] args = new String[]{
                 "-p"
-            };
+        };
 
-        try {
-            CommandLine cl = parser.parse(options, args);
-            assertTrue("Confirm -p is set", cl.hasOption("p"));
-            assertFalse("Confirm -attr is not set", cl.hasOption("attr"));
-            assertTrue("Confirm all arguments recognized", cl.getArgs().length == 0);
-        }
-        catch (ParseException e) {
-            fail(e.toString());
-        }
+        CommandLine cl = parser.parse(options, args);
+        assertTrue("Confirm -p is set", cl.hasOption("p"));
+        assertFalse("Confirm -attr is not set", cl.hasOption("attr"));
+        assertTrue("Confirm all arguments recognized", cl.getArgs().length == 0);
     }
 }