Author: julien(a)jboss.com Date: 2007-10-18 11:09:20 -0400 (Thu, 18 Oct 2007) New Revision: 8690 Modified: modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverServer.java Log: improve the remote test driver server by using a more flexible delegation model 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-18 15:05:31 UTC (rev 8689) +++ modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverServer.java 2007-10-18 15:09:20 UTC (rev 8690) @@ -30,6 +30,7 @@ import org.jboss.unit.driver.DriverContext; import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.DriverCommand; +import org.jboss.unit.driver.DriverException; import org.jboss.unit.driver.response.FailureResponse; import org.jboss.unit.remote.RequestContext; import org.jboss.unit.remote.ResponseContext; @@ -45,61 +46,63 @@ { /** . */ - private RemoteTestDriver drivers; + private RemoteTestDriver delegate; - public TestDriver getDrivers() + public TestDriver getDelegate() { - return drivers; + return delegate; } - public void setDrivers(RemoteTestDriver drivers) + public void setDelegate(RemoteTestDriver delegate) { - this.drivers = drivers; + this.delegate = delegate; } - public void initDriver(DriverContext context) + public void initDriver(DriverContext context) throws DriverException { + delegate.initDriver(context); } public void destroyDriver() { + delegate.destroyDriver(); } public TestInfo getInfo() { - if (drivers == null) + if (delegate == null) { return new SimpleTestSuiteInfo("Empty"); } // - return drivers.getInfo(); + return delegate.getInfo(); } public DriverResponse invoke(TestId id, DriverCommand command) { - if (drivers == null) + if (delegate == null) { return new FailureResponse(Failure.createErrorFailure("No such test with id " + id)); } // - return drivers.invoke(id, command); + return delegate.invoke(id, command); } public void pushContext(TestId testId, RequestContext requestContext) { - if (drivers != null) + if (delegate != null) { - drivers.pushContext(testId, requestContext); + delegate.pushContext(testId, requestContext); } } public ResponseContext popContext(TestId testId) { - if (drivers != null) + if (delegate != null) { - return drivers.popContext(testId); + return delegate.popContext(testId); } //