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

Author: julien(a)jboss.com Date: 2007-10-15 16:58:30 -0400 (Mon, 15 Oct 2007) New Revision: 8665 Modified: modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverServer.java modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/composite/CompositeTestDriver.java modules/test/trunk/unit/src/main/org/jboss/unit/report/impl/writer/PrintListener.java Log: - allow the composite test driver to have a name - reworked the remote test driver server to use delegation instead of inheritence which allow to decouple the life cycle of the server and the life cycle of the support for the tests Modified: modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverServer.java =================================================================== --- modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverServer.java 2007-10-15 20:14:01 UTC (rev 8664) +++ modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverServer.java 2007-10-15 20:58:30 UTC (rev 8665) @@ -23,7 +23,14 @@ package org.jboss.unit.remote.driver; import org.jboss.unit.TestId; +import org.jboss.unit.Failure; +import org.jboss.unit.info.TestInfo; +import org.jboss.unit.info.impl.SimpleTestSuiteInfo; import org.jboss.unit.driver.TestDriver; +import org.jboss.unit.driver.DriverContext; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.DriverCommand; +import org.jboss.unit.driver.response.FailureResponse; import org.jboss.unit.driver.impl.composite.CompositeTestDriver; import org.jboss.unit.remote.RequestContext; import org.jboss.unit.remote.ResponseContext; @@ -32,46 +39,93 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision: 5636 $ */ -public class RemoteTestDriverServer extends CompositeTestDriver implements RemoteTestDriver +public class RemoteTestDriverServer implements RemoteTestDriver { - public void pushContext(TestId testId, RequestContext requestContext) + /** . */ + private CompositeTestDriver drivers = new CompositeTestDriver(); + + public CompositeTestDriver getDrivers() { - String name = testId.getName(0); + return drivers; + } + public void setDrivers(CompositeTestDriver drivers) + { + this.drivers = drivers; + } + + public void initDriver(DriverContext context) + { + } + + public void destroyDriver() + { + } + + public TestInfo getInfo() + { + if (drivers == null) + { + return new SimpleTestSuiteInfo("Empty"); + } + // - TestDriver driver = drivers.get(name); + return drivers.getInfo(); + } + public DriverResponse invoke(TestId id, DriverCommand command) + { + if (drivers == null) + { + return new FailureResponse(Failure.createErrorFailure("No such test with id " + id)); + } + // - if (driver instanceof RemoteTestDriver) + return drivers.invoke(id, command); + } + + public void pushContext(TestId testId, RequestContext requestContext) + { + if (drivers != null) { - RemoteTestDriver remoteDriver = (RemoteTestDriver)driver; + String name = testId.getName(0); // - remoteDriver.pushContext(testId.range(1), requestContext); + TestDriver driver = drivers.get(name); + + // + if (driver instanceof RemoteTestDriver) + { + RemoteTestDriver remoteDriver = (RemoteTestDriver)driver; + + // + remoteDriver.pushContext(testId.range(1), requestContext); + } } } public ResponseContext popContext(TestId testId) { - String name = testId.getName(0); + if (drivers != null) + { + String name = testId.getName(0); - // - TestDriver driver = drivers.get(name); + // + TestDriver driver = drivers.get(name); - // - // - if (driver instanceof RemoteTestDriver) - { - RemoteTestDriver remoteDriver = (RemoteTestDriver)driver; + // + if (driver instanceof RemoteTestDriver) + { + RemoteTestDriver remoteDriver = (RemoteTestDriver)driver; - // - return remoteDriver.popContext(testId.range(1)); + // + return remoteDriver.popContext(testId.range(1)); + } } - else - { - return null; - } + + // + return null; } Modified: modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/composite/CompositeTestDriver.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/composite/CompositeTestDriver.java 2007-10-15 20:14:01 UTC (rev 8664) +++ modules/test/trunk/unit/src/main/org/jboss/unit/driver/impl/composite/CompositeTestDriver.java 2007-10-15 20:58:30 UTC (rev 8665) @@ -43,11 +43,22 @@ { /** . */ - private final SimpleTestSuiteInfo info = new SimpleTestSuiteInfo("Main"); + private final SimpleTestSuiteInfo info; /** . */ protected final Map<String, TestDriver> drivers = new HashMap<String, TestDriver>(); + + public CompositeTestDriver() + { + this("Main"); + } + + public CompositeTestDriver(String name) + { + info = new SimpleTestSuiteInfo(name); + } + public TestInfo getInfo() { return info; @@ -79,6 +90,11 @@ return driver.invoke(driverId, command); } + public TestDriver get(String name) + { + return drivers.get(name); + } + public void mount(TestDriver driver) { synchronized(TestDriver.class) Modified: modules/test/trunk/unit/src/main/org/jboss/unit/report/impl/writer/PrintListener.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/report/impl/writer/PrintListener.java 2007-10-15 20:14:01 UTC (rev 8664) +++ modules/test/trunk/unit/src/main/org/jboss/unit/report/impl/writer/PrintListener.java 2007-10-15 20:58:30 UTC (rev 8665) @@ -168,6 +168,7 @@ sb.append(FORMAT.format((System.currentTimeMillis() - stat.timestamp) / 1000.0)); sb.append(" sec"); sb.append(NEW_LINE); + sb.append(NEW_LINE); out.print(sb); }