You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/09/18 07:19:07 UTC
svn commit: r1625890 - in /tomee/tomee/branches/tomee-1.7.x:
arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
container/openejb-core/src/main/java/org/apache/openejb/config/
Author: rmannibucau
Date: Thu Sep 18 05:19:06 2014
New Revision: 1625890
URL: http://svn.apache.org/r1625890
Log:
TOMEE-1350 ensure tests are instantiablebe fore considering them as managed bean
Modified:
tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TestClassDiscoverer.java
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Modified: tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TestClassDiscoverer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TestClassDiscoverer.java?rev=1625890&r1=1625889&r2=1625890&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TestClassDiscoverer.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/TestClassDiscoverer.java Thu Sep 18 05:19:06 2014
@@ -18,6 +18,7 @@
package org.apache.openejb.arquillian.common;
import org.apache.openejb.config.AdditionalBeanDiscoverer;
+import org.apache.openejb.config.AnnotationDeployer;
import org.apache.openejb.config.AppModule;
import org.apache.openejb.config.ConnectorModule;
import org.apache.openejb.config.EjbModule;
@@ -101,6 +102,12 @@ public class TestClassDiscoverer impleme
try {
// call some reflection methods to make it fail if some dep are missing...
Class<?> current = it.next();
+
+ if (!AnnotationDeployer.isInstantiable(current)) {
+ it.remove();
+ continue;
+ }
+
while (current != null) {
current.getDeclaredFields();
current.getDeclaredMethods();
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1625890&r1=1625889&r2=1625890&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Thu Sep 18 05:19:06 2014
@@ -5452,7 +5452,7 @@ public class AnnotationDeployer implemen
return classes;
}
- private static boolean isInstantiable(final Class<?> clazz) {
+ public static boolean isInstantiable(final Class<?> clazz) {
final int modifiers = clazz.getModifiers();
return !Modifier.isAbstract(modifiers) && !(clazz.getEnclosingClass() != null && !Modifier.isStatic(modifiers))
&& Modifier.isPublic(modifiers);