[webbeans-commits] Webbeans SVN: r1469 - tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api and 6 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Mon Feb 9 10:38:31 EST 2009
Author: pete.muir at jboss.org
Date: 2009-02-09 10:38:31 -0500 (Mon, 09 Feb 2009)
New Revision: 1469
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/runner/
Modified:
ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml
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/TCKImpl.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/deployment/DefaultDeploymentTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java
Log:
Fixes to tests
Modified: ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml
===================================================================
--- ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml 2009-02-09 15:00:55 UTC (rev 1468)
+++ ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml 2009-02-09 15:38:31 UTC (rev 1469)
@@ -44,7 +44,7 @@
<!-- ############### Web Beans logging ################### -->
<category name="org.jboss.webbeans">
- <priority value="ERROR"/>
+ <priority value="INFO"/>
</category>
<root>
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-09 15:00:55 UTC (rev 1468)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java 2009-02-09 15:38:31 UTC (rev 1469)
@@ -1,14 +1,12 @@
package org.jboss.jsr299.tck.api;
-import java.util.List;
+import org.testng.ITestContext;
-import org.testng.ITestResult;
-
public interface TestLauncher
{
public static final String PROPERTY_NAME = TestLauncher.class.getName();
- public List<ITestResult> launchTest(Configuration configuration, Class<?> testClass) throws Exception;
+ public ITestContext 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-09 15:00:55 UTC (rev 1468)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-09 15:38:31 UTC (rev 1469)
@@ -94,15 +94,19 @@
manager = containers.deploy(classes.toArray(EMPTY_CLASS_ARRAY));
}
}
+ else
+ {
+ deployBeans();
+ }
+ if (getEnabledDeploymentTypes().size() > 0)
+ {
+ ConfigurationImpl.get().getManagers().setEnabledDeploymentTypes(getEnabledDeploymentTypes());
+ }
}
- else
+ else
{
manager = ConfigurationImpl.get().getManagers().getManager();
}
- if (getEnabledDeploymentTypes().size() > 0)
- {
- ConfigurationImpl.get().getManagers().setEnabledDeploymentTypes(getEnabledDeploymentTypes());
- }
}
@AfterMethod
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-09 15:00:55 UTC (rev 1468)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java 2009-02-09 15:38:31 UTC (rev 1469)
@@ -12,7 +12,7 @@
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.ITestResult;
+import org.testng.ITestContext;
import org.testng.TestNG;
import org.testng.xml.Parser;
import org.testng.xml.XmlSuite;
@@ -73,7 +73,7 @@
{
log.error("Error executing in container tests", e);
}
- for (ITestResult result : suiteLauncher.getResults())
+ for (ITestContext result : suiteLauncher.getTestContet())
{
log.info(result);
}
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-09 15:00:55 UTC (rev 1468)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java 2009-02-09 15:38:31 UTC (rev 1469)
@@ -1,5 +1,7 @@
package org.jboss.jsr299.tck.impl.runner;
+import java.io.Serializable;
+import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -7,6 +9,7 @@
import org.jboss.jsr299.tck.impl.util.DeploymentProperties;
import org.testng.ITestContext;
import org.testng.TestNG;
+import org.testng.internal.InvokedMethod;
import org.testng.xml.XmlClass;
import org.testng.xml.XmlSuite;
import org.testng.xml.XmlTest;
@@ -38,7 +41,8 @@
testNG.setXmlSuites(suites);
suites.add(createSuite());
testNG.run();
- return listener.getContext();
+
+ return makeITestContextSerializable(listener.getContext());
}
private XmlSuite createSuite()
@@ -56,4 +60,41 @@
return suite;
}
+ /**
+ * Unfortunately ITestContext isn't really serializable...
+ *
+ */
+ public static ITestContext makeITestContextSerializable(ITestContext context)
+ {
+ if (context instanceof org.testng.TestRunner)
+ {
+
+ try
+ {
+ List<InvokedMethod> methods = (List<InvokedMethod>) org.testng.TestRunner.class.getField("m_invokedMethods").get(context);
+ for (InvokedMethod method : methods)
+ {
+ Field parametersField = method.getClass().getField("m_parameters");
+ Object[] parameters = (Object[]) parametersField.get(method);
+ if (parameters != null)
+ {
+ for (int i = 0; i < parameters.length; i++)
+ {
+ if (!(parameters instanceof Serializable) || !parameters.getClass().isPrimitive())
+ {
+ parameters[i] = null;
+ }
+ }
+ }
+ parametersField.set(method, parameters);
+ }
+ }
+ catch (Exception e)
+ {
+ 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-09 15:00:55 UTC (rev 1468)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java 2009-02-09 15:38:31 UTC (rev 1469)
@@ -6,19 +6,19 @@
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.ITestResult;
+import org.testng.ITestContext;
public class TestSuiteLauncher
{
private final Configuration configuration;
- private final List<ITestResult> contexts;
+ private final List<ITestContext> contexts;
public TestSuiteLauncher(Configuration configuration)
{
this.configuration = configuration;
- this.contexts = new ArrayList<ITestResult>();
+ this.contexts = new ArrayList<ITestContext>();
}
public void run() throws Exception
@@ -30,7 +30,7 @@
{
deployArtifact(artifact);
Thread.sleep(configuration.getDeploymentDelay());
- contexts.addAll(configuration.getInContainerTestLauncher().launchTest(configuration, artifact.getDeclaringClass()));
+ contexts.add(configuration.getInContainerTestLauncher().launchTest(configuration, artifact.getDeclaringClass()));
}
finally
{
@@ -46,7 +46,7 @@
jar.close();
}
- public List<ITestResult> getResults()
+ public List<ITestContext> getTestContet()
{
return contexts;
}
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-09 15:00:55 UTC (rev 1468)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java 2009-02-09 15:38:31 UTC (rev 1469)
@@ -4,17 +4,15 @@
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
-import java.util.List;
import org.jboss.jsr299.tck.api.Configuration;
import org.jboss.jsr299.tck.api.TestLauncher;
import org.testng.ITestContext;
-import org.testng.ITestResult;
public class ServletTestLauncher implements TestLauncher
{
- public List<ITestResult> launchTest(Configuration configuration, Class<?> testClass) throws Exception
+ public ITestContext launchTest(Configuration configuration, Class<?> testClass) throws Exception
{
String url = "http://" + configuration.getHost() + "/" + testClass.getName() + "/?outputMode=serializedObject";
URLConnection connection = new URL(url).openConnection();
@@ -35,9 +33,9 @@
{
throw new IllegalStateException("Error reading test results - expected a ITestContext but got " + o);
}
- List<ITestResult> results = (List<ITestResult>) o;
+ ITestContext context = (ITestContext) o;
httpConnection.disconnect();
- return results;
+ return context;
}
else
{
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-09 15:00:55 UTC (rev 1468)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java 2009-02-09 15:38:31 UTC (rev 1469)
@@ -3,8 +3,6 @@
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -79,12 +77,9 @@
}
else if (outputMode.equals("serializedObject"))
{
- List<ITestResult> results = new ArrayList<ITestResult>();
- results.addAll(context.getFailedTests().getAllResults());
- results.addAll(context.getPassedTests().getAllResults());
resp.setStatus(HttpServletResponse.SC_OK);
ObjectOutputStream oos = new ObjectOutputStream(resp.getOutputStream());
- oos.writeObject(results);
+ oos.writeObject(context);
oos.flush();
oos.close();
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java 2009-02-09 15:00:55 UTC (rev 1468)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java 2009-02-09 15:38:31 UTC (rev 1469)
@@ -7,7 +7,6 @@
import org.jboss.jsr299.tck.SpecAssertion;
import org.jboss.jsr299.tck.SpecAssertions;
import org.jboss.jsr299.tck.impl.ConfigurationImpl;
-import org.jboss.jsr299.tck.impl.packaging.Artifact;
import org.jboss.jsr299.tck.impl.packaging.Classes;
import org.testng.annotations.Test;
@@ -16,7 +15,7 @@
* Spec version: PRD2
*
*/
- at Artifact(addCurrentPackage=false)
+//@Artifact(addCurrentPackage=false)
@Classes(DefaultDeploymentTypeTest.class)
public class DefaultDeploymentTypeTest extends AbstractTest
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-09 15:00:55 UTC (rev 1468)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-09 15:38:31 UTC (rev 1469)
@@ -123,6 +123,7 @@
@SpecAssertion(section = "7.2", id = "unknown")
public void testManagerFireEvent()
{
+ deployBeans();
// First a simple event with no bindings is fired
AnEventType anEvent = new AnEventType();
manager.fireEvent(anEvent);
@@ -142,6 +143,7 @@
@SpecAssertions( { @SpecAssertion(section = "7.1", id = "unknown"), @SpecAssertion(section = "7.2", id = "unknown") })
public void testManagerFireEventWithEventTypeParametersFails()
{
+ deployBeans();
ATemplatedEventType<String> anEvent = new ATemplatedEventType<String>();
manager.fireEvent(anEvent);
}
@@ -160,6 +162,7 @@
// Although the above test is really the same as with a wildcard, we will
// test
// it anyhow since the specification calls it out separately.
+ deployBeans();
ATemplatedEventType<?> anEventOnAnyType = new ATemplatedEventType<String>();
manager.fireEvent(anEventOnAnyType);
}
@@ -182,6 +185,7 @@
// but borrowing from Section 8.3, we'll expect the same behavior here
// for a consistent API.
// TODO Verify that fireEvent should fail on non-binding annotations
+ deployBeans();
AnEventType anEvent = new AnEventType();
manager.fireEvent(anEvent, new AnimalStereotypeAnnotationLiteral());
}
@@ -247,6 +251,7 @@
@SpecAssertion(section = "7.3", id = "unknown")
public void testManagerRemoveObserver()
{
+ deployBeans();
Observer<AnEventType> observer = new AnObserver();
// First test with the Class<T> of the event type
@@ -285,6 +290,7 @@
@SpecAssertion(section = "7.3", id = "unknown")
public void testMultipleInstancesOfSameBindingTypeWhenAddingObserverFails()
{
+ deployBeans();
Observer<AnEventType> observer = new AnObserver();
manager.addObserver(observer, AnEventType.class, new RoleBinding("Admin"), new TameAnnotationLiteral(), new TameAnnotationLiteral());
}
@@ -297,6 +303,7 @@
@SpecAssertion(section = "7.3", id = "unknown")
public void testNonBindingTypePassedToAddObserverFails()
{
+ deployBeans();
Observer<AnEventType> observer = new AnObserver();
manager.addObserver(observer, AnEventType.class, new AnimalStereotypeAnnotationLiteral());
}
@@ -309,6 +316,7 @@
@SpecAssertion(section = "7.3", id = "unknown")
public void testMultipleInstancesOfSameBindingTypeWhenRemovingObserverFails()
{
+ deployBeans();
Observer<AnEventType> observer = new AnObserver();
manager.addObserver(observer, AnEventType.class);
manager.removeObserver(observer, AnEventType.class, new RoleBinding("Admin"), new TameAnnotationLiteral(), new TameAnnotationLiteral());
@@ -322,6 +330,7 @@
@SpecAssertion(section = "7.3", id = "unknown")
public void testNonBindingTypePassedToRemoveObserverFails()
{
+ deployBeans();
Observer<AnEventType> observer = new AnObserver();
manager.addObserver(observer, AnEventType.class);
manager.removeObserver(observer, AnEventType.class, new AnimalStereotypeAnnotationLiteral());
@@ -336,6 +345,7 @@
@SpecAssertions( { @SpecAssertion(section = "7.1", id = "unknown"), @SpecAssertion(section = "7.4", id = "unknown") })
public void testConsumerNotifiedWhenEventTypeAndAllBindingsMatch()
{
+ deployBeans();
AnObserver observer1 = new AnObserver();
AnObserver observer2 = new AnObserver();
manager.addObserver(observer1, AnEventType.class);
@@ -358,6 +368,7 @@
@SpecAssertion(section = "7.4", id = "unknown")
public void testObserverThrowsExceptionAbortsNotifications()
{
+ deployBeans();
AnObserverWithException observer = new AnObserverWithException();
AnObserverWithException anotherObserver = new AnObserverWithException();
manager.addObserver(anotherObserver, AnEventType.class);
@@ -1295,6 +1306,7 @@
private <E> void eventObjectContainsTypeVariables(ArrayList<E> eventToFire)
{
+ deployBeans();
@SuppressWarnings("unused")
Set<?> resolvedObservers = manager.resolveObservers(eventToFire);
}
@@ -1312,6 +1324,7 @@
private void eventObjectContainsWildcards(ArrayList<? extends Object> eventToFire)
{
+ deployBeans();
@SuppressWarnings("unused")
// TODO There does not seem to be a way to get wildcarded types pass
// through
@@ -1326,6 +1339,7 @@
@SpecAssertion(section = "7.7", id = "unknown")
public void testDuplicateBindingTypesWhenResolvingFails()
{
+ deployBeans();
AnObserver observer = new AnObserver();
manager.addObserver(observer, AnEventType.class, new BindingTypeABinding());
@SuppressWarnings("unused")
@@ -1340,6 +1354,7 @@
@SpecAssertion(section = "7.7", id = "unknown")
public void testNonBindingTypeAnnotationWhenResolvingFails()
{
+ deployBeans();
AnObserver observer = new AnObserver();
manager.addObserver(observer, new TypeLiteral<AnEventType>()
{
@@ -1373,6 +1388,7 @@
@SpecAssertion(section = "7.7", id = "unknown")
public void testResolvingChecksTypeParameters()
{
+ deployBeans();
AListObserver observer = new AListObserver();
AnotherListObserver anotherObserver = new AnotherListObserver();
manager.addObserver(observer, new TypeLiteral<ArrayList<String>>()
@@ -1412,6 +1428,7 @@
@SpecAssertion(section = "7.7", id = "unknown")
public void testResolvingChecksBindingTypeMembers()
{
+ deployBeans();
AnObserver observer = new AnObserver();
AnObserver anotherObserver = new AnObserver();
manager.addObserver(observer, AnEventType.class, new BindingTypeCBinding("first-observer"));
More information about the weld-commits
mailing list