[CLI-227] Convert unit tests to junit 4, upgrade junit to 4.11, move authors to pom.xml.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/trunk@1442904 13f79535-47bb-0310-9956-ffa450edef68

Author: netomi

pom.xml

@@ -121,6 +121,12 @@
         <role>lots of fixes for 1.1</role>
       </roles>
     </contributor>
+    <contributor>
+      <name>Slawek Zachcial</name>
+      <roles>
+        <role>unit tests</role>
+      </roles>
+    </contributor>
 
   </contributors>
 
@@ -129,7 +135,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.2</version>
+      <version>4.11</version>
       <scope>test</scope>
     </dependency>
     <dependency>

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

@@ -17,7 +17,10 @@
 
 package org.apache.commons.cli;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
 
 /**
  * This is a collection of tests that test real world applications command lines.
@@ -31,12 +34,11 @@
  *   <li>man</li>
  * </ul>
  * </p>
- *
- * @author John Keyes (john at integralsource.com)
  */
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class ApplicationTest extends TestCase {
-
+public class ApplicationTest
+{
+    @Test
     public void testLs() throws Exception {
         // create the command line parser
         CommandLineParser parser = new PosixParser();
@@ -63,6 +65,7 @@ public void testLs() throws Exception {
     /**
      * Ant test
      */
+    @Test
     public void testAnt() throws Exception {
         // use the GNU parser
         CommandLineParser parser = new GnuParser( );
@@ -104,6 +107,7 @@ public void testAnt() throws Exception {
         assertTrue( line.hasOption( "projecthelp") );
     }
 
+    @Test
     public void testGroovy() throws Exception {
         Options options = new Options();
 
@@ -174,6 +178,7 @@ public void testGroovy() throws Exception {
     /**
      * author Slawek Zachcial
      */
+    @Test
     public void testMan()
     {
         String cmdLine =
@@ -223,6 +228,7 @@ public void testMan()
     /**
      * Real world test with long and short options.
      */
+    @Test
     public void testNLT() throws Exception {
         Option help = new Option("h", "help", false, "print this message");
         Option version = new Option("v", "version", false, "print version information");

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

@@ -17,22 +17,27 @@
 
 package org.apache.commons.cli;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
 
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class ArgumentIsOptionTest extends TestCase
+public class ArgumentIsOptionTest
 {
     private Options options = null;
     private CommandLineParser parser = null;
 
-    @Override
+    @Before
     public void setUp()
     {
         options = new Options().addOption("p", false, "Option p").addOption("attr", true, "Option accepts argument");
 
         parser = new PosixParser();
     }
 
+    @Test
     public void testOptionAndOptionWithArgument() throws Exception
     {
         String[] args = new String[]{
@@ -48,6 +53,7 @@ public void testOptionAndOptionWithArgument() throws Exception
         assertTrue("Confirm all arguments recognized", cl.getArgs().length == 0);
     }
 
+    @Test
     public void testOptionWithArgument() throws Exception
     {
         String[] args = new String[]{
@@ -63,6 +69,7 @@ public void testOptionWithArgument() throws Exception
         assertTrue("Confirm all arguments recognized", cl.getArgs().length == 0);
     }
 
+    @Test
     public void testOption() throws Exception
     {
         String[] args = new String[]{

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

@@ -17,14 +17,12 @@
 
 package org.apache.commons.cli;
 
-/**
- * @author Emmanuel Bourg
- * @version $Revision$, $Date$
- */
+import org.junit.Before;
+
 @SuppressWarnings("deprecation") // tests some deprecated classes
 public class BasicParserTest extends ParserTestCase
 {
-    @Override
+    @Before
     public void setUp()
     {
         super.setUp();

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

@@ -17,16 +17,22 @@
 
 package org.apache.commons.cli;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.Iterator;
 import java.util.Properties;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class BugsTest extends TestCase
+public class BugsTest
 {
+    @Test
     public void test11457() throws Exception
     {
         Options options = new Options();
@@ -39,6 +45,7 @@ public void test11457() throws Exception
         assertTrue(cmd.hasOption("verbose"));
     }
 
+    @Test
     public void test11458() throws Exception
     {
         Options options = new Options();
@@ -82,6 +89,7 @@ public void test11458() throws Exception
         }
     }
 
+    @Test
     public void test11680() throws Exception
     {
         Options options = new Options();
@@ -97,6 +105,7 @@ public void test11680() throws Exception
         cmd.getOptionValue("m", "default m");
     }
 
+    @Test
     public void test11456() throws Exception
     {
         // Posix 
@@ -122,6 +131,7 @@ public void test11456() throws Exception
         assertEquals( cmd.getOptionValue( 'b' ), "value" );
     }
 
+    @Test
     public void test12210() throws Exception
     {
         // create the main options object which will handle the first parameter
@@ -178,6 +188,7 @@ else if(cmd.hasOption("rep"))
         }
     }
 
+    @Test
     public void test13425() throws Exception
     {
         Options options = new Options();
@@ -208,6 +219,7 @@ public void test13425() throws Exception
         }
     }
 
+    @Test
     public void test13666() throws Exception
     {
         Options options = new Options();
@@ -238,6 +250,7 @@ public void test13666() throws Exception
         }
     }
 
+    @Test
     public void test13935() throws Exception
     {
         OptionGroup directions = new OptionGroup();
@@ -284,6 +297,7 @@ public void test13935() throws Exception
         assertNotNull(line);
     }
 
+    @Test
     public void test14786() throws Exception
     {
         Option o = OptionBuilder.isRequired().withDescription("test").create("test");
@@ -299,6 +313,7 @@ public void test14786() throws Exception
         assertTrue( line.hasOption( "test" ) );
     }
 
+    @Test
     public void test15046() throws Exception
     {
         CommandLineParser parser = new PosixParser();
@@ -316,6 +331,7 @@ public void test15046() throws Exception
         assertTrue( !line.hasOption("c") );
     }
 
+    @Test
     public void test15648() throws Exception
     {
         CommandLineParser parser = new PosixParser();
@@ -327,6 +343,7 @@ public void test15648() throws Exception
         assertEquals( "Two Words", line.getOptionValue( "m" ) );
     }
 
+    @Test
     public void test31148() throws ParseException
     {
         Option multiArgOption = new Option("o","option with multiple args");

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

@@ -17,17 +17,17 @@
 
 package org.apache.commons.cli;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import java.util.Properties;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
-/**
- * @author Emmanuel Bourg
- * @version $Revision$, $Date$
- */
 @SuppressWarnings("deprecation") // tests some deprecated classes
-public class CommandLineTest extends TestCase
+public class CommandLineTest
 {
+    @Test
     public void testGetOptionProperties() throws Exception
     {
         String[] args = new String[] { "-Dparam1=value1", "-Dparam2=value2", "-Dparam3", "-Dparam4=value4", "-D", "--property", "foo=bar" };
@@ -50,6 +50,7 @@ public void testGetOptionProperties() throws Exception
         assertEquals("property with long format", "bar", cl.getOptionProperties("property").getProperty("foo"));
     }
 
+    @Test
     public void testGetOptions()
     {
         CommandLine cmd = new CommandLine();
@@ -63,6 +64,7 @@ public void testGetOptions()
         assertEquals(3, cmd.getOptions().length);
     }
 
+    @Test
     public void testGetParsedOptionValue() throws Exception {
         Options options = new Options();
         options.addOption(OptionBuilder.hasArg().withType(Number.class).create("i"));

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

@@ -17,13 +17,11 @@
 
 package org.apache.commons.cli;
 
-/**
- * @author Emmanuel Bourg
- * @version $Revision$, $Date$
- */
+import org.junit.Before;
+
 public class DefaultParserTest extends ParserTestCase {
 
-    @Override
+    @Before
     public void setUp() {
         super.setUp();
         parser = new DefaultParser();

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

@@ -17,10 +17,12 @@
 
 package org.apache.commons.cli;
 
+import org.junit.Before;
+
 @SuppressWarnings("deprecation") // tests some deprecated classes
 public class GnuParserTest extends ParserTestCase
 {
-    @Override
+    @Before
     public void setUp()
     {
         super.setUp();
@@ -105,8 +107,8 @@ public void testAmbiguousPartialLongOption2() throws Exception
         // not supported by the GnuParser
     }
 
-   @Override
-public void testAmbiguousPartialLongOption3() throws Exception
+    @Override
+    public void testAmbiguousPartialLongOption3() throws Exception
     {
         // not supported by the GnuParser
     }