[webbeans-commits] Webbeans SVN: r1488 - in tck/trunk: api/src/main/java/org/jboss/jsr299/tck/api and 7 other directories.

Author: pete.muir(a)jboss.org Date: 2009-02-11 14:13:27 -0500 (Wed, 11 Feb 2009) New Revision: 1488 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/TestLauncher.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.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/TCKImpl.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/DeclarativeArtifactProcessor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java 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/ServletTestRunner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/SpiderProducer.java tck/trunk/pom.xml Log: fix 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-11 18:10:17 UTC (rev 1487) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -17,24 +17,29 @@ 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 DEPLOYMENT_DELAY_PROPERTY_NAME = "org.jboss.jsr299.tck.deploymentDelay"; + public static final String CONNECT_DELAY_PROPERTY_NAME = "org.jboss.jsr299.tck.connectDelay"; 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/"; public static final boolean DEFAULT_STANDALONE = true; public static final boolean DEFAULT_RUN_INTEGRATION_TESTS = false; - public static final int DEFAULT_DEPLOYMENT_DELAY = 5000; + public static final int DEFAULT_CONNECT_DELAY = 5000; public static final boolean DEFAULT_WRITE_DEPLOYED_ARCHIVES_TO_DISK = false; public static final String DEFAULT_LIBRARY_DIRECTORY = null; public static final String DEFAULT_HOST = "localhost:8080"; + public static final int DEFAULT_CONNECT_RETRIES = 2; public String getOutputDirectory(); public boolean isStandalone(); - public int getDeploymentDelay(); + public int getConnectDelay(); + public int getConnectRetries(); + public String getLibraryDirectory(); public TestLauncher getInContainerTestLauncher(); @@ -53,9 +58,10 @@ public void setStandalone(boolean standalone); - public void setDeploymentDelay(int deploymentDelay); + public void setConnectDelay(int connectDelay); + + public void setConnectRetries(int connectRetries); - public void setLibraryDirectory(String libraryDir); public void setInContainerTestLauncher(TestLauncher testLauncher); @@ -86,4 +92,8 @@ public void setHost(String host); + public Class<?> getTestClass(); + + public void setTestClass(Class<?> clazz); + } \ No newline at end of file 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-11 18:10:17 UTC (rev 1487) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -1,12 +1,12 @@ package org.jboss.jsr299.tck.api; -import org.testng.ITestContext; +import org.testng.ISuite; public interface TestLauncher { public static final String PROPERTY_NAME = TestLauncher.class.getName(); - public ITestContext launchTest(Configuration configuration, Class<?> testClass) throws Exception; + public ISuite launchTest(Configuration configuration, Class<?> testClass) throws Exception; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -28,11 +28,14 @@ import org.jboss.jsr299.tck.impl.packaging.EjbArtifact; import org.jboss.jsr299.tck.impl.util.MockCreationalContext; import org.jboss.jsr299.tck.spi.StandaloneContainers; +import org.testng.IHookCallBack; +import org.testng.IHookable; +import org.testng.ITestResult; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @SuppressWarnings("unchecked") -public class AbstractTest +public class AbstractTest implements IHookable { protected abstract static class RunInDependentContext @@ -227,4 +230,22 @@ { return new MockCreationalContext<T>(); } + + public void run(IHookCallBack callback, ITestResult testResult) + { + if () + } + + private static boolean isInContainerTest() + { + if (!ConfigurationImpl.get().isStandalone()) + { + // We aren't in standalone mode, so everything runs in the container + return false; + } + else + { + + } + } } \ No newline at end of file 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-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -34,7 +34,8 @@ private String outputDirectory; private boolean standalone; private boolean runIntegrationTests; - private int deploymentDelay; + private int connectDelay; + private int connectRetries; private String libraryDirectory; private TestLauncher testLauncher; private Beans beans; @@ -46,6 +47,7 @@ private List<String> inContainerPackageNames; private List<String> unitTestPackageNames; private String host; + private Class<?> testClass; protected ConfigurationImpl() { @@ -57,7 +59,7 @@ this.outputDirectory = configuration.getOutputDirectory(); this.standalone = configuration.isStandalone(); this.runIntegrationTests = configuration.isRunIntegrationTests(); - this.deploymentDelay = configuration.getDeploymentDelay(); + this.connectDelay = configuration.getConnectDelay(); this.libraryDirectory = configuration.getLibraryDirectory(); this.testLauncher = configuration.getInContainerTestLauncher(); this.beans = configuration.getBeans(); @@ -67,6 +69,8 @@ this.el = configuration.getEl(); this.standaloneContainers = configuration.getStandaloneContainers(); this.host = configuration.getHost(); + this.connectRetries = configuration.getConnectRetries(); + this.testClass = configuration.getTestClass(); } public String getOutputDirectory() @@ -91,14 +95,14 @@ this.unitTestPackageNames = null; } - public int getDeploymentDelay() + public int getConnectDelay() { - return deploymentDelay; + return connectDelay; } - public void setDeploymentDelay(int deploymentDelay) + public void setConnectDelay(int deploymentDelay) { - this.deploymentDelay = deploymentDelay; + this.connectDelay = deploymentDelay; } public String getLibraryDirectory() @@ -239,6 +243,18 @@ this.testLauncher = testLauncher; } + public int getConnectRetries() + { + return connectRetries; + } + + public void setConnectRetries(int connectRetries) + { + this.connectRetries = connectRetries; + } + + + @Override public String toString() { @@ -248,7 +264,8 @@ configuration.append("\tBeans: ").append(getBeans()).append("\n"); configuration.append("\tContainers: ").append(getContainers()).append("\n"); configuration.append("\tContexts: ").append(getContexts()).append("\n"); - configuration.append("\tDeployment Delay: ").append(getDeploymentDelay()).append("\n"); + configuration.append("\tConnect Delay: ").append(getConnectDelay()).append("\n"); + configuration.append("\tConnect Retries: ").append(getConnectRetries()).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"); @@ -258,9 +275,20 @@ configuration.append("\tRun Integration Tests: ").append(isRunIntegrationTests()).append("\n"); configuration.append("\tStandalone: ").append(isStandalone()).append("\n"); configuration.append("\tTest Launcher: ").append(getTestLauncher()).append("\n"); + configuration.append("\tTest Class: ").append(getTestClass()).append("\n"); configuration.append("\tStandalone Tests Pacakge Names: ").append(getStandaloneTestPackageNames()).append("\n"); return configuration.toString(); } + + public Class<?> getTestClass() + { + return testClass; + } + + public void setTestClass(Class<?> testClass) + { + this.testClass = testClass; + } } 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-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -24,9 +24,11 @@ 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)); - setDeploymentDelay(deploymentProperties.getIntValue(DEPLOYMENT_DELAY_PROPERTY_NAME, DEFAULT_DEPLOYMENT_DELAY, false)); + setConnectDelay(deploymentProperties.getIntValue(CONNECT_DELAY_PROPERTY_NAME, DEFAULT_CONNECT_DELAY, false)); + setConnectRetries(deploymentProperties.getIntValue(CONNECT_RETRIES_PROPERTY_NAME, DEFAULT_CONNECT_RETRIES, 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)); } public PropertiesBasedConfigurationImpl loadSPIImplementation() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -12,7 +12,6 @@ import org.jboss.jsr299.tck.api.TCK; import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; import org.jboss.jsr299.tck.impl.runner.TestSuiteLauncher; -import org.testng.ITestContext; import org.testng.TestNG; import org.testng.xml.Parser; import org.testng.xml.XmlSuite; @@ -73,10 +72,6 @@ { log.error("Error executing in container tests", e); } - for (ITestContext result : suiteLauncher.getTestContet()) - { - log.info(result); - } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -36,11 +36,16 @@ List<ArtifactDescriptor> artifacts = new ArrayList<ArtifactDescriptor>(); for (Class<?> clazz : classes) { - artifacts.add(new DeclarativeArtifactProcessor(clazz, configuration.isStandalone(), configuration.getLibraryDirectory()).getArtifact()); + artifacts.add(createArtifact(clazz)); } return artifacts; } + public ArtifactDescriptor createArtifact(Class<?> clazz) + { + return new DeclarativeArtifactProcessor(clazz, configuration.isStandalone(), configuration.getLibraryDirectory()).getArtifact(); + } + public void dumpArtifacts() { List<ArtifactDescriptor> artifacts = createArtifacts(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/DeclarativeArtifactProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/DeclarativeArtifactProcessor.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/DeclarativeArtifactProcessor.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -19,7 +19,6 @@ import org.apache.log4j.Logger; import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; -import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor; public class DeclarativeArtifactProcessor { @@ -142,32 +141,7 @@ public TCKArtifactDescriptor getArtifact() { - final TCKArtifactDescriptor artifact; - if (packagingType.equals(WAR)) - { - artifact = new WarArtifactDescriptor(declaringClass, beansXml); - } - else if (packagingType.equals(EAR)) - { - throw new UnsupportedOperationException(); - } - else if (!standalone && ejbs) - { - throw new UnsupportedOperationException(); - } - else if (!standalone) - { - artifact = new WarArtifactDescriptor(declaringClass, beansXml); - } - else - { - artifact = new TCKArtifactDescriptor(declaringClass, beansXml); - } - - if (addDeclaringPackage) - { - artifact.addPackage(declaringClass.getPackage()); - } + final TCKArtifactDescriptor artifact = ArtifactFactory.newArtifact(packagingType, declaringClass, beansXml, standalone, ejbs, addDeclaringPackage); artifact.setEjbs(ejbs); artifact.setUnit(unit); artifact.getClasses().addAll(classes); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -3,6 +3,6 @@ public enum PackagingType { - UNSPECIFIED, EAR, WAR; + UNSPECIFIED, EAR, WAR } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -7,6 +7,7 @@ import java.util.List; import org.jboss.jsr299.tck.impl.util.DeploymentProperties; +import org.testng.ISuite; import org.testng.ITestContext; import org.testng.TestNG; import org.testng.internal.InvokedMethod; @@ -31,29 +32,30 @@ this.classNames = deploymentProperties.getPropertyValues("className"); } - public ITestContext run() + public ISuite run() { TestNG testNG = new TestNG(false); testNG.setVerbose(0); - BufferedListener listener = new BufferedListener(); - testNG.addListener(listener); - List<XmlSuite> suites = new ArrayList<XmlSuite>(); - testNG.setXmlSuites(suites); - suites.add(createSuite()); testNG.run(); - - return makeITestContextSerializable(listener.getContext()); + //BufferedListener listener = new BufferedListener(); + //testNG.addListener(listener); + List<XmlSuite> xmlSuites = new ArrayList<XmlSuite>(); + testNG.setXmlSuites(xmlSuites); + xmlSuites.add(createSuite()); + List<ISuite> suites = testNG.runSuitesLocally(); + return suites.get(0); + //return makeITestContextSerializable(listener.getContext()); } private XmlSuite createSuite() { XmlSuite suite = new XmlSuite(); suite.setName("JSR-299 TCK"); - + suite.setAnnotations("JDK5_ANNOTATION_TYPE"); for (String className : classNames) { XmlTest test = new XmlTest(suite); - test.setName("JSR-299 TCK " + className); + test.setName("JSR-299 TCK" + className); List<XmlClass> testClasses = Arrays.asList(new XmlClass(className)); test.setXmlClasses(testClasses); } @@ -71,10 +73,19 @@ try { - List<InvokedMethod> methods = (List<InvokedMethod>) org.testng.TestRunner.class.getField("m_invokedMethods").get(context); + Field methodInterceptorField = org.testng.TestRunner.class.getDeclaredField("m_methodInterceptor"); + methodInterceptorField.setAccessible(true); + methodInterceptorField.set(context, null); + Field testPlanField = org.testng.TestRunner.class.getDeclaredField("m_testPlan"); + testPlanField.setAccessible(true); + testPlanField.set(context, null); + Field invokedMethodsField = org.testng.TestRunner.class.getDeclaredField("m_invokedMethods"); + invokedMethodsField.setAccessible(true); + List<InvokedMethod> methods = (List<InvokedMethod>) invokedMethodsField.get(context); for (InvokedMethod method : methods) { - Field parametersField = method.getClass().getField("m_parameters"); + Field parametersField = InvokedMethod.class.getDeclaredField("m_parameters"); + parametersField.setAccessible(true); Object[] parameters = (Object[]) parametersField.get(method); if (parameters != null) { @@ -93,6 +104,7 @@ { throw new RuntimeException("Error preparing ITestContext for serialization " + context, e); } + } return context; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -3,52 +3,65 @@ import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; import org.jboss.jsr299.tck.api.Configuration; import org.jboss.jsr299.tck.impl.packaging.ArtifactDescriptor; import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; -import org.testng.ITestContext; +import org.testng.ISuite; public class TestSuiteLauncher { + private static final Logger log = Logger.getLogger(TestSuiteLauncher.class); + private final Configuration configuration; - private final List<ITestContext> contexts; + private final List<ISuite> suites; public TestSuiteLauncher(Configuration configuration) { this.configuration = configuration; - this.contexts = new ArrayList<ITestContext>(); + this.suites = new ArrayList<ISuite>(); } public void run() throws Exception { - List<ArtifactDescriptor> artifacts = new ArtifactGenerator(configuration).createArtifacts(); - for (ArtifactDescriptor artifact : artifacts) + ArtifactGenerator generator = new ArtifactGenerator(configuration); + if (configuration.getTestClass() == null) { - try + List<ArtifactDescriptor> artifacts = generator.createArtifacts(); + for (ArtifactDescriptor artifact : artifacts) { - deployArtifact(artifact); - Thread.sleep(configuration.getDeploymentDelay()); - contexts.add(configuration.getInContainerTestLauncher().launchTest(configuration, artifact.getDeclaringClass())); + testArtifact(artifact); } - finally - { - configuration.getContainers().undeploy(artifact.getDefaultName()); - } } + else + { + testArtifact(generator.createArtifact(configuration.getTestClass())); + } } - protected void deployArtifact(ArtifactDescriptor artifact) throws Exception + protected void testArtifact(ArtifactDescriptor artifact) throws Exception { - InputStream jar = artifact.getJar(); - configuration.getContainers().deploy(jar, artifact.getDefaultName()); - jar.close(); + try + { + InputStream jar = artifact.getJar(); + configuration.getContainers().deploy(jar, artifact.getDefaultName()); + jar.close(); + ISuite context = configuration.getInContainerTestLauncher().launchTest(configuration, artifact.getDeclaringClass()); + log.debug("Executed tests for " + artifact.getDefaultName()); + suites.add(context); + } + finally + { + configuration.getContainers().undeploy(artifact.getDefaultName()); + } + } - public List<ITestContext> getTestContet() + public List<ISuite> getSuites() { - return contexts; + return suites; } } 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-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -7,40 +7,52 @@ import org.jboss.jsr299.tck.api.Configuration; import org.jboss.jsr299.tck.api.TestLauncher; -import org.testng.ITestContext; +import org.testng.ISuite; public class ServletTestLauncher implements TestLauncher { - public ITestContext launchTest(Configuration configuration, Class<?> testClass) throws Exception + public ISuite launchTest(Configuration configuration, Class<?> testClass) throws Exception { String url = "http://" + configuration.getHost() + "/" + testClass.getName() + "/?outputMode=serializedObject"; - URLConnection connection = new URL(url).openConnection(); - if (!(connection instanceof HttpURLConnection)) + for (int i = 0; i < configuration.getConnectRetries(); i++) { - throw new IllegalStateException("Not an http connection! " + connection); - } - HttpURLConnection httpConnection = (HttpURLConnection) connection; - httpConnection.setUseCaches(false); - httpConnection.setDefaultUseCaches(false); - httpConnection.connect(); - if (httpConnection.getResponseCode() == HttpURLConnection.HTTP_OK) - { - ObjectInputStream ois = new ObjectInputStream(httpConnection.getInputStream()); - Object o = ois.readObject(); - ois.close(); - if (o instanceof ITestContext) + Thread.sleep(configuration.getConnectDelay()); + URLConnection connection = new URL(url).openConnection(); + if (!(connection instanceof HttpURLConnection)) { - throw new IllegalStateException("Error reading test results - expected a ITestContext but got " + o); + throw new IllegalStateException("Not an http connection! " + connection); } - ITestContext context = (ITestContext) o; - httpConnection.disconnect(); - return context; + HttpURLConnection httpConnection = (HttpURLConnection) connection; + httpConnection.setUseCaches(false); + httpConnection.setDefaultUseCaches(false); + try + { + httpConnection.connect(); + if (httpConnection.getResponseCode() == HttpURLConnection.HTTP_OK) + { + ObjectInputStream ois = new ObjectInputStream(httpConnection.getInputStream()); + Object o = ois.readObject(); + ois.close(); + if (!(o instanceof ISuite)) + { + throw new IllegalStateException("Error reading test results - expected a ISuite but got " + o); + } + ISuite context = (ISuite) o; + + return context; + } + else if (httpConnection.getResponseCode() != HttpURLConnection.HTTP_NOT_FOUND) + { + throw new IllegalStateException("Error launching test " + testClass.getName() + " at " + url + ". Got " + httpConnection.getResponseCode() + " ("+ httpConnection.getResponseMessage() + ")"); + } + } + finally + { + httpConnection.disconnect(); + } } - else - { - throw new IllegalStateException("Error launching test " + testClass.getName() + " at " + url + ". Got " + httpConnection.getResponseCode() + " ("+ httpConnection.getResponseMessage() + ")"); - } + throw new IllegalStateException("Error launching test " + testClass.getName() + " at " + url + ". Kept on getting 404s."); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -11,7 +11,7 @@ import org.jboss.jsr299.tck.impl.ConfigurationImpl; import org.jboss.jsr299.tck.impl.runner.TestRunner; -import org.testng.ITestContext; +import org.testng.ISuite; import org.testng.ITestResult; public class ServletTestRunner extends HttpServlet @@ -22,7 +22,7 @@ { ConfigurationImpl.get().setStandalone(false); TestRunner runner = new TestRunner(); - ITestContext context = runner.run(); + ISuite suite = runner.run(); String outputMode; if (req.getParameter("outputMode") != null) { @@ -46,11 +46,11 @@ writer.write("<tr>\n"); writer.write("<td><b>Method</b></td><td><b>Status</b></td>\n"); writer.write("</tr>\n"); - for (ITestResult result : context.getFailedConfigurations().getAllResults()) + for (ITestResult result : suite.getResults().get("JSR-299 TCK").getTestContext().getFailedConfigurations().getAllResults()) { writeResult(writer, result); } - for (ITestResult result : context.getSkippedConfigurations().getAllResults()) + for (ITestResult result : suite.getResults().get("JSR-299 TCK").getTestContext().getSkippedConfigurations().getAllResults()) { writeResult(writer, result); } @@ -60,15 +60,15 @@ writer.write("<tr>\n"); writer.write("<td><b>Method</b></td><td><b>Status</b></td>\n"); writer.write("</tr>\n"); - for (ITestResult result : context.getFailedTests().getAllResults()) + for (ITestResult result : suite.getResults().get("JSR-299 TCK").getTestContext().getFailedTests().getAllResults()) { writeResult(writer, result); } - for (ITestResult result : context.getPassedTests().getAllResults()) + for (ITestResult result : suite.getResults().get("JSR-299 TCK").getTestContext().getPassedTests().getAllResults()) { writeResult(writer, result); } - for (ITestResult result : context.getSkippedTests().getAllResults()) + for (ITestResult result : suite.getResults().get("JSR-299 TCK").getTestContext().getSkippedTests().getAllResults()) { writeResult(writer, result); } @@ -79,7 +79,7 @@ { resp.setStatus(HttpServletResponse.SC_OK); ObjectOutputStream oos = new ObjectOutputStream(resp.getOutputStream()); - oos.writeObject(context); + oos.writeObject(suite); oos.flush(); oos.close(); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -9,9 +9,9 @@ import javax.inject.Production; import javax.inject.manager.Bean; +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractTest; -import org.jboss.jsr299.tck.SpecAssertion; -import org.jboss.jsr299.tck.SpecAssertions; import org.jboss.jsr299.tck.impl.packaging.Artifact; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/SpiderProducer.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/SpiderProducer.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -2,9 +2,6 @@ import javax.inject.Produces; - - -@AnotherDeploymentType class SpiderProducer { Modified: tck/trunk/pom.xml =================================================================== --- tck/trunk/pom.xml 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/pom.xml 2009-02-11 19:13:27 UTC (rev 1488) @@ -108,10 +108,15 @@ </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>tck-utils</artifactId> + <artifactId>tck-utils-api</artifactId> <version>0.9-SNAPSHOT</version> - </dependency> + </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>tck-utils-impl</artifactId> + <version>0.9-SNAPSHOT</version> + </dependency> + <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-api</artifactId> <version>3.1.0-Alpha1</version>