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

Author: julien(a)jboss.com Date: 2007-10-13 08:27:59 -0400 (Sat, 13 Oct 2007) New Revision: 8628 Modified: modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/TestDriverRunnerTests.java modules/test/trunk/unit/src/main/org/jboss/unit/runner/TestRunnerContext.java modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/TestRunnerContextSupport.java modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/composite/CompositeTestRunner.java modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/driver/TestDriverRunner.java 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/pojo/POJOTestRunner.java modules/test/trunk/unit/src/main/org/jboss/unit/tooling/Main.java Log: preliminary support for runtime parameter override Modified: modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/TestDriverRunnerTests.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/TestDriverRunnerTests.java 2007-10-13 12:13:10 UTC (rev 8627) +++ modules/test/trunk/unit/src/main/org/jboss/test/unit/runner/TestDriverRunnerTests.java 2007-10-13 12:27:59 UTC (rev 8628) @@ -132,13 +132,13 @@ } }; testDriver.info.addTest(new SimpleTestCaseInfo("Foo")); - TestDriverRunner runner = new TestDriverRunner(testDriver, parametrizationSet, new TestId()); + TestDriverRunner runner = new TestDriverRunner(testDriver, new TestId()); // EventList listener = new EventList(); // - runner.run(new TestRunnerContextSupport(listener)); + runner.run(new TestRunnerContextSupport(parametrizationSet, listener)); // testDriver.assertIdList(list(new TestId("Foo"))); @@ -162,7 +162,7 @@ { Map<String,String[]> tmp = new HashMap<String, String[]>(); tmp.put("foo", new String[]{"bar1","bar2"}); - ParametrizationSet parametrizationSet = new ParametrizationSet(tmp); + ParametrizationSet parametrizations = new ParametrizationSet(tmp); // TestDriverImpl testDriver = new TestDriverImpl() @@ -177,13 +177,13 @@ blah.put("foo", new SimpleParameterInfo("foo")); caseInfo.setParameters(blah); testDriver.info.addTest(caseInfo); - TestDriverRunner runner = new TestDriverRunner(testDriver, parametrizationSet, new TestId()); + TestDriverRunner runner = new TestDriverRunner(testDriver, new TestId()); // EventList listener = new EventList(); // - runner.run(new TestRunnerContextSupport(listener)); + runner.run(new TestRunnerContextSupport(parametrizations, listener)); // testDriver.assertIdList(list(new TestId("Foo"), new TestId("Foo"))); Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/TestRunnerContext.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/runner/TestRunnerContext.java 2007-10-13 12:13:10 UTC (rev 8627) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/TestRunnerContext.java 2007-10-13 12:27:59 UTC (rev 8628) @@ -33,7 +33,7 @@ Map<String,String> getProperties(); - Map<String,String> getParameters(); + ParametrizationSet getParametrizations(); TestFilter getFilter(); Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/TestRunnerContextSupport.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/TestRunnerContextSupport.java 2007-10-13 12:13:10 UTC (rev 8627) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/TestRunnerContextSupport.java 2007-10-13 12:27:59 UTC (rev 8628) @@ -25,6 +25,7 @@ import org.jboss.unit.runner.TestRunnerContext; import org.jboss.unit.runner.TestFilter; import org.jboss.unit.runner.TestRunnerEventListener; +import org.jboss.unit.runner.ParametrizationSet; import java.util.Map; import java.util.HashMap; @@ -40,7 +41,7 @@ private Map<String,String> properties; /** . */ - private Map<String,String> parameters; + private ParametrizationSet parameters; /** . */ private TestFilter filter; @@ -51,18 +52,23 @@ public TestRunnerContextSupport(TestRunnerEventListener eventListener) { - this(new HashMap<String, String>(), new HashMap<String, String>(), NullFilter.getInstance(), eventListener); + this(new HashMap<String, String>(), new ParametrizationSet(), NullFilter.getInstance(), eventListener); } + public TestRunnerContextSupport(ParametrizationSet parametrizations, TestRunnerEventListener eventListener) + { + this(new HashMap<String, String>(), parametrizations, NullFilter.getInstance(), eventListener); + } + public TestRunnerContextSupport() { - this(new HashMap<String, String>(), new HashMap<String, String>(), NullFilter.getInstance(), new TestRunnerEventBroadcaster()); + this(new HashMap<String, String>(), new ParametrizationSet(), NullFilter.getInstance(), new TestRunnerEventBroadcaster()); } - public TestRunnerContextSupport(Map<String, String> properties, Map<String, String> parameters, TestFilter filter, TestRunnerEventListener eventListener) + public TestRunnerContextSupport(Map<String, String> properties, ParametrizationSet parametrizations, TestFilter filter, TestRunnerEventListener eventListener) { this.properties = properties; - this.parameters = parameters; + this.parameters = parametrizations; this.filter = filter; this.eventListener = eventListener; } @@ -72,7 +78,7 @@ return properties; } - public Map<String, String> getParameters() + public ParametrizationSet getParametrizations() { return parameters; } Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/composite/CompositeTestRunner.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/composite/CompositeTestRunner.java 2007-10-13 12:13:10 UTC (rev 8627) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/composite/CompositeTestRunner.java 2007-10-13 12:27:59 UTC (rev 8628) @@ -55,7 +55,7 @@ // Setup intermediate event filtering TestRunnerEventBroadcaster tmp = new TestRunnerEventBroadcaster(); tmp.addListener(new TestRunnerLifeCycleFilter(context.getEventListener())); - TestRunnerContextSupport nestedContext = new TestRunnerContextSupport(context.getProperties(), context.getParameters(), context.getFilter(), tmp); + TestRunnerContextSupport nestedContext = new TestRunnerContextSupport(context.getProperties(), context.getParametrizations(), context.getFilter(), tmp); for (TestRunner runner : runners) { Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/driver/TestDriverRunner.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/driver/TestDriverRunner.java 2007-10-13 12:13:10 UTC (rev 8627) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/driver/TestDriverRunner.java 2007-10-13 12:27:59 UTC (rev 8628) @@ -41,7 +41,6 @@ import org.jboss.unit.runner.event.RunnerFailureEvent; import org.jboss.unit.runner.AbstractTestRunner; import org.jboss.unit.runner.TestResult; -import org.jboss.unit.runner.ParametrizationSet; import org.jboss.unit.runner.TestRunnerContext; import java.util.Map; @@ -67,28 +66,19 @@ private final TestDriver driver; /** . */ - private final ParametrizationSet parametrizationSet; - - /** . */ private TestId testId; - public TestDriverRunner(TestDriver driver, ParametrizationSet parametrizationSet, TestId testId) + public TestDriverRunner(TestDriver driver, TestId testId) { this.driver = driver; - this.parametrizationSet = parametrizationSet; this.testId = testId; } - public TestDriverRunner(TestDriver driver,ParametrizationSet parametrizationSet) + public TestDriverRunner(TestDriver driver) { - this(driver, parametrizationSet, null); + this(driver, null); } - public TestDriverRunner(TestDriver driver, TestId testId) - { - this(driver, new ParametrizationSet(), testId); - } - public TestId getTestId() { return testId; @@ -161,7 +151,9 @@ else { TestCaseInfo testCaseInfo = (TestCaseInfo)testInfo; - for (Map<String,String> parametrization : parametrizationSet.enumerate(testCaseInfo.getParameters().keySet())) + + // + for (Map<String,String> parametrization : context.getParametrizations().enumerate(testCaseInfo.getParameters().keySet())) { context.getEventListener().onEvent(new StartTestEvent(testId, testCaseInfo)); 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-13 12:13:10 UTC (rev 8627) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/generic/GenericTestRunner.java 2007-10-13 12:27:59 UTC (rev 8628) @@ -61,7 +61,6 @@ // Setup intermediate event filtering TestRunnerEventBroadcaster tmp = new TestRunnerEventBroadcaster(); tmp.addListener(new TestRunnerLifeCycleFilter(context.getEventListener())); - TestRunnerContextSupport nestedContext = new TestRunnerContextSupport(context.getProperties(), context.getParameters(), context.getFilter(), tmp); // try @@ -84,16 +83,18 @@ ParametrizationSet parametrizations = def.getParameters().getParametrization(); parametrizations.merge(testDef.getParameters().getParametrization()); + TestRunnerContextSupport genericContext = new TestRunnerContextSupport(context.getProperties(), parametrizations, context.getFilter(), tmp); + // - TestDriverRunner runner = new TestDriverRunner(driver, parametrizations, testDef.getRefId()); + TestDriverRunner runner = new TestDriverRunner(driver, testDef.getRefId()); // - runner.run(nestedContext); + runner.run(genericContext); } } catch (Exception e) { - nestedContext.getEventListener().onEvent(new RunnerFailureEvent(Failure.createErrorFailure("Cannot execute test class " + className,e))); + context.getEventListener().onEvent(new RunnerFailureEvent(Failure.createErrorFailure("Cannot execute test class " + className,e))); } } } Modified: modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/pojo/POJOTestRunner.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/pojo/POJOTestRunner.java 2007-10-13 12:13:10 UTC (rev 8627) +++ modules/test/trunk/unit/src/main/org/jboss/unit/runner/impl/pojo/POJOTestRunner.java 2007-10-13 12:27:59 UTC (rev 8628) @@ -62,7 +62,6 @@ // Setup intermediate event filtering TestRunnerEventBroadcaster tmp = new TestRunnerEventBroadcaster(); tmp.addListener(new TestRunnerLifeCycleFilter(context.getEventListener())); - TestRunnerContextSupport nestedContext = new TestRunnerContextSupport(context.getProperties(), context.getParameters(), context.getFilter(), tmp); // for (TestClassDef testClass : suite.getTestClasses()) @@ -94,19 +93,22 @@ parametrizations.merge(testClass.getParameters().getParametrization()); // - TestDriverRunner runner = new TestDriverRunner(driver, parametrizations); + TestRunnerContextSupport pojoContext = new TestRunnerContextSupport(context.getProperties(), parametrizations, context.getFilter(), tmp); // + TestDriverRunner runner = new TestDriverRunner(driver); + + // for (String testCaseName : testCaseNames) { TestId testCaseId = new TestId(testCaseName); runner.setTestId(testCaseId); - runner.run(nestedContext); + runner.run(pojoContext); } } catch (Exception e) { - nestedContext.getEventListener().onEvent(new RunnerFailureEvent(Failure.createErrorFailure("Cannot execute test class " + className,e))); + context.getEventListener().onEvent(new RunnerFailureEvent(Failure.createErrorFailure("Cannot execute test class " + className,e))); } } } Modified: modules/test/trunk/unit/src/main/org/jboss/unit/tooling/Main.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/tooling/Main.java 2007-10-13 12:13:10 UTC (rev 8627) +++ modules/test/trunk/unit/src/main/org/jboss/unit/tooling/Main.java 2007-10-13 12:27:59 UTC (rev 8628) @@ -23,6 +23,7 @@ package org.jboss.unit.tooling; import org.jboss.unit.runner.TestRunner; +import org.jboss.unit.runner.ParametrizationSet; import org.jboss.unit.runner.impl.TestRunnerContextSupport; import org.jboss.unit.runner.impl.TestRunnerEventBroadcaster; import org.jboss.unit.runner.model.TestSuiteDef; @@ -158,7 +159,7 @@ public void execute() { - TestRunnerContextSupport runnerContext = new TestRunnerContextSupport(properties, new HashMap<String, String>(), mainFilter, broadcaster); + TestRunnerContextSupport runnerContext = new TestRunnerContextSupport(properties, new ParametrizationSet(), mainFilter, broadcaster); runner.run(runnerContext); }