Removed fail() in catch blocks in ValueTest and ValuesTest

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

Author: ebourg

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

@@ -27,65 +27,29 @@ public class ValueTest extends TestCase
     private CommandLine _cl = null;
     private Options opts = new Options();
 
-    public void setUp()
+    public void setUp() throws Exception
     {
-        opts.addOption("a",
-                       false,
-                       "toggle -a");
-
-        opts.addOption("b",
-                       true,
-                       "set -b");
-
-        opts.addOption("c",
-                       "c",
-                       false,
-                       "toggle -c");
-
-        opts.addOption("d",
-                       "d",
-                       true,
-                       "set -d");
-
-        opts.addOption( OptionBuilder.hasOptionalArg()
-                        .create( 'e') );
-
-        opts.addOption( OptionBuilder.hasOptionalArg()
-                        .withLongOpt( "fish" )
-                        .create( ) );
-
-        opts.addOption( OptionBuilder.hasOptionalArgs()
-                        .withLongOpt( "gravy" )
-                        .create( ) );
-
-        opts.addOption( OptionBuilder.hasOptionalArgs( 2 )
-                        .withLongOpt( "hide" )
-                        .create( ) );
-
-        opts.addOption( OptionBuilder.hasOptionalArgs( 2 )
-                        .create( 'i' ) );
-
-        opts.addOption( OptionBuilder.hasOptionalArgs( )
-                        .create( 'j' ) );
-
-        opts.addOption( OptionBuilder.hasArgs( ).withValueSeparator( ',' )
-                        .create( 'k' ) );
+        opts.addOption("a", false, "toggle -a");
+        opts.addOption("b", true, "set -b");
+        opts.addOption("c", "c", false, "toggle -c");
+        opts.addOption("d", "d", true, "set -d");
+
+        opts.addOption(OptionBuilder.hasOptionalArg().create('e'));
+        opts.addOption(OptionBuilder.hasOptionalArg().withLongOpt("fish").create());
+        opts.addOption(OptionBuilder.hasOptionalArgs().withLongOpt("gravy").create());
+        opts.addOption(OptionBuilder.hasOptionalArgs(2).withLongOpt("hide").create());
+        opts.addOption(OptionBuilder.hasOptionalArgs(2).create('i'));
+        opts.addOption(OptionBuilder.hasOptionalArgs().create('j'));
+        opts.addOption(OptionBuilder.hasArgs().withValueSeparator(',').create('k'));
 
         String[] args = new String[] { "-a",
             "-b", "foo",
             "--c",
             "--d", "bar" 
         };
 
-        try
-        {
-            Parser parser = new PosixParser();
-            _cl = parser.parse(opts,args);
-        }
-        catch (ParseException e)
-        {
-            fail("Cannot setUp() CommandLine: " + e.toString());
-        }
+        Parser parser = new PosixParser();
+        _cl = parser.parse(opts,args);
     }
 
     public void testShortNoArg()

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

@@ -25,39 +25,22 @@ public class ValuesTest extends TestCase
 {
     /** CommandLine instance */
     private CommandLine _cmdline = null;
-    private Option _option = null;
 
-    public void setUp()
+    public void setUp() throws Exception
     {
         Options opts = new Options();
 
-        opts.addOption("a",
-                       false,
-                       "toggle -a");
-
-        opts.addOption("b",
-                       true,
-                       "set -b");
-
-        opts.addOption("c",
-                       "c",
-                       false,
-                       "toggle -c");
-
-        opts.addOption("d",
-                       "d",
-                       true,
-                       "set -d");
+        opts.addOption("a", false, "toggle -a");
+        opts.addOption("b", true, "set -b");
+        opts.addOption("c", "c", false, "toggle -c");
+        opts.addOption("d", "d", true, "set -d");
 
         opts.addOption( OptionBuilder.withLongOpt( "e" )
                                      .hasArgs()
                                      .withDescription( "set -e ")
                                      .create( 'e' ) );
 
-        opts.addOption("f",
-                       "f",
-                       false,
-                       "jk");
+        opts.addOption("f", "f", false, "jk");
 
         opts.addOption( OptionBuilder.withLongOpt( "g" )
                         .hasArgs( 2 )
@@ -85,14 +68,12 @@ public void setUp()
                         .withValueSeparator( '=' )
                         .create( 'k' ) );
 
-        _option = OptionBuilder.withLongOpt( "m" )
+        opts.addOption( OptionBuilder.withLongOpt( "m" )
                         .hasArgs( )
                         .withDescription( "set -m")
                         .withValueSeparator( )
-                        .create( 'm' );
+                        .create( 'm' ) );
 
-        opts.addOption( _option );
-        
         String[] args = new String[] { "-a",
                                        "-b", "foo",
                                        "--c",
@@ -111,14 +92,7 @@ public void setUp()
 
         CommandLineParser parser = new PosixParser();
 
-        try
-        {
-            _cmdline = parser.parse(opts,args);
-        }
-        catch (ParseException e)
-        {
-            fail("Cannot setUp() CommandLine: " + e.toString());
-        }
+        _cmdline = parser.parse(opts,args);
     }
 
     public void testShortArgs()