X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=svjatoslav_commons.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fcommandline%2Fparameterparser%2FParserTest.java;h=c5fcda45d64cc0a4f17e987f4a01a202b69fe34b;hp=0e654b4e8c16c2406b47edc6acb164d14344a4f7;hb=9bf004ce4e9b5edff36c65fcc8cc0f303390d7fc;hpb=26f09b1ebcafae67855b55ad588d5332a107d202

diff --git a/src/test/java/eu/svjatoslav/commons/commandline/parameterparser/ParserTest.java b/src/test/java/eu/svjatoslav/commons/commandline/parameterparser/ParserTest.java
index 0e654b4..c5fcda4 100755
--- a/src/test/java/eu/svjatoslav/commons/commandline/parameterparser/ParserTest.java
+++ b/src/test/java/eu/svjatoslav/commons/commandline/parameterparser/ParserTest.java
@@ -1,65 +1,55 @@
 /*
  * Svjatoslav Commons - shared library of common functionality.
- * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ * Copyright ©2012-2014, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
+ * modify it under the terms of version 3 of the GNU Lesser General Public License
+ * or later as published by the Free Software Foundation.
  */
 
 package eu.svjatoslav.commons.commandline.parameterparser;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParameter;
 import org.junit.Before;
 import org.junit.Test;
 
-import eu.svjatoslav.commons.commandline.parameterparser.arguments.IntegerArgument;
+import static org.junit.Assert.*;
 
 public class ParserTest {
 
-	Parser parser;
-
-	@Before
-	public void setUp() throws Exception {
-		parser = new Parser();
-	}
-
-	@Test
-	public void testParse() {
+    Parser parser;
 
-		// define allowed parameters
-		final Parameter helpParameter = new Parameter("Show help screen", "-h",
-				"--help");
-		parser.addParameter(helpParameter);
+    @Before
+    public void setUp() throws Exception {
+        parser = new Parser();
+    }
 
-		final Parameter compileParameter = new Parameter("Compile code", "-c",
-				"--compile");
-		parser.addParameter(compileParameter);
+    @Test
+    public void testParse() {
 
-		final Parameter bitrateParameter = new Parameter(false, true, false,
-				new IntegerArgument(), "Target bitrate", "-b", "--bitrate");
-		parser.addParameter(bitrateParameter);
+        // define allowed parameters
+        final StringParameter helpParameter = parser
+                .add(new StringParameter("Show help screen"))
+                .addAliases("--help", "-h").setMandatory();
 
-		// check help generation
-		parser.showHelp();
+        final StringParameter compileParameter = parser.add(
+                new StringParameter("Compile code")).addAliases("--compile",
+                "-c");
 
-		// parse arguments
-		parser.parse(new String[] { "--help", "-b", "123" });
+        // check help generation
+        parser.showHelp();
 
-		// --help was in the arguments
-		assertTrue(helpParameter.isParameterSpecified());
+        // parse arguments
+        parser.parse(new String[]{"--help", "section"});
 
-		// compile was not present
-		assertFalse(compileParameter.isParameterSpecified());
+        // --help was in the arguments
+        assertTrue(helpParameter.isParameterSpecified());
 
-		// bitrate is given as 123
-		assertTrue(bitrateParameter.isParameterSpecified());
+        // compile was not present
+        assertFalse(compileParameter.isParameterSpecified());
 
-		assertEquals(123, (int) bitrateParameter.getArgumentsAsIntegers()
-				.get(0));
-	}
+        // validate that help argument was "section"
+        assertEquals("section", helpParameter.getValue());
 
+    }
 }