8:50 a.m.
Author: marius.bogoevici
Date: 2010-01-29 02:50:35 -0500 (Fri, 29 Jan 2010)
New Revision: 5660
Modified:
core/trunk/bom/pom.xml
core/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties
core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
Log:
WELD-393: upgrading to interceptors CR10
Modified: core/trunk/bom/pom.xml
===================================================================
--- core/trunk/bom/pom.xml 2010-01-28 22:44:46 UTC (rev 5659)
+++ core/trunk/bom/pom.xml 2010-01-29 07:50:35 UTC (rev 5660)
@@ -76,7 +76,7 @@
<javassist.version>3.11.0.GA</javassist.version>
<cdi.tck.version>1.0.1-CR1</cdi.tck.version>
<atinject.tck.version>1.0.0-PFD-3</atinject.tck.version>
- <jboss.interceptor.version>1.0.0-CR9</jboss.interceptor.version>
+ <jboss.interceptor.version>1.0.0-CR10</jboss.interceptor.version>
<slf4j.version>1.5.10</slf4j.version>
<cal10n.version>0.7.2</cal10n.version>
</properties>
Modified:
core/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties
===================================================================
---
core/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties 2010-01-28
22:44:46 UTC (rev 5659)
+++
core/trunk/jboss-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties 2010-01-29
07:50:35 UTC (rev 5660)
@@ -1,7 +1,12 @@
# Configuration for running incontainer tests from your IDE
-# Alter the path weld accordingly (relative from the tck/impl dir)
+# Alter the path webbeans accordingly (relative from the tck/impl dir)
org.jboss.testharness.standalone=false
-org.jboss.testharness.container.extraConfigurationDir=../../weld/jboss-as
+org.jboss.testharness.container.extraConfigurationDir=/Users/marius/Work/jboss/weld/core/jboss-as
org.jboss.testharness.container.forceRestart=false
-org.jboss.testharness.libraryDirectory=../../weld/jboss-tck-runner/target/dependency/lib
+org.jboss.testharness.libraryDirectory=/Users/marius/Work/jboss/weld/core/jboss-tck-runner/target/dependency/lib
org.jboss.testharness.runIntegrationTests=true
+#jboss.home=/opt/jboss/jboss-6.0.0-SNAPSHOT
+jboss.home=/opt/jboss/jboss-6.0.0.M1
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
Modified: core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
===================================================================
--- core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2010-01-28 22:44:46 UTC
(rev 5659)
+++ core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2010-01-29 07:50:35 UTC
(rev 5660)
@@ -16,43 +16,21 @@
<classes>
<!-- Issues in Weld (the RI) -->
-
- <!-- WELD-393 -->
- <class
name="org.jboss.jsr299.tck.interceptors.tests.definition.DefinitionTest">
- <methods>
- <exclude name="testInterceptorMethodDefinedOnTargetClass"
/>
- </methods>
- </class>
-
- <!-- WELD-390 -->
+
+ <!-- WELD-390 fixed, but TCK test is broken in 1.0.1-CR1 -->
<class
name="org.jboss.jsr299.tck.interceptors.tests.lifecycleCallback.order.InvocationOrderTest">
<methods>
<exclude name="testInvocationOrder" />
</methods>
</class>
+
<!-- WELD-269 -->
<class
name="org.jboss.jsr299.tck.tests.decorators.custom.CustomDecoratorTest">
<methods>
<exclude name="testCustomImplementationOfDecoratorInterface"
/>
</methods>
</class>
- <!-- WELD-272 -->
- <class
name="org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanClass.FinalBeanClassTest">
- <methods>
- <exclude name="testAppliesToFinalManagedBeanClass" />
- </methods>
- </class>
- <class
name="org.jboss.jsr299.tck.tests.decorators.definition.broken.finalBeanMethod.FinalBeanMethodTest">
- <methods>
- <exclude name="testAppliesToFinalMethodOnManagedBeanClass"
/>
- </methods>
- </class>
- <!-- WELD-377 -->
- <class
name="org.jboss.jsr299.tck.tests.decorators.invocation.EJBDecoratorInvocationTest">
- <methods>
- <exclude name="testEJBDecoratorInvocation" />
- </methods>
- </class>
+
<!-- WELD-401 -->
<class
name="org.jboss.jsr299.tck.tests.event.broken.observer.notBusinessMethod.EJBObserverMethodNotBusinessMethodTest">
<methods>