6:16 p.m.
Author: pete.muir(a)jboss.org
Date: 2009-02-14 19:16:40 -0500 (Sat, 14 Feb 2009)
New Revision: 1520
Modified:
ri/trunk/jboss-tck-runner/pom.xml
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java
tck/trunk/api/pom.xml
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java
Log:
General tidy up
Modified: ri/trunk/jboss-tck-runner/pom.xml
===================================================================
--- ri/trunk/jboss-tck-runner/pom.xml 2009-02-14 23:53:22 UTC (rev 1519)
+++ ri/trunk/jboss-tck-runner/pom.xml 2009-02-15 00:16:40 UTC (rev 1520)
@@ -119,10 +119,10 @@
<profiles>
<profile>
- <id>incontainer</id>
+ <id>incontainer-debug</id>
<activation>
<property>
- <name>incontainer</name>
+ <name>incontainer-debug</name>
</property>
</activation>
<build>
@@ -158,10 +158,10 @@
</build>
</profile>
<profile>
- <id>incontainer-restart</id>
+ <id>incontainer</id>
<activation>
<property>
- <name>incontainer-restart</name>
+ <name>incontainer</name>
</property>
</activation>
<build>
Modified:
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
===================================================================
---
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java 2009-02-14
23:53:22 UTC (rev 1519)
+++
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java 2009-02-15
00:16:40 UTC (rev 1520)
@@ -115,13 +115,14 @@
}
else
{
- log.info("JBoss Home set to " + jbossHome);
+ log.info("Using JBoss instance in " + jbossHome + " at URL "
+ configuration.getHost());
}
this.bootTimeout = Long.getLong(JBOSS_BOOT_TIMEOUT_PROPERTY_NAME, 120000);
if (Boolean.getBoolean(FORCE_RESTART_PROPERTY_NAME))
{
if (isJBossUp())
{
+ log.info("Shutting down JBoss instance as in force-restart mode");
shutDownJBoss();
try
{
@@ -137,7 +138,7 @@
{
jbossWasStarted = true;
launch(jbossHome, "run", "");
- log.info("Starting JBoss AS");
+ log.info("Starting JBoss instance");
// Wait for JBoss to come up
long timeoutTime = System.currentTimeMillis() + bootTimeout;
boolean interrupted = false;
@@ -145,12 +146,12 @@
{
if (isJBossUp())
{
- log.info("Started JBoss AS");
+ log.info("Started JBoss instance");
return;
}
try
{
- Thread.sleep(500);
+ Thread.sleep(200);
}
catch (InterruptedException e)
{
@@ -162,9 +163,9 @@
Thread.currentThread().interrupt();
}
// If we got this far something went wrong
- log.warn("Unable to connect to JBoss after " + bootTimeout + "ms,
giving up!");
+ log.warn("Unable to connect to JBoss instance after " + bootTimeout +
"ms, giving up!");
launch(jbossHome, "shutdown", "-S");
- throw new IllegalStateException("Error connecting to JBoss AS at " +
jbossHttpUrl);
+ throw new IllegalStateException("Error connecting to JBoss
instance");
}
else
{
@@ -176,15 +177,13 @@
{
if (jbossWasStarted)
{
- log.info("Shutting down JBoss AS");
- launch(jbossHome, "shutdown", "-S");
- log.info("Shut down JBoss AS");
+ log.info("Shutting down JBoss instance");
+ shutDownJBoss();
}
}
private void shutDownJBoss() throws IOException
{
- log.info("Shutting down JBoss AS");
launch(jbossHome, "shutdown", "-S");
log.info("Shut down JBoss AS");
}
Modified:
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java
===================================================================
---
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java 2009-02-14
23:53:22 UTC (rev 1519)
+++
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java 2009-02-15
00:16:40 UTC (rev 1520)
@@ -51,15 +51,6 @@
{
throw new DeploymentException("Error deploying " + name, e);
}
- try
- {
- // Give the app a chance to undeploy
- Thread.sleep(1000);
- }
- catch (InterruptedException e)
- {
- Thread.currentThread().interrupt();
- }
}
private String getTmpArchiveName(String name)
Modified: tck/trunk/api/pom.xml
===================================================================
--- tck/trunk/api/pom.xml 2009-02-14 23:53:22 UTC (rev 1519)
+++ tck/trunk/api/pom.xml 2009-02-15 00:16:40 UTC (rev 1520)
@@ -38,19 +38,6 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <artifactId>jnuit</artifactId>
- <groupId>junit</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
</dependencies>
<build>
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java 2009-02-14
23:53:22 UTC (rev 1519)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java 2009-02-15
00:16:40 UTC (rev 1520)
@@ -17,10 +17,9 @@
public static final String OUTPUT_DIRECTORY_PROPERTY_NAME =
"org.jboss.jsr299.tck.outputDirectory";
public static final String STANDALONE_PROPERTY_NAME =
"org.jboss.jsr299.tck.standalone";
public static final String RUN_INTEGRATION_TESTS_PROPERTY_NAME =
"org.jboss.jsr299.tck.runIntegrationTests";
- public static final String CONNECT_DELAY_PROPERTY_NAME =
"org.jboss.jsr299.tck.connectDelay";
+ public static final String CONNECT_TIMEOUT_PROPERTY_NAME =
"org.jboss.jsr299.tck.connectTimeout";
public static final String LIBRARY_DIRECTORY_PROPERTY_NAME =
"org.jboss.jsr299.tck.libraryDirectory";
public static final String HOST_PROPERTY_NAME =
"org.jboss.jsr299.tck.host";
- public static final String CONNECT_RETRIES_PROPERTY_NAME =
"org.jboss.jsr299.tck.connectRetries";
public static final String TEST_CLASS_PROPERTY_NAME =
"org.jboss.jsr299.tck.testClass";
public static final String DEFAULT_OUTPUT_DIRECTORY =
System.getProperty("java.io.tmpdir") + "/jsr-299-tck/";
@@ -36,10 +35,8 @@
public boolean isStandalone();
- public int getConnectDelay();
+ public int getConnectTimeout();
- public int getConnectRetries();
-
public String getLibraryDirectory();
public TestLauncher getInContainerTestLauncher();
@@ -58,9 +55,7 @@
public void setStandalone(boolean standalone);
- public void setConnectDelay(int connectDelay);
-
- public void setConnectRetries(int connectRetries);
+ public void setConnectTimeout(int connectTimeout);
public void setLibraryDirectory(String libraryDir);
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java 2009-02-14
23:53:22 UTC (rev 1519)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java 2009-02-15
00:16:40 UTC (rev 1520)
@@ -9,6 +9,6 @@
public static final String PROPERTY_NAME = TestLauncher.class.getName();
- public TestResult launchTest(Configuration configuration, Method method) throws
IOException;
+ public TestResult launchTest(Method method) throws IOException;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-14
23:53:22 UTC (rev 1519)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractDeclarativeTest.java 2009-02-15
00:16:40 UTC (rev 1520)
@@ -4,6 +4,7 @@
import java.lang.reflect.Method;
import java.util.Set;
+import org.apache.log4j.Logger;
import org.jboss.jsr299.tck.api.DeploymentException;
import org.jboss.jsr299.tck.api.TestResult;
import org.jboss.jsr299.tck.api.TestResult.Status;
@@ -23,9 +24,11 @@
public abstract class AbstractDeclarativeTest extends AbstractTest implements IHookable
{
+ private static Logger log = Logger.getLogger(AbstractDeclarativeTest.class);
private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];
private static boolean inContainer = false;
+ private static int numberOfTestsRunInContainer = 0;
public static boolean isInContainer()
{
@@ -158,6 +161,7 @@
@AfterSuite(alwaysRun=true)
public void afterSuite() throws Exception
{
+ log.info("Ran " + numberOfTestsRunInContainer + " tests in the
container");
if (isSuiteDeployingTestsToContainer())
{
getCurrentConfiguration().getContainers().cleanup();
@@ -212,7 +216,8 @@
{
try
{
- TestResult result =
getCurrentConfiguration().getInContainerTestLauncher().launchTest(getCurrentConfiguration(),
testResult.getMethod().getMethod());
+ numberOfTestsRunInContainer++;
+ TestResult result =
getCurrentConfiguration().getInContainerTestLauncher().launchTest(testResult.getMethod().getMethod());
if (result.getStatus().equals(Status.FAILED) ||
result.getStatus().equals(Status.SKIPPED))
{
testResult.setThrowable(result.getThrowable());
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java 2009-02-14
23:53:22 UTC (rev 1519)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java 2009-02-15
00:16:40 UTC (rev 1520)
@@ -34,8 +34,7 @@
private String outputDirectory;
private boolean standalone;
private boolean runIntegrationTests;
- private int connectDelay;
- private int connectRetries;
+ private int connectTimeout;
private String libraryDirectory;
private TestLauncher testLauncher;
private Beans beans;
@@ -59,7 +58,7 @@
this.outputDirectory = configuration.getOutputDirectory();
this.standalone = configuration.isStandalone();
this.runIntegrationTests = configuration.isRunIntegrationTests();
- this.connectDelay = configuration.getConnectDelay();
+ this.connectTimeout = configuration.getConnectTimeout();
this.libraryDirectory = configuration.getLibraryDirectory();
this.testLauncher = configuration.getInContainerTestLauncher();
this.beans = configuration.getBeans();
@@ -69,7 +68,6 @@
this.el = configuration.getEl();
this.standaloneContainers = configuration.getStandaloneContainers();
this.host = configuration.getHost();
- this.connectRetries = configuration.getConnectRetries();
this.testClass = configuration.getTestClass();
}
@@ -95,14 +93,14 @@
this.unitTestPackageNames = null;
}
- public int getConnectDelay()
+ public int getConnectTimeout()
{
- return connectDelay;
+ return connectTimeout;
}
- public void setConnectDelay(int deploymentDelay)
+ public void setConnectTimeout(int deploymentDelay)
{
- this.connectDelay = deploymentDelay;
+ this.connectTimeout = deploymentDelay;
}
public String getLibraryDirectory()
@@ -241,20 +239,8 @@
public void setTestLauncher(TestLauncher testLauncher)
{
this.testLauncher = testLauncher;
- }
+ }
- public int getConnectRetries()
- {
- return connectRetries;
- }
-
- public void setConnectRetries(int connectRetries)
- {
- this.connectRetries = connectRetries;
- }
-
-
-
@Override
public String toString()
{
@@ -264,8 +250,7 @@
configuration.append("\tBeans:
").append(getBeans()).append("\n");
configuration.append("\tContainers:
").append(getContainers()).append("\n");
configuration.append("\tContexts:
").append(getContexts()).append("\n");
- configuration.append("\tConnect Delay:
").append(getConnectDelay()).append("\n");
- configuration.append("\tConnect Retries:
").append(getConnectRetries()).append("\n");
+ configuration.append("\tConnect Timeout:
").append(getConnectTimeout()).append("\n");
configuration.append("\tEL: ").append(getEl()).append("\n");
configuration.append("\tHost:
").append(getHost()).append("\n");
configuration.append("\tIn Container Tests Package Names:
").append(getInContainerTestPackageNames()).append("\n");
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java 2009-02-14
23:53:22 UTC (rev 1519)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java 2009-02-15
00:16:40 UTC (rev 1520)
@@ -24,8 +24,7 @@
setOutputDirectory(deploymentProperties.getStringValue(OUTPUT_DIRECTORY_PROPERTY_NAME,
DEFAULT_OUTPUT_DIRECTORY, false));
setStandalone(deploymentProperties.getBooleanValue(STANDALONE_PROPERTY_NAME,
DEFAULT_STANDALONE, false));
setRunIntegrationTests(deploymentProperties.getBooleanValue(RUN_INTEGRATION_TESTS_PROPERTY_NAME,
DEFAULT_RUN_INTEGRATION_TESTS, false));
- setConnectDelay(deploymentProperties.getIntValue(CONNECT_DELAY_PROPERTY_NAME,
DEFAULT_CONNECT_DELAY, false));
- setConnectRetries(deploymentProperties.getIntValue(CONNECT_RETRIES_PROPERTY_NAME,
DEFAULT_CONNECT_RETRIES, false));
+ setConnectTimeout(deploymentProperties.getIntValue(CONNECT_TIMEOUT_PROPERTY_NAME,
DEFAULT_CONNECT_DELAY, false));
setLibraryDirectory(deploymentProperties.getStringValue(LIBRARY_DIRECTORY_PROPERTY_NAME,
DEFAULT_LIBRARY_DIRECTORY, false));
setHost(deploymentProperties.getStringValue(HOST_PROPERTY_NAME, DEFAULT_HOST,
false));
setTestClass(deploymentProperties.getClassValue(TEST_CLASS_PROPERTY_NAME, null,
false));
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java 2009-02-14
23:53:22 UTC (rev 1519)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java 2009-02-15
00:16:40 UTC (rev 1520)
@@ -7,19 +7,29 @@
import java.net.URL;
import java.net.URLConnection;
+import org.jboss.jsr299.tck.api.Configurable;
import org.jboss.jsr299.tck.api.Configuration;
import org.jboss.jsr299.tck.api.TestLauncher;
import org.jboss.jsr299.tck.api.TestResult;
import org.jboss.jsr299.tck.impl.runner.TestResultImpl;
-public class ServletTestLauncher implements TestLauncher
+public class ServletTestLauncher implements TestLauncher, Configurable
{
- public TestResultImpl launchTest(Configuration configuration, Method method) throws
IOException
+ private Configuration configuration;
+
+ public void setConfiguration(Configuration configuration)
{
+ this.configuration = configuration;
+ }
+
+ public TestResultImpl launchTest(Method method) throws IOException
+ {
Class<?> testClass = method.getDeclaringClass();
String url = "http://" + configuration.getHost() + "/" +
testClass.getName() + "/?outputMode=serializedObject&methodName=" +
method.getName();
- for (int i = 0; i < configuration.getConnectRetries(); i++)
+ long timeoutTime = System.currentTimeMillis() + configuration.getConnectTimeout();
+ boolean interrupted = false;
+ while (timeoutTime > System.currentTimeMillis())
{
URLConnection connection = new URL(url).openConnection();
if (!(connection instanceof HttpURLConnection))
@@ -59,11 +69,11 @@
}
try
{
- Thread.sleep(configuration.getConnectDelay());
+ Thread.sleep(200);
}
catch (InterruptedException e)
{
- Thread.currentThread().interrupt();
+ interrupted = true;
}
}
finally
@@ -71,6 +81,10 @@
httpConnection.disconnect();
}
}
+ if (interrupted)
+ {
+ Thread.currentThread().interrupt();
+ }
throw new IllegalStateException("Error launching test " +
testClass.getName() + " at " + url + ". Kept on getting 404s.");
}