You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by km...@apache.org on 2011/07/18 05:58:32 UTC
svn commit: r1147734 - in /openejb/trunk/openejb3/tck/cdi-tomee: ./
src/main/java/ src/main/java/org/ src/main/java/org/apache/
src/main/java/org/apache/openejb/ src/main/java/org/apache/openejb/tck/
src/main/java/org/apache/openejb/tck/cdi/ src/main/j...
Author: kmalhi
Date: Mon Jul 18 03:58:31 2011
New Revision: 1147734
URL: http://svn.apache.org/viewvc?rev=1147734&view=rev
Log:
Some fixes to setup
Added:
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/
- copied from r1147715, openejb/trunk/openejb3/tck/cdi-tomee/src/test/java/org/apache/openejb/tck/cdi/tomee/
openejb/trunk/openejb3/tck/cdi-tomee/src/main/resources/
openejb/trunk/openejb3/tck/cdi-tomee/src/main/resources/META-INF/
- copied from r1147715, openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/META-INF/
Removed:
openejb/trunk/openejb3/tck/cdi-tomee/src/main/java/org/apache/openejb/tck/cdi/tomee/RequestScopeTestListener.java
openejb/trunk/openejb3/tck/cdi-tomee/src/test/java/org/apache/openejb/tck/cdi/tomee/
openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/META-INF/
Modified:
openejb/trunk/openejb3/tck/cdi-tomee/pom.xml
openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/all-failing.xml
openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/failing.xml
openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/passing.xml
Modified: openejb/trunk/openejb3/tck/cdi-tomee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee/pom.xml?rev=1147734&r1=1147733&r2=1147734&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-tomee/pom.xml (original)
+++ openejb/trunk/openejb3/tck/cdi-tomee/pom.xml Mon Jul 18 03:58:31 2011
@@ -28,7 +28,7 @@
<name>OpenEJB :: TCK :: CDI TomEE</name>
<properties>
<!-- where we will unpack tomcat -->
- <openejb.home>${project.build.directory}\apache-tomee-${project.version}</openejb.home>
+ <openejb.home>${project.build.directory}${file.separator}apache-tomee-${project.version}</openejb.home>
</properties>
<dependencies>
<dependency>
@@ -53,10 +53,20 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ <version>1.1.0-CR5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-impl</artifactId>
<version>1.0.4.SP1</version>
- <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.testng</groupId>
@@ -68,7 +78,6 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.0.1</version>
- <scope>test</scope>
</dependency>
</dependencies>
<build>
@@ -80,7 +89,7 @@
<executions>
<execution>
<id>unpack</id>
- <phase>initialize</phase>
+ <phase>pre-integration-test</phase>
<goals>
<goal>unpack</goal>
</goals>
@@ -100,18 +109,116 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.3</version>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>tck-common</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>cdi-tomee</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- TomEE embedds a lot of applications in. We should remove all not necessary web
+ application for TCK (ie. all but openejb and ROOT -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>remove-apps</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <delete dir="${openejb.home}/webapps/docs"/>
+ <delete dir="${openejb.home}/webapps/manager"/>
+ <delete dir="${openejb.home}/webapps/host-manager"/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.9</version>
<configuration>
<suiteXmlFiles>
<!-- <suiteXmlFile>src/test/resources/web-profile.xml</suiteXmlFile> -->
<suiteXmlFile>src/test/resources/passing.xml</suiteXmlFile>
<!--<suiteXmlFile>src/test/resources/failing.xml</suiteXmlFile> -->
</suiteXmlFiles>
- <forkMode>once</forkMode>
+ <!--<forkMode>once</forkMode>-->
+ <systemProperties>
+ <property>
+ <name>org.jboss.testharness.standalone</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.runIntegrationTests</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.container.forceRestart</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>org.jboss.testharness.libraryDirectory</name>
+ <value>${project.build.directory}/dependency/lib</value>
+ </property>
+ <!--<property>-->
+ <!--<name>org.jboss.testharness.outputDirectory</name>-->
+ <!--<value>target</value>-->
+ <!--</property>-->
+ <property>
+ <name>deleteArtifacts</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
<systemPropertyVariables>
- <openejb.home>${project.build.directory}\apache-tomee-${project.version}</openejb.home>
+ <!--<openejb.server.debug>true</openejb.server.debug>-->
+ <openejb.home>${project.build.directory}${file.separator}apache-tomee-${project.version}</openejb.home>
</systemPropertyVariables>
</configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/all-failing.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/all-failing.xml?rev=1147734&r1=1147733&r2=1147734&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/all-failing.xml (original)
+++ openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/all-failing.xml Mon Jul 18 03:58:31 2011
@@ -17,9 +17,6 @@
limitations under the License.
-->
<suite name="CDI TCK" verbose="0">
- <listeners>
- <listener class-name="org.apache.openejb.tck.cdi.tomee.RequestScopeTestListener" />
- </listeners>
<test name="CDI TCK">
<!--<packages>-->
<!--<package name="org.jboss.jsr299.tck.tests.*"/>-->
Modified: openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/failing.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/failing.xml?rev=1147734&r1=1147733&r2=1147734&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/failing.xml (original)
+++ openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/failing.xml Mon Jul 18 03:58:31 2011
@@ -17,9 +17,6 @@
limitations under the License.
-->
<suite name="CDI TCK" verbose="0">
- <listeners>
- <listener class-name="org.apache.openejb.tck.cdi.tomee.RequestScopeTestListener" />
- </listeners>
<test name="CDI TCK">
<!--<packages>-->
<!--<package name="org.jboss.jsr299.tck.tests.*"/>-->
Modified: openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/passing.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/passing.xml?rev=1147734&r1=1147733&r2=1147734&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/passing.xml (original)
+++ openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/passing.xml Mon Jul 18 03:58:31 2011
@@ -18,249 +18,14 @@
-->
<suite name="CDI TCK" verbose="2">
- <listeners>
- <listener class-name="org.apache.openejb.tck.cdi.tomee.RequestScopeTestListener" />
- </listeners>
-
<test name="CDI TCK">
<packages>
- <package name="org.jboss.jsr299.tck.tests.*"/>
- <package name="org.jboss.jsr299.tck.interceptors.tests.*"/>
+ <!--<package name="org.jboss.jsr299.tck.tests.*"/>-->
+ <!--<package name="org.jboss.jsr299.tck.interceptors.tests.*"/>-->
</packages>
+
<classes>
- <class name="org.jboss.jsr299.tck.tests.context.DestroyForSameCreationalContext2Test"/>
- <class name="org.jboss.jsr299.tck.tests.context.application.ApplicationContextTest">
- <methods>
- <exclude name="testApplicationContextSharedBetweenServletRequests"/>
- <exclude name="testApplicationScopeActiveDuringDoFilterMethod"/>
- <exclude name="testApplicationScopeActiveDuringHttpSessionListenerInvocation"/>
- <exclude name="testApplicationScopeActiveDuringServiceMethod"/>
- <exclude name="testApplicationScopeActiveDuringServletContextListenerInvocation"/>
- <exclude name="testApplicationScopeActiveDuringServletRequestListenerInvocation"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest">
- <methods>
- <exclude name="testBeanWithDefaultQualifier"/>
- <exclude name="testBeanWithNameJavaxEnterpriseContextConversation"/>
- <exclude name="testBeanWithRequestScope"/>
- <exclude name="testBeginAlreadyLongRunningConversationThrowsException"/>
- <exclude name="testConversationActiveDuringNonFacesRequest"/>
- <exclude name="testConversationBeginMakesConversationLongRunning"/>
- <exclude name="testConversationEndMakesConversationTransient"/>
- <exclude name="testConversationHasDefaultTimeout"/>
- <exclude name="testConversationIdMayBeSetByApplication"/>
- <exclude name="testConversationIdMayBeSetByContainer"/>
- <exclude name="testConversationIdSetByContainerIsUnique"/>
- <exclude name="testConversationsDontCrossSessionBoundary1"/>
- <exclude name="testConversationsDontCrossSessionBoundary2"/>
- <exclude name="testEndTransientConversationThrowsException"/>
- <exclude name="testLongRunningConversationInstancesNotDestroyedAtRequestEnd"/>
- <exclude name="testSetConversationTimeoutOverride"/>
- <exclude name="testTransientConversationHasNullId"/>
- <exclude name="testTransientConversationInstancesDestroyedAtRequestEnd"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.InvalidatingSessionDestroysConversationTest">
- <methods>
- <exclude name="testInvalidatingSessionDestroysConversation"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.LongRunningConversationPropagatedByFacesContextTest">
- <methods>
- <exclude name="testConversationPropagated"/>
- <exclude name="testConversationPropagatedOverRedirect"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.ManualCidPropagationTest">
- <methods>
- <exclude name="testManualCidPropagation"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.dependent.DependentContextTest">
- <methods>
- <exclude name="testContextIsActiveWhenEvaluatingElExpression"/>
- <exclude name="testDependentsDestroyedWhenElEvaluationCompletes"/>
- <exclude name="testInstanceUsedForElEvaluationNotShared"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingDecorator.EnterpriseBeanWithNonPassivatingDecoratorTest">
- <methods>
- <exclude name="testEnterpriseBeanWithNonPassivatingDecoratorFails"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.request.RequestContextTest">
- <methods>
- <exclude name="testRequestScopeActiveDuringServiceMethod"/>
- <exclude name="testRequestScopeActiveDuringServletFilter"/>
- <exclude name="testRequestScopeIsDestroyedAfterServletRequest"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest">
- <methods>
- <exclude name="testRequestScopeDestroyedAfterCallToEjbTimeoutMethod"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.session.SessionContextTest">
- <methods>
- <exclude name="testSessionContextDestroyedWhenHttpSessionInvalidated"/>
- <exclude name="testSessionContextDestroyedWhenHttpSessionTimesOut"/>
- <exclude name="testSessionContextSharedBetweenServletRequestsInSameHttpSession"/>
- <exclude name="testSessionScopeActiveDuringDoFilterMethod"/>
- <exclude name="testSessionScopeActiveDuringServiceMethod"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.definition.stereotype.broken.nonEmptyNamed.NonEmptyNamedTest">
- <methods>
- <exclude name="testStereotypeWithNonEmptyNamed"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.definition.stereotype.broken.tooManyScopes.TooManyScopeTypesTest">
- <methods>
- <exclude name="testStereotypeWithTooManyScopeTypes"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInEarTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInWarTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest">
- <methods>
- <exclude name="testCreateSFSB"/>
- <exclude name="testSerializeSFSB"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest">
- <methods>
- <exclude name="testApplicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest">
- <methods>
- <exclude name="testNonStaticProducerMethodInheritedBySpecializingSubclass"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.env.EnvInjectionTest">
- <methods>
- <exclude name="testInjectionOfEnv"/>
- <exclude name="testProduceEnvProxy"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext.PersistenceContextInjectionTest">
- <methods>
- <exclude name="testBeanTypesAndBindingTypesOfPersistenceContext"/>
- <exclude name="testInjectionOfPersistenceUnit"/>
- <exclude name="testPassivationOfPersistenceContext"/>
- <exclude name="testInjectionOfPersistenceContext"/>
- <exclude name="testPassivationOfPersistenceUnit"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.resource.InjectionOfResourceTest">
- <methods>
- <exclude name="testInjectionOfResource"/>
- <exclude name="testPassivatingResource"/>
- <exclude name="testProduceResourceProxy"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.EnterpriseBeanSpecializationIntegrationTest">
- <methods>
- <exclude name="testSpecializedBeanNotInstantiated"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.EnterpriseBeanSpecializationTest">
- <methods>
- <exclude name="testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean"/>
- <exclude name="testSpecializingBeanHasNameOfSpecializedBean"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsNothing.DirectlyExtendsNothingTest">
- <methods>
- <exclude name="testSpecializingClassDirectlyExtendsNothing"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.directlyExtendsSimpleBean.DirectlyExtendsSimpleBeanTest">
- <methods>
- <exclude name="testSpecializingClassDirectlyExtendsSimpleBean"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.implementInterfaceAndExtendsNothing.ImplementsInterfaceAndExtendsNothingTest">
- <methods>
- <exclude name="testSpecializingClassImplementsInterfaceAndExtendsNothing"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.broken.sameName.SameNameTest">
- <methods>
- <exclude name="testSpecializingAndSpecializedBeanHasName"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference.SessionBeanInterceptorOnNonContextualEjbReferenceTest">
- <methods>
- <exclude name="testNonContextualSessionBeanReferenceIsIntercepted"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.clientProxy.incontainer.ClientProxyTest">
- <methods>
- <exclude name="testInvocationIsProcessedOnCurrentInstance"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.el.ResolutionByNameTest">
- <methods>
- <exclude name="testContextCreatesNewInstanceForInjection"/>
- <exclude name="testELResolverReturnsContextualInstance"/>
- <exclude name="testQualifiedNameLookup"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.el.integration.IntegrationWithUnifiedELTest">
- <methods>
- <exclude name="testELResolverRegisteredWithJsf"/>
- <exclude name="testELResolverRegisteredWithServletContainer"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.InjectionIntoNonContextualComponentTest">
- <methods>
- <exclude name="testFilterInitializerMethodCalled"/>
- <exclude name="testInjectionIntoFilter"/>
- <exclude name="testInjectionIntoJSFManagedBean"/>
- <exclude name="testInjectionIntoServlet"/>
- <exclude name="testInjectionIntoServletListener"/>
- <exclude name="testInjectionIntoTagHandler"/>
- <exclude name="testInjectionIntoTagLibraryListener"/>
- <exclude name="testServletInitializerMethodCalled"/>
- <exclude name="testServletListenerInitializerMethodCalled"/>
- <exclude name="testTagLibraryListenerInitializerMethodCalled"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest">
- <methods>
- <exclude name="testInjectionIntoWebServiceEndpoint"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.injectionpoint.broken.not.bean.InjectionPointTest">
- <methods>
- <exclude name="testDefinitionErrorDetected"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.manager.jndi.ManagerTest">
- <methods>
- <exclude name="testManagerLookupInJndi"/>
- </methods>
- </class>
+ <class name="org.jboss.jsr299.tck.tests.decorators.definition.DecoratorDefinitionTest"/>
</classes>
</test>
</suite>