Author: echatellier Date: 2010-05-03 18:58:52 +0200 (Mon, 03 May 2010) New Revision: 1836 Url: http://nuiton.org/repositories/revision/nuiton-utils/1836 Log: Move tests to junit 4 Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java Modified: trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java =================================================================== --- trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-04-29 05:58:33 UTC (rev 1835) +++ trunk/src/test/java/org/nuiton/util/ApplicationConfigTest.java 2010-05-03 16:58:52 UTC (rev 1836) @@ -33,16 +33,15 @@ import java.util.ListIterator; import java.util.Map; -import junit.framework.Assert; -import junit.framework.TestCase; - +import org.junit.Assert; +import org.junit.Test; import org.nuiton.util.ApplicationConfig.Action; /** * * @author poussin */ -public class ApplicationConfigTest extends TestCase { +public class ApplicationConfigTest { static int dummyActionCall = 0; static public class DummyAction { @@ -52,20 +51,17 @@ System.out.println(s + ":" + step); } } - - public ApplicationConfigTest(String testName) { - super(testName); - } /** * Test of getUnparsed method, of class ApplicationConfig. */ + @Test public void testGetUnparsed() throws Exception { System.out.println("getUnparsed"); ApplicationConfig instance = new ApplicationConfig(); List<String> expResult = new ArrayList<String>(); List<String> result = instance.getUnparsed(); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); expResult.add("toto"); expResult.add("titi"); @@ -73,12 +69,13 @@ instance.parse(new String[]{"toto", "titi", "tata"}); result = instance.getUnparsed(); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } /** * Test of addAction method, of class ApplicationConfig. */ + @Test public void testAddAction() throws Exception { System.out.println("addAction"); Action action = null; @@ -94,6 +91,7 @@ /** * Test of doAction method, of class ApplicationConfig. */ + @Test public void testDoAction() throws Exception { System.out.println("doAction"); ApplicationConfig instance = new ApplicationConfig(); @@ -102,31 +100,33 @@ instance.addAction(action); dummyActionCall = 0; - assertEquals(0, dummyActionCall); + Assert.assertEquals(0, dummyActionCall); instance.doAction(0); - assertEquals(0, dummyActionCall); + Assert.assertEquals(0, dummyActionCall); instance.doAction(1); - assertEquals(1, dummyActionCall); + Assert.assertEquals(1, dummyActionCall); instance.doAction(2); - assertEquals(1, dummyActionCall); + Assert.assertEquals(1, dummyActionCall); } /** * Test of setUseOnlyAliases method, of class ApplicationConfig. */ + @Test public void testSetUseOnlyAliases() { System.out.println("setUseOnlyAliases"); ApplicationConfig instance = new ApplicationConfig(); - assertEquals(false, instance.isUseOnlyAliases()); + Assert.assertEquals(false, instance.isUseOnlyAliases()); instance.setUseOnlyAliases(false); - assertEquals(false, instance.isUseOnlyAliases()); + Assert.assertEquals(false, instance.isUseOnlyAliases()); instance.setUseOnlyAliases(true); - assertEquals(true, instance.isUseOnlyAliases()); + Assert.assertEquals(true, instance.isUseOnlyAliases()); } /** * Test of addAlias method, of class ApplicationConfig. */ + @Test public void testAddAlias() throws Exception { System.out.println("addAlias"); ApplicationConfig instance = new ApplicationConfig(); @@ -135,7 +135,7 @@ List<String> expResult = new ArrayList<String>(); List<String> result = instance.getUnparsed(); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); expResult.add("totochange"); expResult.add("titichange"); @@ -143,43 +143,47 @@ instance.parse(new String[]{"toto", "titi", "tata"}); result = instance.getUnparsed(); - assertEquals(expResult, result); + Assert.assertEquals(expResult, result); } /** * Test of setConfigFileName method, of class ApplicationConfig. */ + @Test public void testSetConfigFileName() { System.out.println("setConfigFileName"); ApplicationConfig instance = new ApplicationConfig(); instance.setConfigFileName("bidulle"); - assertEquals("bidulle", instance.getConfigFileName()); + Assert.assertEquals("bidulle", instance.getConfigFileName()); } /** * Test of setOption method, of class ApplicationConfig. */ + @Test public void testSetOption() { System.out.println("setOption"); ApplicationConfig instance = new ApplicationConfig(); - assertEquals(null, instance.getOption("truc")); + Assert.assertEquals(null, instance.getOption("truc")); instance.setOption("truc", "bidulle"); - assertEquals("bidulle", instance.getOption("truc")); + Assert.assertEquals("bidulle", instance.getOption("truc")); } /** * Test of getMethods method, of class ApplicationConfig. */ + @Test public void testGetMethods() { System.out.println("getMethods"); ApplicationConfig instance = new ApplicationConfig(); Map<String, Method> result = instance.getMethods(); - assertTrue(result.containsKey("option")); + Assert.assertTrue(result.containsKey("option")); } /** * Test of getParams method, of class ApplicationConfig. */ + @Test public void testGetParams() throws Exception { System.out.println("getParams"); Method m = DummyAction.class.getMethod("dummyAction", String.class, Integer.TYPE); @@ -189,13 +193,14 @@ ApplicationConfig instance = new ApplicationConfig(); String[] expResult = new String[]{"toto", "10"}; String[] result = instance.getParams(m, args); - assertEquals(Arrays.asList(expResult), Arrays.asList(result)); - assertEquals(2, list.size()); + Assert.assertEquals(Arrays.asList(expResult), Arrays.asList(result)); + Assert.assertEquals(2, list.size()); } /** * Test of createAction method, of class ApplicationConfig. */ + @Test public void testCreateAction() throws Exception { System.out.println("createAction"); List<String> list = new ArrayList<String>(Arrays.asList("dummy", "toto", "10", "/tmp", "9")); @@ -205,15 +210,16 @@ Action result = instance.createAction( DummyAction.class.getName() + "#dummyAction", args); - assertEquals(1, result.step); + Assert.assertEquals(1, result.step); dummyActionCall = 0; result.doAction(); - assertEquals(1, dummyActionCall); + Assert.assertEquals(1, dummyActionCall); } /** * Test of parse method, of class ApplicationConfig. */ + @Test public void testParse() throws Exception { System.out.println("parse"); String[] args = "-f file -v -d -o /tmp/file -m coucou 10 others args".split(" "); @@ -226,14 +232,14 @@ instance.parse(args); dummyActionCall = 0; - assertEquals("file", instance.getOption("file")); - assertEquals("true", instance.getOption("verbose")); - assertEquals("true", instance.getOption("debug")); - assertEquals("/tmp/file", instance.getOption("output")); - assertEquals(Arrays.asList("others", "args"), instance.getUnparsed()); + Assert.assertEquals("file", instance.getOption("file")); + Assert.assertEquals("true", instance.getOption("verbose")); + Assert.assertEquals("true", instance.getOption("debug")); + Assert.assertEquals("/tmp/file", instance.getOption("output")); + Assert.assertEquals(Arrays.asList("others", "args"), instance.getUnparsed()); instance.doAction(1); - assertEquals(1, dummyActionCall); + Assert.assertEquals(1, dummyActionCall); } /** @@ -241,6 +247,7 @@ * replaced. * @throws ArgumentsParserException */ + @Test public void testSystemProperties() throws ArgumentsParserException { ApplicationConfig instance = new ApplicationConfig(); instance.parse(new String[]{}); @@ -248,26 +255,27 @@ instance.setOption("hellomessage", "Hello ${user.name} !"); - assertEquals("Hello " + System.getProperty("user.name") + " !", instance.getOption("hellomessage")); - assertEquals("Hello ${user.name} !", instance.options.getProperty("hellomessage")); + Assert.assertEquals("Hello " + System.getProperty("user.name") + " !", instance.getOption("hellomessage")); + Assert.assertEquals("Hello ${user.name} !", instance.options.getProperty("hellomessage")); instance.setOption("tempdir", "${java.io.tmpdir}" + File.separator + "blah"); File tempDir = instance.getOptionAsFile("tempdir"); - assertEquals(System.getProperty("java.io.tmpdir") + File.separator + "blah", tempDir.getAbsolutePath()); + Assert.assertEquals(System.getProperty("java.io.tmpdir") + File.separator + "blah", tempDir.getAbsolutePath()); instance.setOption("system", "${os.name}"); instance.setOption("os", "${system}"); instance.setOption("sysinfo", "I'm running ${os} :)"); - assertEquals("I'm running " + System.getProperty("os.name") + " :)", instance.getOption("sysinfo")); + Assert.assertEquals("I'm running " + System.getProperty("os.name") + " :)", instance.getOption("sysinfo")); // test not found properties instance.setOption("notexists", "Attention ${blah.bloh.bluh} :("); - assertEquals("Attention ${blah.bloh.bluh} :(", instance.getOption("notexists")); + Assert.assertEquals("Attention ${blah.bloh.bluh} :(", instance.getOption("notexists")); } /** * Test unparsed options */ + @Test public void testUnparsed() throws Exception { String[] args = "test --du i_am_a_test 2 --option file f1 --option verbose false -- --openui false --m coucou 10 others args".split(" "); @@ -284,6 +292,7 @@ /** * Test get flat options method. */ + @Test public void testGetFlatOptions() throws Exception { ApplicationConfig instance = new ApplicationConfig();
participants (1)
-
echatellier＠users.nuiton.org