[webbeans-commits] Webbeans SVN: r3480 - in ri/trunk: jboss-tck-runner and 6 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-13 09:27:15 -0400 (Thu, 13 Aug 2009)
New Revision: 3480
Removed:
ri/trunk/spi/src/main/java/org/jboss/webbeans/messaging/spi/JmsServices.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/ws/spi/WebServices.java
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java
ri/trunk/jboss-tck-runner/pom.xml
ri/trunk/porting-package/pom.xml
ri/trunk/tests/pom.xml
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java
ri/trunk/version-matrix/pom.xml
Log:
WBRI-348
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java 2009-08-13 13:27:15 UTC (rev 3480)
@@ -16,6 +16,7 @@
*/
package org.jboss.webbeans.util.el;
+import java.beans.FeatureDescriptor;
import java.util.Iterator;
import javax.el.ELContext;
@@ -33,7 +34,7 @@
}
@Override
- public Iterator<?> getFeatureDescriptors(ELContext context, Object base)
+ public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base)
{
return delegate().getFeatureDescriptors(context, base);
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java 2009-08-13 13:27:15 UTC (rev 3480)
@@ -31,30 +31,26 @@
protected abstract ExpressionFactory delegate();
- @SuppressWarnings("unchecked")
@Override
- public Object coerceToType(Object obj, Class targetType)
+ public Object coerceToType(Object obj, Class<?> targetType)
{
return delegate().coerceToType(obj, targetType);
}
- @SuppressWarnings("unchecked")
@Override
- public MethodExpression createMethodExpression(ELContext context, String expression, Class expectedReturnType, Class[] expectedParamTypes)
+ public MethodExpression createMethodExpression(ELContext context, String expression, Class<?> expectedReturnType, Class<?>[] expectedParamTypes)
{
return delegate().createMethodExpression(context, expression, expectedReturnType, expectedParamTypes);
}
- @SuppressWarnings("unchecked")
@Override
- public ValueExpression createValueExpression(Object instance, Class expectedType)
+ public ValueExpression createValueExpression(Object instance, Class<?> expectedType)
{
return delegate().createValueExpression(instance, expectedType);
}
- @SuppressWarnings("unchecked")
@Override
- public ValueExpression createValueExpression(ELContext context, String expression, Class expectedType)
+ public ValueExpression createValueExpression(ELContext context, String expression, Class<?> expectedType)
{
return delegate().createValueExpression(context, expression, expectedType);
}
Modified: ri/trunk/jboss-tck-runner/pom.xml
===================================================================
--- ri/trunk/jboss-tck-runner/pom.xml 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/jboss-tck-runner/pom.xml 2009-08-13 13:27:15 UTC (rev 3480)
@@ -76,8 +76,8 @@
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>javax.el</groupId>
- <artifactId>el-ri</artifactId>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
Modified: ri/trunk/porting-package/pom.xml
===================================================================
--- ri/trunk/porting-package/pom.xml 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/porting-package/pom.xml 2009-08-13 13:27:15 UTC (rev 3480)
@@ -29,9 +29,9 @@
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
</dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-ri</artifactId>
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
</dependency>
<dependency>
Deleted: ri/trunk/spi/src/main/java/org/jboss/webbeans/messaging/spi/JmsServices.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/messaging/spi/JmsServices.java 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/messaging/spi/JmsServices.java 2009-08-13 13:27:15 UTC (rev 3480)
@@ -1,45 +0,0 @@
-package org.jboss.webbeans.messaging.spi;
-
-
-import javax.jms.Destination;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.TopicConnectionFactory;
-
-import org.jboss.webbeans.bootstrap.api.Service;
-
-/**
- * A container should implement this interface to allow Web Beans to resolve Jms
- * Services
- *
- * @author Pete Muir
- *
- */
-public interface JmsServices extends Service
-{
-
- /**
- * Resolve the destination for the given JNDI name and mapped name
- *
- * @param injectionPoint
- * the injection point metadata
- * @return an instance of the resource
- * @throws IllegalStateException
- * if no resource can be resolved for injection
- */
- public <T extends Destination> T resolveDestination(String jndiName, String mappedName);
-
- /**
- * Get a QueueConnectionFactory
- *
- * @return the queue connection factory
- */
- public QueueConnectionFactory getQueueConnectionFactory();
-
- /**
- * Get a TopicConnectionFactory
- *
- * @return
- */
- public TopicConnectionFactory getTopicConnectionFactory();
-
-}
\ No newline at end of file
Deleted: ri/trunk/spi/src/main/java/org/jboss/webbeans/ws/spi/WebServices.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/ws/spi/WebServices.java 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ws/spi/WebServices.java 2009-08-13 13:27:15 UTC (rev 3480)
@@ -1,27 +0,0 @@
-package org.jboss.webbeans.ws.spi;
-
-
-import org.jboss.webbeans.bootstrap.api.Service;
-
-/**
- * A container should implement this interface to allow Web Beans to resolve Web
- * Services
- *
- * @author Pete Muir
- *
- */
-public interface WebServices extends Service
-{
-
- /**
- * Resolve the value for the given JNDI name and mapped name
- *
- * @param injectionPoint
- * the injection point metadata
- * @return an instance of the resource
- * @throws IllegalStateException
- * if no resource can be resolved for injection
- */
- public Object resolveResource(String jndiName, String mappedName);
-
-}
\ No newline at end of file
Modified: ri/trunk/tests/pom.xml
===================================================================
--- ri/trunk/tests/pom.xml 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/tests/pom.xml 2009-08-13 13:27:15 UTC (rev 3480)
@@ -40,8 +40,8 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-ri</artifactId>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
</dependency>
<dependency>
@@ -159,8 +159,8 @@
<outputDirectory>${project.build.directory}/classes/lib</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>javax.el</groupId>
- <artifactId>el-ri</artifactId>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java 2009-08-13 13:27:15 UTC (rev 3480)
@@ -20,13 +20,6 @@
public class ELResolverTest extends AbstractWebBeansTest
{
- @Test(groups="incontainer-broken")
- public void testNonBeanDoesntResolveToNamespace()
- {
- ELContext elContext = EL.createELContext();
- assert EL.EXPRESSION_FACTORY.createValueExpression(elContext, "#{foo.bar}", Object.class).getValue(elContext) == null;
- }
-
/**
* Test that the WebBeansELResolver only works to resolve the base of an EL
* expression, in this case a named bean. Once the base is resolved, the
Modified: ri/trunk/version-matrix/pom.xml
===================================================================
--- ri/trunk/version-matrix/pom.xml 2009-08-13 12:55:10 UTC (rev 3479)
+++ ri/trunk/version-matrix/pom.xml 2009-08-13 13:27:15 UTC (rev 3480)
@@ -151,7 +151,7 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
- <version>1.2</version>
+ <version>2.1.2-b04</version>
</dependency>
<dependency>
@@ -217,21 +217,15 @@
</dependency>
<dependency>
- <groupId>org.jboss.el</groupId>
- <artifactId>jboss-el</artifactId>
- <version>1.0_02.CR2</version>
- </dependency>
-
- <dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
<version>1.1.15.B1</version>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-ri</artifactId>
- <version>1.2</version>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>2.1.2-b04</version>
</dependency>
<dependency>
14 years, 9 months
[webbeans-commits] Webbeans SVN: r3479 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-08-13 08:55:10 -0400 (Thu, 13 Aug 2009)
New Revision: 3479
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/TameSkinnyHairlessCat.java
Log:
oops, should be session beans
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java 2009-08-13 12:01:28 UTC (rev 3478)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java 2009-08-13 12:55:10 UTC (rev 3479)
@@ -1,5 +1,8 @@
package org.jboss.jsr299.tck.tests.definition.binding.enterprise;
+import javax.ejb.Stateless;
+
+@Stateless
public class SkinnyHairlessCat extends HairlessCat implements SkinnyHairlessCatLocal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/TameSkinnyHairlessCat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/TameSkinnyHairlessCat.java 2009-08-13 12:01:28 UTC (rev 3478)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/TameSkinnyHairlessCat.java 2009-08-13 12:55:10 UTC (rev 3479)
@@ -1,5 +1,8 @@
package org.jboss.jsr299.tck.tests.definition.binding.enterprise;
+import javax.ejb.Stateless;
+
+@Stateless
public class TameSkinnyHairlessCat extends SkinnyHairlessCat implements TameSkinnyHairlessCatLocal
{
14 years, 9 months
[webbeans-commits] Webbeans SVN: r3478 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-08-13 08:01:28 -0400 (Thu, 13 Aug 2009)
New Revision: 3478
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java
Log:
removed unnecessary assert
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-08-13 11:23:07 UTC (rev 3477)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-08-13 12:01:28 UTC (rev 3478)
@@ -38,9 +38,7 @@
@SpecAssertion(section = "4.1", id = "ala")
public void testBindingNotDeclaredInheritedIsNotInherited() throws Exception
{
- Set<? extends Annotation> bindings = getBeans(SkinnyHairlessCatLocal.class).iterator().next().getBindings();
- assert annotationSetMatches(bindings, Any.class);
-
+ Set<? extends Annotation> bindings = getBeans(SkinnyHairlessCatLocal.class).iterator().next().getBindings();
assert getBeans(SkinnyHairlessCatLocal.class, new HairlessBinding()).size() == 0;
}
@@ -56,8 +54,7 @@
@SpecAssertion(section = "4.1", id = "apa")
public void testBindingNotDeclaredInheritedIsNotIndirectlyInherited()
{
- Set<? extends Annotation> bindings = getBeans(TameSkinnyHairlessCatLocal.class).iterator().next().getBindings();
- assert annotationSetMatches(bindings, Any.class);
+ Set<? extends Annotation> bindings = getBeans(TameSkinnyHairlessCatLocal.class).iterator().next().getBindings();
assert getBeans(TameSkinnyHairlessCatLocal.class, new HairlessBinding()).size() == 0;
}
}
14 years, 9 months
[webbeans-commits] Webbeans SVN: r3477 - in ri/trunk: spi/src/main/java/org/jboss/webbeans and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-13 07:23:07 -0400 (Thu, 13 Aug 2009)
New Revision: 3477
Removed:
ri/trunk/spi/src/main/java/org/jboss/webbeans/jpa/
ri/trunk/spi/src/main/java/org/jboss/webbeans/messaging/spi/helpers/
ri/trunk/spi/src/main/java/org/jboss/webbeans/ws/spi/helpers/
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJmsServices.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockWebServices.java
ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJmsServices.java
ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockWebServices.java
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Environments.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java
ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEELifecycle.java
Log:
Remove uneeded services and methods
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-08-13 10:34:49 UTC (rev 3476)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-08-13 11:23:07 UTC (rev 3477)
@@ -58,7 +58,6 @@
import org.jboss.webbeans.jsf.JsfApiAbstraction;
import org.jboss.webbeans.log.Log;
import org.jboss.webbeans.log.Logging;
-import org.jboss.webbeans.messaging.spi.JmsServices;
import org.jboss.webbeans.metadata.TypeStore;
import org.jboss.webbeans.metadata.cache.MetaAnnotationStore;
import org.jboss.webbeans.persistence.PersistenceApiAbstraction;
@@ -71,7 +70,6 @@
import org.jboss.webbeans.servlet.ServletApiAbstraction;
import org.jboss.webbeans.transaction.spi.TransactionServices;
import org.jboss.webbeans.util.serviceProvider.ServiceLoader;
-import org.jboss.webbeans.ws.spi.WebServices;
import org.jboss.webbeans.xml.BeansXmlParser;
/**
@@ -179,10 +177,6 @@
{
log.info("EJB services not available. Session beans will be simple beans, CDI-style injection into non-contextual EJBs, injection of remote EJBs and injection of @EJB in simple beans will not be available");
}
- if (!getServices().contains(JmsServices.class))
- {
- log.info("JMS services not available. JMS resources will not be available.");
- }
if (!getServices().contains(JpaServices.class))
{
log.info("JPA services not available. Injection of @PersistenceContext will not occur. Entity beans will be discovered as simple beans.");
@@ -191,10 +185,6 @@
{
log.info("@Resource injection not available.");
}
- if (!getServices().contains(WebServices.class))
- {
- log.info("WebService reference injection not available.");
- }
addImplementationServices();
createContexts();
this.manager = BeanManagerImpl.newRootManager(ServiceRegistries.unmodifiableServiceRegistry(getServices()));
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Environments.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Environments.java 2009-08-13 10:34:49 UTC (rev 3476)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Environments.java 2009-08-13 11:23:07 UTC (rev 3477)
@@ -22,12 +22,10 @@
import org.jboss.webbeans.bootstrap.spi.Deployment;
import org.jboss.webbeans.ejb.spi.EjbServices;
-import org.jboss.webbeans.messaging.spi.JmsServices;
import org.jboss.webbeans.persistence.spi.JpaServices;
import org.jboss.webbeans.resources.spi.ResourceLoader;
import org.jboss.webbeans.resources.spi.ResourceServices;
import org.jboss.webbeans.transaction.spi.TransactionServices;
-import org.jboss.webbeans.ws.spi.WebServices;
/**
* Various well known environments.
@@ -41,7 +39,7 @@
/**
* Java EE5 or Java EE6
*/
- EE(Deployment.class, EjbServices.class, JpaServices.class, WebServices.class, JmsServices.class, ResourceServices.class, TransactionServices.class, ResourceLoader.class),
+ EE(Deployment.class, EjbServices.class, JpaServices.class, ResourceServices.class, TransactionServices.class, ResourceLoader.class),
/**
* Java EE6 Web Profile
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java 2009-08-13 10:34:49 UTC (rev 3476)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java 2009-08-13 11:23:07 UTC (rev 3477)
@@ -5,19 +5,17 @@
import org.jboss.webbeans.bootstrap.spi.Deployment;
import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore;
import org.jboss.webbeans.ejb.spi.EjbServices;
-import org.jboss.webbeans.messaging.spi.JmsServices;
import org.jboss.webbeans.persistence.spi.JpaServices;
import org.jboss.webbeans.resources.spi.ResourceLoader;
import org.jboss.webbeans.resources.spi.ResourceServices;
import org.jboss.webbeans.transaction.spi.TransactionServices;
-import org.jboss.webbeans.ws.spi.WebServices;
import org.testng.annotations.Test;
public class BootstrapTest
{
@Test(expectedExceptions=IllegalStateException.class)
- public void testMissingWBDiscovery()
+ public void testMissingDeployment()
{
AbstractBootstrap bootstrap = new MockBootstrap();
bootstrap.setEnvironment(Environments.SE);
@@ -37,8 +35,6 @@
bootstrap.getServices().add(Deployment.class, new MockDeployment());
bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
- bootstrap.getServices().add(WebServices.class, new MockWebServices());
- bootstrap.getServices().add(JmsServices.class, new MockJmsServices());
bootstrap.startContainer();
}
@@ -53,44 +49,9 @@
bootstrap.getServices().add(Deployment.class, new MockDeployment());
bootstrap.getServices().add(EjbServices.class, new MockEjbServices());
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
- bootstrap.getServices().add(WebServices.class, new MockWebServices());
- bootstrap.getServices().add(JmsServices.class, new MockJmsServices());
bootstrap.startContainer();
}
- @Test(expectedExceptions=IllegalStateException.class)
- public void testMissingWebServices()
- {
- AbstractBootstrap bootstrap = new MockBootstrap();
- bootstrap.setEnvironment(Environments.EE);
- bootstrap.setApplicationContext(new ConcurrentHashMapBeanStore());
- bootstrap.getServices().add(ResourceLoader.class, new MockResourceLoader());
- bootstrap.getServices().add(TransactionServices.class, new MockTransactionServices());
- bootstrap.getServices().add(Deployment.class, new MockDeployment());
- bootstrap.getServices().add(EjbServices.class, new MockEjbServices());
- bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
- bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
- bootstrap.getServices().add(JmsServices.class, new MockJmsServices());
- bootstrap.startContainer();
- }
-
- @Test(expectedExceptions=IllegalStateException.class)
- public void testMissingJmsServices()
- {
- AbstractBootstrap bootstrap = new MockBootstrap();
- bootstrap.setEnvironment(Environments.EE);
- bootstrap.setApplicationContext(new ConcurrentHashMapBeanStore());
- bootstrap.getServices().add(ResourceLoader.class, new MockResourceLoader());
- bootstrap.getServices().add(TransactionServices.class, new MockTransactionServices());
- bootstrap.getServices().add(Deployment.class, new MockDeployment());
- bootstrap.getServices().add(EjbServices.class, new MockEjbServices());
- bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
- bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
- bootstrap.getServices().add(WebServices.class, new MockWebServices());
- bootstrap.startContainer();
- }
-
-
@Test
public void testEEEnv()
{
@@ -103,8 +64,6 @@
bootstrap.getServices().add(EjbServices.class, new MockEjbServices());
bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
- bootstrap.getServices().add(WebServices.class, new MockWebServices());
- bootstrap.getServices().add(JmsServices.class, new MockJmsServices());
bootstrap.startContainer();
}
Deleted: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJmsServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJmsServices.java 2009-08-13 10:34:49 UTC (rev 3476)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockJmsServices.java 2009-08-13 11:23:07 UTC (rev 3477)
@@ -1,28 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import javax.jms.Destination;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.TopicConnectionFactory;
-
-import org.jboss.webbeans.messaging.spi.JmsServices;
-
-public class MockJmsServices implements JmsServices
-{
-
- public <T extends Destination> T resolveDestination(String jndiName, String mappedName)
- {
- return null;
- }
-
- public QueueConnectionFactory getQueueConnectionFactory()
- {
- return null;
- }
-
- public TopicConnectionFactory getTopicConnectionFactory()
- {
- return null;
- }
-
-
-}
Deleted: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockWebServices.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockWebServices.java 2009-08-13 10:34:49 UTC (rev 3476)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockWebServices.java 2009-08-13 11:23:07 UTC (rev 3477)
@@ -1,13 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.test;
-
-import org.jboss.webbeans.ws.spi.WebServices;
-
-public class MockWebServices implements WebServices
-{
-
- public Object resolveResource(String jndiName, String mappedName)
- {
- return null;
- }
-
-}
Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEELifecycle.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEELifecycle.java 2009-08-13 10:34:49 UTC (rev 3476)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockEELifecycle.java 2009-08-13 11:23:07 UTC (rev 3477)
@@ -18,11 +18,9 @@
import org.jboss.webbeans.bootstrap.api.Environments;
import org.jboss.webbeans.ejb.spi.EjbServices;
-import org.jboss.webbeans.messaging.spi.JmsServices;
import org.jboss.webbeans.persistence.spi.JpaServices;
import org.jboss.webbeans.resources.spi.ResourceServices;
import org.jboss.webbeans.transaction.spi.TransactionServices;
-import org.jboss.webbeans.ws.spi.WebServices;
public class MockEELifecycle extends MockServletLifecycle
{
@@ -36,8 +34,6 @@
getBootstrap().getServices().add(EjbServices.class, new MockEjBServices());
getBootstrap().getServices().add(JpaServices.class, new MockJpaServices(getDeployment()));
getBootstrap().getServices().add(ResourceServices.class, new MockResourceServices());
- getBootstrap().getServices().add(WebServices.class, new MockWebServices());
- getBootstrap().getServices().add(JmsServices.class, new MockJmsServices());
getBootstrap().setEnvironment(Environments.EE);
}
Deleted: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJmsServices.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJmsServices.java 2009-08-13 10:34:49 UTC (rev 3476)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockJmsServices.java 2009-08-13 11:23:07 UTC (rev 3477)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.webbeans.mock;
-
-import javax.jms.Destination;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.TopicConnectionFactory;
-
-import org.jboss.webbeans.messaging.spi.JmsServices;
-
-/**
- * @author Pete Muir
- *
- */
-public class MockJmsServices implements JmsServices
-{
-
- public QueueConnectionFactory getQueueConnectionFactory()
- {
- return null;
- }
-
- public TopicConnectionFactory getTopicConnectionFactory()
- {
- return null;
- }
-
- public <T extends Destination> T resolveDestination(String jndiName, String mappedName)
- {
- return null;
- }
-
-}
Deleted: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockWebServices.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockWebServices.java 2009-08-13 10:34:49 UTC (rev 3476)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockWebServices.java 2009-08-13 11:23:07 UTC (rev 3477)
@@ -1,13 +0,0 @@
-package org.jboss.webbeans.mock;
-
-import org.jboss.webbeans.ws.spi.WebServices;
-
-public class MockWebServices implements WebServices
-{
-
- public Object resolveResource(String jndiName, String mappedName)
- {
- return null;
- }
-
-}
14 years, 9 months
[webbeans-commits] Webbeans SVN: r3476 - in ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi: helpers and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-13 06:34:49 -0400 (Thu, 13 Aug 2009)
New Revision: 3476
Modified:
ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java
Log:
Remove unused method
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java 2009-08-13 10:14:03 UTC (rev 3475)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java 2009-08-13 10:34:49 UTC (rev 3476)
@@ -56,19 +56,4 @@
*/
public SessionObjectReference resolveEjb(EjbDescriptor<?> ejbDescriptor);
- /**
- * Resolve a remote EJB reference. At least one of the parameters will not be
- * null.
- *
- * @param jndiName the JNDI name
- * @param mappedName the mapped name
- * @param ejbLink the EJB link name
- * @return the remote EJB reference
- * @throws IllegalStateException
- * if no EJBs can be resolved for injection
- * @throws IllegalArgumentException
- * if jndiName, mappedName and ejbLink are null
- */
- public Object resolveRemoteEjb(String jndiName, String mappedName, String ejbLink);
-
}
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java 2009-08-13 10:14:03 UTC (rev 3475)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java 2009-08-13 10:34:49 UTC (rev 3476)
@@ -47,11 +47,6 @@
return delegate().resolveEjb(ejbDescriptor);
}
- public Object resolveRemoteEjb(String jndiName, String mappedName, String ejbLink)
- {
- return delegate().resolveRemoteEjb(jndiName, mappedName, ejbLink);
- }
-
@Override
public boolean equals(Object obj)
{
14 years, 9 months
[webbeans-commits] Webbeans SVN: r3475 - ri/trunk/impl/src/main/java/org/jboss/webbeans.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-13 06:14:03 -0400 (Thu, 13 Aug 2009)
New Revision: 3475
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/SimpleInjectionTarget.java
Log:
Call initializer methods
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/SimpleInjectionTarget.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/SimpleInjectionTarget.java 2009-08-13 09:14:31 UTC (rev 3474)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/SimpleInjectionTarget.java 2009-08-13 10:14:03 UTC (rev 3475)
@@ -20,6 +20,7 @@
import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.CreationException;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.InjectionTarget;
@@ -74,6 +75,10 @@
{
injectionPoint.inject(instance, beanManager, ctx);
}
+ for (MethodInjectionPoint<?, ?> injectionPoint : initializerMethods)
+ {
+ injectionPoint.invoke(instance, beanManager, ctx, CreationException.class);
+ }
}
public void postConstruct(T instance)
14 years, 9 months
[webbeans-commits] Webbeans SVN: r3474 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-08-13 05:14:31 -0400 (Thu, 13 Aug 2009)
New Revision: 3474
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/BengalTiger.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/BengalTigerLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Cat.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/FooScoped.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Siamese.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/SiameseLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Tiger.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java
Log:
enterprise bean scope inheritance tests
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/BengalTiger.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/BengalTiger.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/BengalTiger.java 2009-08-13 09:14:31 UTC (rev 3474)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.definition.scope.enterprise;
+
+import javax.ejb.Stateful;
+
+@Stateful
+public class BengalTiger extends Tiger implements BengalTigerLocal
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/BengalTigerLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/BengalTigerLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/BengalTigerLocal.java 2009-08-13 09:14:31 UTC (rev 3474)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.definition.scope.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+public interface BengalTigerLocal
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Cat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Cat.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Cat.java 2009-08-13 09:14:31 UTC (rev 3474)
@@ -0,0 +1,7 @@
+package org.jboss.jsr299.tck.tests.definition.scope.enterprise;
+
+@FooScoped
+class Cat
+{
+
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-08-13 04:31:57 UTC (rev 3473)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/EnterpriseScopeDefinitionTest.java 2009-08-13 09:14:31 UTC (rev 3474)
@@ -15,16 +15,30 @@
@SpecVersion("20090625")
public class EnterpriseScopeDefinitionTest extends AbstractJSR299Test
{
- @Test @SpecAssertion(section="4.1", id = "be")
+ @Test
+ @SpecAssertion(section="4.1", id = "be")
public void testScopeTypeDeclaredInheritedIsInherited() throws Exception
{
assert getBeans(BorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
}
+ @Test @SpecAssertion(section="4.1", id = "bea")
+ public void testScopeTypeNotDeclaredInheritedIsNotInherited() throws Exception
+ {
+ assert !getBeans(SiameseLocal.class).iterator().next().getScopeType().equals(FooScoped.class);
+ }
+
@Test
@SpecAssertion(section = "4.1", id = "bh")
public void testScopeTypeDeclaredInheritedIsIndirectlyInherited()
{
assert getBeans(EnglishBorderCollieLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
}
+
+ @Test
+ @SpecAssertion(section = "4.1", id = "bha")
+ public void testScopeTypeNotDeclaredInheritedIsNotIndirectlyInherited()
+ {
+ assert !getBeans(BengalTigerLocal.class).iterator().next().getScopeType().equals(FooScoped.class);
+ }
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/FooScoped.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/FooScoped.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/FooScoped.java 2009-08-13 09:14:31 UTC (rev 3474)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.definition.scope.enterprise;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.context.ScopeType;
+
+@Target( { TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@Documented
+@ScopeType
+public @interface FooScoped
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Siamese.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Siamese.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Siamese.java 2009-08-13 09:14:31 UTC (rev 3474)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.definition.scope.enterprise;
+
+import javax.ejb.Stateful;
+
+@Stateful
+public class Siamese extends Cat implements SiameseLocal
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/SiameseLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/SiameseLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/SiameseLocal.java 2009-08-13 09:14:31 UTC (rev 3474)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.definition.scope.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+public interface SiameseLocal
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Tiger.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Tiger.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/enterprise/Tiger.java 2009-08-13 09:14:31 UTC (rev 3474)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.definition.scope.enterprise;
+
+class Tiger extends Cat
+{
+
+}
14 years, 9 months
[webbeans-commits] Webbeans SVN: r3473 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/definition/scope and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-08-13 00:31:57 -0400 (Thu, 13 Aug 2009)
New Revision: 3473
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/TameSkinnyHairlessCat.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/TameSkinnyHairlessCatLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Clydesdale.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/MiniatureClydesdale.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/Barracuda.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/BarracudaLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/Fish.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/FishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/TameBarracuda.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/TameBarracudaLocal.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
more section 4.1 cleanup, removed duplicate assertions, added missing tests
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-08-13 02:58:21 UTC (rev 3472)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-08-13 04:31:57 UTC (rev 3473)
@@ -51,4 +51,13 @@
Set<? extends Annotation> bindings = getBeans(EnglishBorderCollieLocal.class, new HairyBinding(false)).iterator().next().getBindings();
assert annotationSetMatches(bindings, Any.class, Hairy.class);
}
+
+ @Test
+ @SpecAssertion(section = "4.1", id = "apa")
+ public void testBindingNotDeclaredInheritedIsNotIndirectlyInherited()
+ {
+ Set<? extends Annotation> bindings = getBeans(TameSkinnyHairlessCatLocal.class).iterator().next().getBindings();
+ assert annotationSetMatches(bindings, Any.class);
+ assert getBeans(TameSkinnyHairlessCatLocal.class, new HairlessBinding()).size() == 0;
+ }
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/TameSkinnyHairlessCat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/TameSkinnyHairlessCat.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/TameSkinnyHairlessCat.java 2009-08-13 04:31:57 UTC (rev 3473)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.definition.binding.enterprise;
+
+public class TameSkinnyHairlessCat extends SkinnyHairlessCat implements TameSkinnyHairlessCatLocal
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/TameSkinnyHairlessCatLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/TameSkinnyHairlessCatLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/TameSkinnyHairlessCatLocal.java 2009-08-13 04:31:57 UTC (rev 3473)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.definition.binding.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+public interface TameSkinnyHairlessCatLocal
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Clydesdale.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Clydesdale.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/Clydesdale.java 2009-08-13 04:31:57 UTC (rev 3473)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.definition.scope;
+
+class Clydesdale extends Horse
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/MiniatureClydesdale.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/MiniatureClydesdale.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/MiniatureClydesdale.java 2009-08-13 04:31:57 UTC (rev 3473)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.definition.scope;
+
+class MiniatureClydesdale extends Clydesdale
+{
+
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-08-13 02:58:21 UTC (rev 3472)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-08-13 04:31:57 UTC (rev 3473)
@@ -115,7 +115,7 @@
assert getBeans(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
}
- @Test @SpecAssertion(section="4.1", id = "ba")
+ @Test @SpecAssertion(section="4.1", id = "baa")
public void testScopeTypeNotDeclaredInheritedIsNotInherited()
{
assert getBeans(ShetlandPony.class).size() == 1;
@@ -142,4 +142,12 @@
assert getBeans(EnglishBorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
}
+ @Test
+ @SpecAssertion(section="4.1", id = "bca")
+ public void testScopeTypeNotDeclaredInheritedIsNotIndirectlyInherited()
+ {
+ assert getBeans(MiniatureClydesdale.class).size() == 1;
+ assert getBeans(MiniatureClydesdale.class).iterator().next().getScopeType().equals(Dependent.class);
+ }
+
}
\ No newline at end of file
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/Barracuda.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/Barracuda.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/Barracuda.java 2009-08-13 04:31:57 UTC (rev 3473)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.definition.stereotype.enterprise;
+
+import javax.ejb.Stateful;
+
+@Stateful
+public class Barracuda extends Fish implements BarracudaLocal
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/BarracudaLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/BarracudaLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/BarracudaLocal.java 2009-08-13 04:31:57 UTC (rev 3473)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.definition.stereotype.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+public interface BarracudaLocal
+{
+
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-08-13 02:58:21 UTC (rev 3472)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/EnterpriseStereotypeDefinitionTest.java 2009-08-13 04:31:57 UTC (rev 3473)
@@ -26,6 +26,13 @@
}
@Test
+ @SpecAssertion(section = "4.1", id = "ama")
+ public void testStereotypeNotDeclaredInheritedIsNotInherited() throws Exception
+ {
+ assert !getBeans(BarracudaLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
+ }
+
+ @Test
@SpecAssertion(section = "4.1", id = "aq")
public void testStereotypeDeclaredInheritedIsIndirectlyInherited()
{
@@ -33,6 +40,13 @@
}
@Test
+ @SpecAssertion(section = "4.1", id = "aqa")
+ public void testStereotypeNotDeclaredInheritedIsNotIndirectlyInherited()
+ {
+ assert !getBeans(TameBarracudaLocal.class).iterator().next().getScopeType().equals(RequestScoped.class);
+ }
+
+ @Test
@SpecAssertion(section = "4.1", id = "hhj")
public void testStereotypeScopeIsOverriddenByInheritedScope()
{
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/Fish.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/Fish.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/Fish.java 2009-08-13 04:31:57 UTC (rev 3473)
@@ -0,0 +1,7 @@
+package org.jboss.jsr299.tck.tests.definition.stereotype.enterprise;
+
+@FishStereotype
+class Fish
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/FishStereotype.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/FishStereotype.java 2009-08-13 04:31:57 UTC (rev 3473)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.definition.stereotype.enterprise;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.stereotype.Stereotype;
+
+@Stereotype
+@Target( { TYPE, METHOD, FIELD })
+@Retention(RUNTIME)
+@RequestScoped
+@interface FishStereotype
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/TameBarracuda.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/TameBarracuda.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/TameBarracuda.java 2009-08-13 04:31:57 UTC (rev 3473)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.definition.stereotype.enterprise;
+
+import javax.ejb.Stateful;
+
+@Stateful
+public class TameBarracuda extends Barracuda implements TameBarracudaLocal
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/TameBarracudaLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/TameBarracudaLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/enterprise/TameBarracudaLocal.java 2009-08-13 04:31:57 UTC (rev 3473)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.definition.stereotype.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+public interface TameBarracudaLocal
+{
+
+}
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-13 02:58:21 UTC (rev 3472)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-13 04:31:57 UTC (rev 3473)
@@ -1487,39 +1487,43 @@
<text>Test interceptor binding type for indirectly extended session bean not annotated |@Inherited| is not inherited.</text>
</assertion>
</group>
+
+ <group>
+ <text>Suppose a class X is extended directly or indirectly by the bean class of a managed bean or session bean Y. If X is annotated with a scope type Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares a scope type.</text>
+
+ <assertion id="ba">
+ <text>Test scope type for directly extended managed bean annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="baa">
+ <text>Test scope type for directly extended managed bean not annotated |@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="ba">
- <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare a scope type.</text>
- </assertion>
+ <assertion id="bc">
+ <text>Test scope type for indirectly extended managed bean annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="bca">
+ <text>Test scope type for indirectly extended managed bean not annotated |@Inherited| is not inherited.</text>
+ </assertion>
+
+ <assertion id="be">
+ <text>Test scope type for directly extended session bean annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="bea">
+ <text>Test scope type for directly extended session bean not annotated |@Inherited| is not inherited.</text>
+ </assertion>
- <assertion id="bb">
- <text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare a scope type.</text>
- </assertion>
+ <assertion id="bh">
+ <text>Test scope type for indirectly extended session bean annotated |@Inherited| is inherited.</text>
+ </assertion>
+
+ <assertion id="bha">
+ <text>Test scope type for indirectly extended session bean not annotated |@Inherited| is not inherited.</text>
+ </assertion>
+ </group>
- <assertion id="bc">
- <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares a scope type.</text>
- </assertion>
-
- <assertion id="bd">
- <text>For class X which is extended _indirectly_ by the bean class of a _managed_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares a scope type.</text>
- </assertion>
-
- <assertion id="be">
- <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare a scope type.</text>
- </assertion>
-
- <assertion id="bf">
- <text>For class X which is extended _directly_ by the bean class of a _session_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and Y does not declare a scope type.</text>
- </assertion>
-
- <assertion id="bg">
- <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares a scope type.</text>
- </assertion>
-
- <assertion id="bh">
- <text>For class X which is extended _indirectly_ by the bean class of a _session_ bean Y, if X is annotated with a _scope type_ Z then Y inherits the annotation if and only if Z declares the |@Inherited| meta-annotation and neither Y nor any intermediate class that is a subclass of X and a superclass of Y declares a scope type.</text>
- </assertion>
-
<assertion id="hhh">
<text>For class X which is extended _directly_ by the bean class of a _managed_ bean Y, a scope type explicitly declared by X and inherited by Y from X takes precedence over default scopes of stereotypes declared or inherited by Y.</text>
</assertion>
14 years, 9 months
[webbeans-commits] Webbeans SVN: r3472 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-08-12 22:58:21 -0400 (Wed, 12 Aug 2009)
New Revision: 3472
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Hairless.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/HairlessBinding.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/HairlessCat.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCatLocal.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java
Log:
more inheritance tests for 4.1
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-08-13 02:36:36 UTC (rev 3471)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/EnterpriseBindingDefinitionTest.java 2009-08-13 02:58:21 UTC (rev 3472)
@@ -35,6 +35,16 @@
}
@Test
+ @SpecAssertion(section = "4.1", id = "ala")
+ public void testBindingNotDeclaredInheritedIsNotInherited() throws Exception
+ {
+ Set<? extends Annotation> bindings = getBeans(SkinnyHairlessCatLocal.class).iterator().next().getBindings();
+ assert annotationSetMatches(bindings, Any.class);
+
+ assert getBeans(SkinnyHairlessCatLocal.class, new HairlessBinding()).size() == 0;
+ }
+
+ @Test
@SpecAssertion(section = "4.1", id = "ap")
public void testBindingDeclaredInheritedIsIndirectlyInherited()
{
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Hairless.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Hairless.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/Hairless.java 2009-08-13 02:58:21 UTC (rev 3472)
@@ -0,0 +1,24 @@
+package org.jboss.jsr299.tck.tests.definition.binding.enterprise;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@Inherited
+@interface Hairless
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/HairlessBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/HairlessBinding.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/HairlessBinding.java 2009-08-13 02:58:21 UTC (rev 3472)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.definition.binding.enterprise;
+
+import javax.enterprise.inject.AnnotationLiteral;
+
+public class HairlessBinding extends AnnotationLiteral<Hairless> implements Hairless
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/HairlessCat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/HairlessCat.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/HairlessCat.java 2009-08-13 02:58:21 UTC (rev 3472)
@@ -0,0 +1,7 @@
+package org.jboss.jsr299.tck.tests.definition.binding.enterprise;
+
+@Hairless
+class HairlessCat
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCat.java 2009-08-13 02:58:21 UTC (rev 3472)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.definition.binding.enterprise;
+
+public class SkinnyHairlessCat extends HairlessCat implements SkinnyHairlessCatLocal
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCatLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCatLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/enterprise/SkinnyHairlessCatLocal.java 2009-08-13 02:58:21 UTC (rev 3472)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.definition.binding.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+public interface SkinnyHairlessCatLocal
+{
+
+}
14 years, 9 months
[webbeans-commits] Webbeans SVN: r3471 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition: stereotype and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-08-12 22:36:36 -0400 (Wed, 12 Aug 2009)
New Revision: 3471
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MiniatureShetlandPony.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Clydesdale.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/MiniatureClydesdale.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
Log:
some more section 4.1 tests
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-08-13 02:13:56 UTC (rev 3470)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/BindingDefinitionTest.java 2009-08-13 02:36:36 UTC (rev 3471)
@@ -144,4 +144,14 @@
assert bindings.contains(new HairyBinding(false));
}
+ @Test
+ @SpecAssertion(section = "4.1", id = "aga")
+ public void testBindingNotDeclaredInheritedIsNotIndirectlyInherited()
+ {
+ Set<? extends Annotation> bindings = getBeans(MiniatureShetlandPony.class).iterator().next().getBindings();
+ assert bindings.size() == 2;
+ assert bindings.contains(new CurrentLiteral());
+ assert bindings.contains(new AnyLiteral());
+ }
+
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MiniatureShetlandPony.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MiniatureShetlandPony.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MiniatureShetlandPony.java 2009-08-13 02:36:36 UTC (rev 3471)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.definition.binding;
+
+class MiniatureShetlandPony extends ShetlandPony
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Clydesdale.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Clydesdale.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Clydesdale.java 2009-08-13 02:36:36 UTC (rev 3471)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.definition.stereotype;
+
+class Clydesdale extends Horse
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/MiniatureClydesdale.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/MiniatureClydesdale.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/MiniatureClydesdale.java 2009-08-13 02:36:36 UTC (rev 3471)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.definition.stereotype;
+
+class MiniatureClydesdale extends Clydesdale
+{
+
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-08-13 02:13:56 UTC (rev 3470)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-08-13 02:36:36 UTC (rev 3471)
@@ -97,6 +97,14 @@
}
@Test
+ @SpecAssertion(section = "4.1", id = "aha")
+ public void testStereotypeNotDeclaredInheritedIsNotIndirectlyInherited()
+ {
+ assert getBeans(MiniatureClydesdale.class).size() == 1;
+ assert getBeans(MiniatureClydesdale.class).iterator().next().getScopeType().equals(Dependent.class);
+ }
+
+ @Test
@SpecAssertion(section = "4.1", id = "hhh")
public void testStereotypeScopeIsOverriddenByInheritedScope()
{
14 years, 9 months