You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2011/07/24 05:38:31 UTC
svn commit: r1150272 - in /openejb/trunk/openejb3:
container/openejb-core/src/main/java/org/apache/openejb/config/
tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/
tck/cdi-tomee/src/test/resources/ tck/tck-common/src/main/java/org/ap...
Author: dblevins
Date: Sun Jul 24 03:38:29 2011
New Revision: 1150272
URL: http://svn.apache.org/viewvc?rev=1150272&view=rev
Log:
Update to CDI TCK setup exception handling to not log "broken" tests that fail deployment as expected.
RemoteServer flags for hooking up YourKit and supplying extra jvm properties
With XBEAN-179, the numbers are:
Tests run: 849, Failures: 75, Errors: 0, Skipped: 0
[INFO] Total time: 14 minutes 58 seconds
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java
openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/failing.xml
openejb/trunk/openejb3/tck/cdi-tomee/src/test/resources/passing.xml
openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java?rev=1150272&r1=1150271&r2=1150272&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java Sun Jul 24 03:38:29 2011
@@ -33,7 +33,6 @@ public class RemoteServer {
private static final boolean DEBUG = System.getProperty("openejb.server.debug","false").equalsIgnoreCase("TRUE");
private static final boolean PROFILE = System.getProperty("openejb.server.profile","false").equalsIgnoreCase("TRUE");
private static final boolean TOMCAT;
- public static final String YOURKIT_HOME = System.getProperty("yourkit.home","/Applications/YourKit_Java_Profiler_9.5.6.app/bin/mac/");
public static final String JAVA_OPTS = System.getProperty("java.opts");
static {
@@ -177,7 +176,10 @@ public class RemoteServer {
}
if (PROFILE) {
- argsList.add("-agentpath:" + YOURKIT_HOME + "libyjpagent.jnilib=disablestacktelemetry,disableexceptiontelemetry,builtinprobes=none,delay=10000,sessionname=Tomcat");
+ String yourkitHome = System.getProperty("yourkit.home","/Applications/YourKit_Java_Profiler_9.5.6.app/bin/mac/");
+ if (!yourkitHome.endsWith("/")) yourkitHome += "/";
+ final String yourkitOpts = System.getProperty("yourkit.opts","disablestacktelemetry,disableexceptiontelemetry,builtinprobes=none,delay=10000,sessionname=Tomcat");
+ argsList.add("-agentpath:" + yourkitHome + "libyjpagent.jnilib=" + yourkitOpts);
}
if (JAVA_OPTS != null) {
Modified: openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java?rev=1150272&r1=1150271&r2=1150272&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java (original)
+++ openejb/trunk/openejb3/tck/cdi-embedded/src/test/java/org/apache/openejb/tck/cdi/embedded/Report.java Sun Jul 24 03:38:29 2011
@@ -47,9 +47,9 @@ public class Report {
private void main() throws Exception {
// final File file = new File("/Users/dblevins/work/uber/geronimo-tck-public-trunk/jcdi-tck-runner/target/surefire-reports/testng-results.xml");
- final File file = new File("/Users/dblevins/work/uber/openejb/tck/cdi-embedded/target/surefire-reports/testng-results.xml");
+// final File file = new File("/Users/dblevins/work/uber/openejb/tck/cdi-embedded/target/surefire-reports/testng-results.xml");
// final File file = new File("/Users/dblevins/work/uber/testng-results.xml");
-// final File file = new File("/Users/dblevins/work/uber/openejb/tck/cdi-tomee/target/failsafe-reports/testng-results.xml");
+ final File file = new File("/Users/dblevins/work/uber/openejb/tck/cdi-tomee/target/failsafe-reports/testng-results.xml");
final SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
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=1150272&r1=1150271&r2=1150272&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 Sun Jul 24 03:38:29 2011
@@ -18,26 +18,27 @@
-->
<suite name="CDI TCK" verbose="0">
<test name="CDI TCK">
- <!--<packages>-->
- <!--<package name="org.jboss.jsr299.tck.tests.*"/>-->
- <!--<package name="org.jboss.jsr299.tck.interceptors.tests.*"/>-->
- <!--</packages>-->
+ <packages>
+ <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.dependent.ejb.DependentContextEjbTest"/>-->
- <!--<class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest"/>-->
- <!--<class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest"/>-->
- <!--<class name="org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest"/>-->
- <!--<class name="org.jboss.jsr299.tck.tests.extensions.producer.ProducerTest"/>-->
- <!--<class name="org.jboss.jsr299.tck.tests.implementation.builtin.BuiltInBeansTest"/>-->
- <!--<class name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest">-->
- <!--<methods>-->
- <!--<exclude name="testCreateSFSB"/>-->
- <!--</methods>-->
- <!--</class>-->
- <class name="org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest"/>
- <!--<class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb.EjbInjectionTest"/>-->
- <!--<class name="org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference.SessionBeanInterceptorOnNonContextualEjbReferenceTest"/>-->
- <!--<class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest"/>-->
+ <!--<class name="org.jboss.jsr299.tck.tests.decorators.invocation.EJBDecoratorInvocationTest"/>-->
+ <!--<!–<class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest"/>–>-->
+ <!--<!–<class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest"/>–>-->
+ <!--<!–<class name="org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest"/>–>-->
+ <!--<!–<class name="org.jboss.jsr299.tck.tests.extensions.producer.ProducerTest"/>–>-->
+ <!--<!–<class name="org.jboss.jsr299.tck.tests.implementation.builtin.BuiltInBeansTest"/>–>-->
+ <!--<!–<class name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest">–>-->
+ <!--<!–<methods>–>-->
+ <!--<!–<exclude name="testCreateSFSB"/>–>-->
+ <!--<!–</methods>–>-->
+ <!--<!–</class>–>-->
+ <!--<class name="org.jboss.jsr299.tck.tests.context.application.ApplicationContextTest"/>-->
+ <!--<!–<class name="org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest"/>–>-->
+ <!--<!–<class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb.EjbInjectionTest"/>–>-->
+ <!--<!–<class name="org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference.SessionBeanInterceptorOnNonContextualEjbReferenceTest"/>–>-->
+ <!--<!–<class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest"/>–>-->
</classes>
</test>
</suite>
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=1150272&r1=1150271&r2=1150272&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 Sun Jul 24 03:38:29 2011
@@ -33,12 +33,6 @@
<exclude name="testApplicationScopeActiveDuringServletRequestListenerInvocation"/>
</methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.context.application.ejb.ApplicationContextSharedTest">
- <methods>
- <exclude name="testApplicationContextShared"/>
- <exclude name="testApplicationScopeActiveDuringCallToEjbTimeoutMethod"/>
- </methods>
- </class>
<class name="org.jboss.jsr299.tck.tests.context.conversation.ClientConversationContextTest">
<methods>
<exclude name="testBeanWithDefaultQualifier"/>
@@ -84,27 +78,6 @@
<exclude name="testInstanceUsedForElEvaluationNotShared"/>
</methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.context.dependent.ejb.DependentContextEjbTest">
- <methods>
- <exclude name="testDestroyingEjbDestroysDependentSimples"/>
- <exclude name="testDestroyingEjbDestroysDependents"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.PassivatingContextTest">
- <methods>
- <exclude name="testBeanWithNonSerializableImplementationInjectedIntoTransientFieldOK"/>
- <exclude name="testInjectionOfDependentPrimitiveProductIntoNormalBean"/>
- <exclude name="testInjectionOfDependentSerializableProductIntoNormalBean"/>
- <exclude name="testManagedBeanWithSerializableDecoratorOK"/>
- <exclude name="testManagedBeanWithSerializableImplementationClassOK"/>
- <exclude name="testManagedBeanWithSerializableInterceptorClassOK"/>
- <exclude name="testNonSerializableProducerFieldDeclaredPassivatingThrowsIllegalProductException"/>
- <exclude name="testPassivatingScopeProducerMethodReturnsUnserializableObjectNotOk"/>
- <exclude name="testPassivationCapableProducerFieldIsOK"/>
- <exclude name="testPassivationCapableProducerMethodIsOK"/>
- <exclude name="testPassivationOccurs"/>
- </methods>
- </class>
<class name="org.jboss.jsr299.tck.tests.context.passivating.broken.dependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoStatefulSessionBean.EnterpriseBeanWithIllegalDependencyTest">
<methods>
<exclude name="test"/>
@@ -115,6 +88,11 @@
<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"/>
@@ -122,12 +100,6 @@
<exclude name="testRequestScopeIsDestroyedAfterServletRequest"/>
</methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest">
- <methods>
- <exclude name="testRequestScopeActiveDuringCallToEjbTimeoutMethod"/>
- <exclude name="testRequestScopeDestroyedAfterCallToEjbTimeoutMethod"/>
- </methods>
- </class>
<class name="org.jboss.jsr299.tck.tests.context.session.SessionContextTest">
<methods>
<exclude name="testSessionContextDestroyedWhenHttpSessionInvalidated"/>
@@ -137,37 +109,6 @@
<exclude name="testSessionScopeActiveDuringServiceMethod"/>
</methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.decorators.invocation.EJBDecoratorInvocationTest">
- <methods>
- <exclude name="testEJBDecoratorInvocation"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.definition.qualifier.enterprise.EnterpriseQualifierDefinitionTest">
- <methods>
- <exclude name="testQualifierDeclaredInheritedIsIndirectlyInherited"/>
- <exclude name="testQualifierDeclaredInheritedIsInherited"/>
- <exclude name="testQualifierNotDeclaredInheritedIsNotIndirectlyInherited"/>
- <exclude name="testQualifierNotDeclaredInheritedIsNotInherited"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.definition.scope.enterprise.EnterpriseScopeDefinitionTest">
- <methods>
- <exclude name="testScopeTypeDeclaredInheritedIsIndirectlyInherited"/>
- <exclude name="testScopeTypeDeclaredInheritedIsInherited"/>
- <exclude name="testScopeTypeNotDeclaredInheritedIsNotIndirectlyInherited"/>
- <exclude name="testScopeTypeNotDeclaredInheritedIsNotInherited"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.definition.stereotype.enterprise.EnterpriseStereotypeDefinitionTest">
- <methods>
- <exclude name="testStereotypeDeclaredInheritedIsIndirectlyInherited"/>
- <exclude name="testStereotypeDeclaredInheritedIsInherited"/>
- <exclude name="testStereotypeNotDeclaredInheritedIsNotIndirectlyInherited"/>
- <exclude name="testStereotypeNotDeclaredInheritedIsNotInherited"/>
- <exclude name="testStereotypeScopeIsOverriddenByIndirectlyInheritedScope"/>
- <exclude name="testStereotypeScopeIsOverriddenByInheritedScope"/>
- </methods>
- </class>
<class name="org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInEarTest">
<methods>
<exclude name="test"/>
@@ -178,128 +119,14 @@
<exclude name="test"/>
</methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.event.observer.enterprise.EnterpriseEventInheritenceTest">
- <methods>
- <exclude name="testNonStaticObserverMethodIndirectlyInherited"/>
- <exclude name="testNonStaticObserverMethodInherited"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest">
- <methods>
- <exclude name="testGetEJBName"/>
- <exclude name="testGetSessionBeanType"/>
- <exclude name="testProcessAnnotatedTypeFiredForSessionBean"/>
- <exclude name="testProcessAnnotatedTypeFiredForSessionBeanInterceptor"/>
- <exclude name="testProcessInjectionTargetFiredForManagedBean"/>
- <exclude name="testProcessInjectionTargetFiredForSessionBean"/>
- <exclude name="testProcessInjectionTargetFiredForSessionBeanInterceptor"/>
- <exclude name="testProcessManagedBeanFired"/>
- <exclude name="testProcessSessionBeanFiredForStatefulSessionBean"/>
- <exclude name="testProcessSessionBeanFiredForStatelessSessionBean"/>
- <exclude name="testTypeOfProcessInjectionTargetParameter"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.extensions.processBean.ProcessSessionBeanTest">
- <methods>
- <exclude name="testProcessSessionBeanEvent"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.builtin.BuiltInBeansTest">
- <methods>
- <exclude name="testDefaultValidatorBean"/>
- <exclude name="testDefaultValidatorFactoryBean"/>
- <exclude name="testPrincipalBean"/>
- <exclude name="testUserTransactionBean"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest">
- <methods>
- <exclude name="testBeanTypesAreLocalInterfacesWithoutWildcardTypesOrTypeVariablesWithSuperInterfaces"/>
- <exclude name="testBeanWithNamedAnnotation"/>
- <exclude name="testBeanWithQualifiers"/>
- <exclude name="testBeanWithScopeAnnotation"/>
- <exclude name="testBeanWithStereotype"/>
- <exclude name="testConstructorAnnotatedInjectCalled"/>
- <exclude name="testDefaultName"/>
- <exclude name="testEnterpriseBeanClassLocalView"/>
- <exclude name="testObjectIsInAPITypes"/>
- <exclude name="testRemoteInterfacesAreNotInAPITypes"/>
- <exclude name="testSingletonWithApplicationScopeOK"/>
- <exclude name="testSingletonWithDependentScopeOK"/>
- <exclude name="testStatelessMustBeDependentScoped"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanViaXmlTest">
- <methods>
- <exclude name="testEjbDeclaredInXmlNotSimpleBean"/>
- </methods>
- </class>
<class name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest">
<methods>
<exclude name="testCreateSFSB"/>
- <exclude name="testCreateSLSB"/>
- <exclude name="testDependentObjectsDestroyed"/>
- <exclude name="testDestroyRemovesSFSB"/>
- <exclude name="testDirectSubClassInheritsPostConstructOnSuperclass"/>
- <exclude name="testIndirectSubClassInheritsPostConstructOnSuperclass"/>
- <exclude name="testIndirectSubClassInheritsPreDestroyOnSuperclass"/>
- <exclude name="testInitializerMethodsCalledWithCurrentParameterValues"/>
- <exclude name="testRemovedEjbIgnored"/>
<exclude name="testSerializeSFSB"/>
- <exclude name="testSubClassInheritsPreDestroyOnSuperclass"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanICTest">
- <methods>
- <exclude name="testNewBeanHasNoDisposalMethods"/>
- <exclude name="testNewBeanHasNoProducerMethods"/>
- <exclude name="testNewBeanHasSameConstructor"/>
- <exclude name="testNewBeanHasSameInitializers"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanTest">
- <methods>
- <exclude name="testForEachEnterpriseBeanANewBeanExists"/>
- <exclude name="testNewBeanHasNoBeanELName"/>
- <exclude name="testNewBeanHasNoObservers"/>
- <exclude name="testNewBeanHasNoStereotypes"/>
- <exclude name="testNewBeanIsDependentScoped"/>
- <exclude name="testNewBeanIsHasOnlyNewBinding"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest">
- <methods>
- <exclude name="testApplicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean"/>
- <exclude name="testApplicationMayCallAnyRemoveMethodOnDependentScopedSessionEnterpriseBeans"/>
- <exclude name="testApplicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.initializer.EjbInitializerMethodTest">
- <methods>
- <exclude name="testInitializerMethodNotABusinessMethod"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.initializer.InitializerMethodTest">
- <methods>
- <exclude name="testBindingTypeOnInitializerParameter"/>
- <exclude name="testMultipleInitializerMethodsAreCalled"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.producer.field.definition.enterprise.EnterpriseProducerFieldDefinitionTest">
- <methods>
- <exclude name="testStaticProducerField"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest">
- <methods>
- <exclude name="testNonStaticProducerMethodInheritedBySpecializingSubclass"/>
- <exclude name="testNonStaticProducerMethodNotIndirectlyInherited"/>
- <exclude name="testNonStaticProducerMethodNotInherited"/>
</methods>
</class>
<class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb.EjbInjectionTest">
<methods>
- <exclude name="testInjectionOfEjbs"/>
<exclude name="testPassivationOfEjbs"/>
</methods>
</class>
@@ -319,32 +146,11 @@
<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.interceptors.definition.enterprise.interceptorOrder.SessionBeanInterceptorOrderTest">
- <methods>
- <exclude name="testInterceptorsDeclaredUsingInterceptorsCalledBeforeInterceptorBinding"/>
- </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.interceptors.definition.enterprise.simpleInterception.SessionBeanInterceptorDefinitionTest">
- <methods>
- <exclude name="testSessionBeanIsIntercepted"/>
- </methods>
- </class>
<class name="org.jboss.jsr299.tck.tests.lookup.clientProxy.incontainer.ClientProxyTest">
<methods>
<exclude name="testInvocationIsProcessedOnCurrentInstance"/>
@@ -363,22 +169,6 @@
<exclude name="testELResolverRegisteredWithServletContainer"/>
</methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionOrderingTest">
- <methods>
- <exclude name="testInitializerCalledAfterFieldInjectionOfSuperclass"/>
- <exclude name="testInitializerCalledAfterResourceInjection"/>
- <exclude name="testPostConstructCalledAfterInitializerOfSuperclass"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionTest">
- <methods>
- <exclude name="testFieldDeclaredInSuperclassIndirectlyInjected"/>
- <exclude name="testFieldDeclaredInSuperclassInjected"/>
- <exclude name="testInjectionOnContextualSessionBean"/>
- <exclude name="testInjectionOnEJBInterceptor"/>
- <exclude name="testInjectionOnNonContextualSessionBean"/>
- </methods>
- </class>
<class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.InjectionIntoNonContextualComponentTest">
<methods>
<exclude name="testFilterInitializerMethodCalled"/>
@@ -408,11 +198,6 @@
<exclude name="testManagerLookupInJndi"/>
</methods>
</class>
- <class name="org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.EnterpriseResolutionByTypeTest">
- <methods>
- <exclude name="testBeanTypesOnSessionBean"/>
- </methods>
- </class>
</classes>
</test>
</suite>
Modified: openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java?rev=1150272&r1=1150271&r2=1150272&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java (original)
+++ openejb/trunk/openejb3/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/ContainersImplTomEE.java Sun Jul 24 03:38:29 2011
@@ -30,6 +30,7 @@ import javax.naming.InitialContext;
import org.apache.openejb.assembler.Deployer;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.client.RemoteInitialContextFactory;
+import org.apache.openejb.config.Deploy;
import org.apache.openejb.config.RemoteServer;
import org.jboss.testharness.api.DeploymentException;
import org.jboss.testharness.spi.Containers;
@@ -42,7 +43,7 @@ public class ContainersImplTomEE impleme
private final RemoteServer server;
private Deployer deployer = null;
private static final String tmpDir = System.getProperty("java.io.tmpdir");
- private DeploymentException exception;
+ private Exception exception;
private AppInfo appInfo;
public ContainersImplTomEE() {
@@ -76,8 +77,18 @@ public class ContainersImplTomEE impleme
}
appInfo = deployer.deploy(fileName.getAbsolutePath());
} catch (Exception e) {
- exception = (DeploymentException) new DeploymentException("deploy failed").initCause(e);
- e.printStackTrace();
+
+ if (name.contains(".broken.")) {
+ // Tests that contain the name '.broken.' are expected to fail deployment
+ // This is how the TCK verifies the container is doing the required error checking
+ exception = (DeploymentException) new DeploymentException("deploy failed").initCause(e);
+ } else {
+ // This on the other hand is not good ....
+ System.out.println("FIX Deployment of " + name);
+ e.printStackTrace();
+ exception = e;
+ }
+
return false;
}
return true;
@@ -96,6 +107,7 @@ public class ContainersImplTomEE impleme
throw new RuntimeException(e);
}
}
+
private File getFile(String name) {
final File dir = new File(tmpDir, Math.random()+"");
dir.mkdir();
@@ -105,13 +117,20 @@ public class ContainersImplTomEE impleme
@Override
public DeploymentException getDeploymentException() {
- return exception;
+ try {
+ return (DeploymentException) exception;
+ } catch (Exception e) {
+ System.out.println("BADCAST");
+ return new DeploymentException("", exception);
+ }
}
@Override
public void undeploy(String name) throws IOException {
if (appInfo == null) {
- System.out.println("Nothing to undeploy" + name);
+ if (!(exception instanceof DeploymentException)) {
+ System.out.println("Nothing to undeploy" + name);
+ }
return;
}