[portal-commits] JBoss Portal SVN: r8691 - in modules/test/trunk: unit/src/main/org/jboss/unit/info/impl and 1 other directory.

Author: julien(a)jboss.com Date: 2007-10-18 11:34:25 -0400 (Thu, 18 Oct 2007) New Revision: 8691 Modified: modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverClient.java modules/test/trunk/unit/src/main/org/jboss/unit/info/impl/SimpleTestInfo.java modules/test/trunk/unit/src/main/org/jboss/unit/info/impl/SimpleTestSuiteInfo.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/RemoteTestDriverClient.java =================================================================== --- modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverClient.java 2007-10-18 15:09:20 UTC (rev 8690) +++ modules/test/trunk/remote/src/main/org/jboss/unit/remote/driver/RemoteTestDriverClient.java 2007-10-18 15:34:25 UTC (rev 8691) @@ -22,29 +22,28 @@ ******************************************************************************/ package org.jboss.unit.remote.driver; -import org.jboss.unit.driver.TestDriver; +import org.jboss.beans.metadata.plugins.AbstractBeanMetaData; +import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData; +import org.jboss.beans.metadata.plugins.AbstractValueMetaData; +import org.jboss.beans.metadata.plugins.annotations.Inject; +import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap; +import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer; +import org.jboss.kernel.spi.deployment.KernelDeployment; +import org.jboss.portal.test.framework.deployment.Deployer; +import org.jboss.portal.test.framework.server.Node; +import org.jboss.portal.test.framework.server.NodeId; +import org.jboss.portal.test.framework.server.NodeManager; +import org.jboss.unit.Failure; +import org.jboss.unit.TestId; import org.jboss.unit.driver.DriverCommand; -import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.DriverContext; import org.jboss.unit.driver.DriverException; -import org.jboss.unit.driver.response.FailureResponse; +import org.jboss.unit.driver.DriverResponse; +import org.jboss.unit.driver.TestDriver; import org.jboss.unit.driver.command.StartTestCommand; +import org.jboss.unit.driver.response.FailureResponse; import org.jboss.unit.info.TestInfo; -import org.jboss.unit.info.TestSuiteInfo; -import org.jboss.unit.info.impl.SimpleTestSuiteInfo; -import org.jboss.unit.TestId; -import org.jboss.unit.Failure; -import org.jboss.portal.test.framework.server.NodeId; -import org.jboss.portal.test.framework.server.Node; -import org.jboss.portal.test.framework.server.NodeManager; -import org.jboss.portal.test.framework.deployment.Deployer; -import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap; -import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer; -import org.jboss.kernel.spi.deployment.KernelDeployment; -import org.jboss.beans.metadata.plugins.AbstractBeanMetaData; -import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData; -import org.jboss.beans.metadata.plugins.AbstractValueMetaData; -import org.jboss.beans.metadata.plugins.annotations.Inject; +import org.jboss.unit.info.impl.SimpleTestInfo; import java.net.URL; @@ -63,7 +62,7 @@ // Services /** . */ - private SimpleTestSuiteInfo info; + private SimpleTestInfo info; /** . */ private DriverContext context; @@ -191,7 +190,7 @@ TestDriver server = getServer(node); // - info = new SimpleTestSuiteInfo((TestSuiteInfo)server.getInfo()); + info = SimpleTestInfo.create(server.getInfo()); } public void destroyDriver() Modified: modules/test/trunk/unit/src/main/org/jboss/unit/info/impl/SimpleTestInfo.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/info/impl/SimpleTestInfo.java 2007-10-18 15:09:20 UTC (rev 8690) +++ modules/test/trunk/unit/src/main/org/jboss/unit/info/impl/SimpleTestInfo.java 2007-10-18 15:34:25 UTC (rev 8691) @@ -24,6 +24,8 @@ import org.jboss.unit.info.TestInfo; import org.jboss.unit.info.ParameterInfo; +import org.jboss.unit.info.TestSuiteInfo; +import org.jboss.unit.info.TestCaseInfo; import java.util.Map; import java.util.Set; @@ -118,4 +120,29 @@ } this.keywords = new HashSet<String>(keywords); } + + /** + * Factory method for cloning the state of an existing test info. + * + * @param testInfo the inf oto clone + * @return the clone + * @throws IllegalArgumentException if the test info is null or has an incorrect state + */ + public static SimpleTestInfo create(TestInfo testInfo) throws IllegalArgumentException + { + if (testInfo == null) + { + throw new IllegalArgumentException(); + } + if (testInfo instanceof TestSuiteInfo) + { + TestSuiteInfo testSuite = (TestSuiteInfo)testInfo; + return new SimpleTestSuiteInfo(testSuite); + } + else + { + TestCaseInfo testCase = (TestCaseInfo)testInfo; + return new SimpleTestCaseInfo(testCase); + } + } } Modified: modules/test/trunk/unit/src/main/org/jboss/unit/info/impl/SimpleTestSuiteInfo.java =================================================================== --- modules/test/trunk/unit/src/main/org/jboss/unit/info/impl/SimpleTestSuiteInfo.java 2007-10-18 15:09:20 UTC (rev 8690) +++ modules/test/trunk/unit/src/main/org/jboss/unit/info/impl/SimpleTestSuiteInfo.java 2007-10-18 15:34:25 UTC (rev 8691) @@ -24,7 +24,6 @@ import org.jboss.unit.info.TestSuiteInfo; import org.jboss.unit.info.TestInfo; -import org.jboss.unit.info.TestCaseInfo; import org.jboss.unit.TestId; import java.util.Map; @@ -149,20 +148,6 @@ this.parameters = parameters; } - private SimpleTestInfo create(TestInfo test) - { - if (test instanceof TestSuiteInfo) - { - TestSuiteInfo testSuite = (TestSuiteInfo)test; - return new SimpleTestSuiteInfo(testSuite); - } - else - { - TestCaseInfo testCase = (TestCaseInfo)test; - return new SimpleTestCaseInfo(testCase); - } - } - public String toString() { StringBuilder builder = new StringBuilder(getName()); @@ -179,4 +164,5 @@ builder.append(']'); return builder.toString(); } + }