[portal-commits] JBoss Portal SVN: r8602 - in modules/test/trunk/unit: src/main/org/jboss/test/unit/runner and 1 other directories.

Author: julien(a)jboss.com Date: 2007-10-11 11:00:56 -0400 (Thu, 11 Oct 2007) New Revision: 8602 Modified: modules/test/trunk/unit/build.xml modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/GenericTestRunnerTests.java modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/generic/GenericTestRunner.java Log: basic tests for generic test driver Modified: modules/test/trunk/unit/build.xml =================================================================== --- modules/test/trunk/unit/build.xml 2007-10-11 13:38:02 UTC (rev 8601) +++ modules/test/trunk/unit/build.xml 2007-10-11 15:00:56 UTC (rev 8602) @@ -186,9 +186,9 @@ <target name="test" depends="output"> <java classname="org.jboss.test.unit.AllTests" fork="true"> +<!-- <jvmarg value="-Xdebug"/> <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/> -<!-- --> <classpath> <path location="${build.lib}/jboss-unit-lib.jar"/> Modified: modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/GenericTestRunnerTests.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/GenericTestRunnerTests.java 2007-10-11 13:38:02 UTC (rev 8601) +++ modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/GenericTestRunnerTests.java 2007-10-11 15:00:56 UTC (rev 8602) @@ -24,14 +24,25 @@ import org.jboss.unit.runner.impl.generic.GenericTestRunner; import org.jboss.unit.runner.model.generic.GenericTestSuiteDef; +import org.jboss.unit.runner.model.generic.TestDef; import org.jboss.unit.driver.TestDriver; import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.DriverCommand; +import org.jboss.unit.driver.command.StartTestCommand; import org.jboss.unit.driver.response.EndTestResponse; import org.jboss.unit.info.TestInfo; import org.jboss.unit.info.impl.SimpleTestSuiteInfo; +import org.jboss.unit.info.impl.SimpleTestCaseInfo; import org.jboss.unit.TestId; +import static org.jboss.unit.api.Assert.*; +import static org.jboss.unit.util.CollectionTools.*; + +import java.util.HashMap; +import java.util.List; +import java.util.ArrayList; +import java.util.Map; + /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 1.1 $ @@ -41,27 +52,87 @@ public static void main(String[] args) { + test1(); + test2(); + test3(); + test4(); + } + private static void test1() + { + Driver1.init(); + GenericTestSuiteDef suite = new GenericTestSuiteDef(Driver1.class.getName()); + GenericTestRunner runner = new GenericTestRunner(suite); + runner.run(); + assertEquals(list(), Driver1.ids); + assertEquals(list(), Driver1.parametrizations); + } - GenericTestSuiteDef suite = new GenericTestSuiteDef(Blah.class.getName()); -// suite.addTest(); + private static void test2() + { + Driver1.init(); + Driver1.testSuiteInfo.addTest(new SimpleTestCaseInfo("foo")); + GenericTestSuiteDef suite = new GenericTestSuiteDef(Driver1.class.getName()); + suite.addTest(new TestDef(new TestId("foo"))); + GenericTestRunner runner = new GenericTestRunner(suite); + runner.run(); + assertEquals(list(new TestId("foo")), Driver1.ids); + assertEquals(list(new HashMap()), Driver1.parametrizations); + } + private static void test3() + { + Driver1.init(); + Driver1.testSuiteInfo.addTest(new SimpleTestCaseInfo("foo")); + Driver1.testSuiteInfo.addTest(new SimpleTestCaseInfo("bar")); + GenericTestSuiteDef suite = new GenericTestSuiteDef(Driver1.class.getName()); + suite.addTest(new TestDef(new TestId("foo"))); GenericTestRunner runner = new GenericTestRunner(suite); runner.run(); + assertEquals(list(new TestId("foo")), Driver1.ids); + assertEquals(list(new HashMap()), Driver1.parametrizations); + } + private static void test4() + { + Driver1.init(); + Driver1.testSuiteInfo.addTest(new SimpleTestCaseInfo("foo")); + Driver1.testSuiteInfo.addTest(new SimpleTestCaseInfo("bar")); + GenericTestSuiteDef suite = new GenericTestSuiteDef(Driver1.class.getName()); + GenericTestRunner runner = new GenericTestRunner(suite); + runner.run(); + assertEquals(list(new TestId("foo"), new TestId("bar")), Driver1.ids); + assertEquals(list(new HashMap(), new HashMap()), Driver1.parametrizations); } - - public static class Blah implements TestDriver + public static class Driver1 implements TestDriver { + static SimpleTestSuiteInfo testSuiteInfo; + static List<TestId> ids; + static List<Map<String,String>> parametrizations; + + static void init() + { + testSuiteInfo = new SimpleTestSuiteInfo("foo"); + ids = new ArrayList<TestId>(); + parametrizations = new ArrayList<Map<String,String>>(); + } + public TestInfo getInfo() { - return new SimpleTestSuiteInfo("blah"); + return testSuiteInfo; } public DriverResponse invoke(TestId id, DriverCommand command) { + if (command instanceof StartTestCommand) + { + ids.add(id); + parametrizations.add(((StartTestCommand)command).getParametrization()); + } + + // return new EndTestResponse(); } } Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/generic/GenericTestRunner.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/generic/GenericTestRunner.java 2007-10-11 13:38:02 UTC (rev 8601) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/generic/GenericTestRunner.java 2007-10-11 15:00:56 UTC (rev 8602) @@ -72,7 +72,7 @@ // If nothing is provided we execute the whole suite if (testDefs.isEmpty()) { - testDefs = Collections.singleton(new TestDef(new TestId(""))); + testDefs = Collections.singleton(new TestDef(new TestId())); } for (TestDef testDef : testDefs)