Index: maven-commandline-plugin/src/test/org/codelutin/util/ParserTest.java diff -u maven-commandline-plugin/src/test/org/codelutin/util/ParserTest.java:1.4 maven-commandline-plugin/src/test/org/codelutin/util/ParserTest.java:1.5 --- maven-commandline-plugin/src/test/org/codelutin/util/ParserTest.java:1.4 Fri Dec 14 19:06:52 2007 +++ maven-commandline-plugin/src/test/org/codelutin/util/ParserTest.java Sun Dec 16 22:33:58 2007 @@ -23,9 +23,6 @@ import org.apache.maven.plugin.MojoFailureException; import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; /** * OptionDefinitionParser Tester. @@ -41,7 +38,6 @@ private static final String OUT_PATH = new File(HERE, "target/test-classes").getAbsolutePath(); private static final String PARSER_NAME = "org.codelutin.util.CodeLutinUtilOptionParser"; private static final String PROPERTIES_FILE_PATH = HERE + "/src/test/testOptions2.properties"; - //private static final String RST_FILE_NAME = HERE + "/target/gen/site/fr/rst/GenerateTest.rst"; static OptionParser parser; @@ -62,49 +58,36 @@ public void testOptions() throws Exception { parser.doParse(); - assertError(parser, 0, 0); + ParserUtil.assertError(parser, 0, 0, 0); parser.doParse("--true"); - assertError(parser, 0, 1); + ParserUtil.assertError(parser, 0, 1, 0); parser.doParse("-l"); - assertError(parser, 0, 1); + ParserUtil.assertError(parser, 0, 1, 0); assertFalse(parser.isOptionEnabled("list")); - parser.doParse("-l","regions"); - assertError(parser, 1, 0); + parser.doParse("-l", "regions"); + ParserUtil.assertError(parser, 1, 0, 0); assertTrue(parser.isOptionEnabled("list")); - - } public void testUnfoundOptions() throws Exception { parser.doParse("true", "true", "-h"); - assertError(parser, 1, 1); + ParserUtil.assertError(parser, 1, 0, 2); parser.doParse("true", "true", "-l", "exports"); - assertError(parser, 1, 1); + ParserUtil.assertError(parser, 1, 0, 2); parser.doParse("-l", "exports"); - assertError(parser, 1, 0); + ParserUtil.assertError(parser, 1, 0, 0); parser.doParse("true", "-zzh", "yo", "ya", "-yu", "yy", "uu", "-h"); - assertError(parser, 1, 3); - + ParserUtil.assertError(parser, 1, 2, 1); } - protected static void assertError(OptionParser parser, int nbOptions, int nbErrors) throws IOException { - Writer writer = new StringWriter(); - parser.printErrors(writer); - System.out.println(writer.toString()); - writer.flush(); - writer.close(); - assertEquals(nbErrors != 0, parser.hasFailed()); - assertEquals(nbOptions, parser.getOptions().length); - assertEquals(nbErrors, parser._errors.length); - } static void initParser() throws MojoExecutionException, MojoFailureException { Generate goal = new Generate(); @@ -115,7 +98,7 @@ goal.generateOptions = true; goal.typeSource = "properties"; goal.showErrors = true; - goal.force= true; + goal.force = true; goal.execute(); parser = newParser(PARSER_NAME, ParserTest.class.getClassLoader()); }