[webbeans-commits] Webbeans SVN: r3500 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-14 17:31:24 -0400 (Fri, 14 Aug 2009)
New Revision: 3500
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellowPearTree.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/PearTree.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/PearTreeLocal.java
Log:
Fix test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-08-14 21:21:11 UTC (rev 3499)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-08-14 21:31:24 UTC (rev 3500)
@@ -1,6 +1,9 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise;
+import java.util.Set;
+
import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.Bean;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
@@ -39,8 +42,8 @@
@SpecAssertion(section = "4.2", id = "dj")
public void testNonStaticProducerMethodNotIndirectlyInherited()
{
- assert getBeans(Pear.class, new AnnotationLiteral<Yummy>() {}).size() == 1;
- assert getInstanceByType(Pear.class,new AnnotationLiteral<Yummy>() {}).getColour().equals("green");
+ Set<Bean<Pear>> beans = getBeans(Pear.class, new AnnotationLiteral<Yummy>() {});
+ assert beans.size() == 2;
}
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java 2009-08-14 21:31:24 UTC (rev 3500)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.implementation.producer.method.definition.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.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface LightYellow
+{
+
+}
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellow.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellowPearTree.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellowPearTree.java 2009-08-14 21:21:11 UTC (rev 3499)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/LightYellowPearTree.java 2009-08-14 21:31:24 UTC (rev 3500)
@@ -6,7 +6,7 @@
@Stateful
public class LightYellowPearTree extends YellowPearTree implements LightYellowPearTreeLocal
{
- @Produces @Yummy public Pear producePear()
+ @Produces @Yummy @LightYellow public Pear produceLightYellowPear()
{
return new Pear("lightYellow");
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/PearTree.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/PearTree.java 2009-08-14 21:21:11 UTC (rev 3499)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/PearTree.java 2009-08-14 21:31:24 UTC (rev 3500)
@@ -6,7 +6,7 @@
@Stateful
public class PearTree implements PearTreeLocal
{
- @Produces @Yummy public Pear producePear()
+ @Produces @Yummy public Pear produceLightYellowPear()
{
return new Pear("green");
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/PearTreeLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/PearTreeLocal.java 2009-08-14 21:21:11 UTC (rev 3499)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/PearTreeLocal.java 2009-08-14 21:31:24 UTC (rev 3500)
@@ -5,5 +5,5 @@
@Local
public interface PearTreeLocal
{
- Pear producePear();
+ Pear produceLightYellowPear();
}
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3499 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-14 17:21:11 -0400 (Fri, 14 Aug 2009)
New Revision: 3499
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java
Log:
fix i/c test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java 2009-08-14 21:17:44 UTC (rev 3498)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/Fox.java 2009-08-14 21:21:11 UTC (rev 3499)
@@ -3,7 +3,7 @@
import javax.enterprise.context.Dependent;
@Dependent
-class Fox
+public class Fox
{
public String getName()
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3498 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-14 17:17:44 -0400 (Fri, 14 Aug 2009)
New Revision: 3498
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
Log:
Fix test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-08-14 21:12:44 UTC (rev 3497)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2009-08-14 21:17:44 UTC (rev 3498)
@@ -34,21 +34,21 @@
public class ResolutionByNameTest extends AbstractJSR299Test
{
- @Test(groups = { "resolution" , "ri-broken"})
+ @Test(groups = { "resolution"})
@SpecAssertions({
@SpecAssertion(section = "5.4.1", id = "c"),
@SpecAssertion(section = "11.3.5", id = "aa"),
@SpecAssertion(section = "11.3.5", id = "b")
})
- // WBRI-331
public void testAmbiguousELNamesResolved() throws Exception
{
// Cod, Plaice and AlaskaPlaice are named "whitefish" - Cod is a not-enabled policy, AlaskaPlaice specializes Plaice
Set<Bean<?>> beans = getCurrentManager().getBeans("whitefish");
- assert getCurrentManager().getBeans("whitefish").size() == 1;
- assert getCurrentManager().getBeans("whitefish").iterator().next().getTypes().contains(AlaskaPlaice.class);
+ assert beans.size() == 2;
+ assert getCurrentManager().resolve(beans).getTypes().contains(AlaskaPlaice.class);
// Both Salmon and Sole are named "fish" - Sole is an enabled policy
- assert getCurrentManager().getBeans("fish").size() == 1;
- assert getCurrentManager().getBeans("fish").iterator().next().getTypes().contains(Sole.class);
+ beans = getCurrentManager().getBeans("fish");
+ assert beans.size() == 2;
+ assert getCurrentManager().resolve(beans).getTypes().contains(Sole.class);
}
}
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3497 - ri/trunk/impl/src/main/java/org/jboss/webbeans/util and 7 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-14 17:12:44 -0400 (Fri, 14 Aug 2009)
New Revision: 3497
Added:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/beans.xml
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DisabledBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/TuneSelect.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
Fix a couple of tests
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-08-14 20:40:38 UTC (rev 3496)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-08-14 21:12:44 UTC (rev 3497)
@@ -875,7 +875,7 @@
public Object getReference(Bean<?> bean, Type beanType, CreationalContext<?> creationalContext)
{
- if (!Beans.isTypePresent(bean, beanType))
+ if (!Reflections.isAssignableFrom(bean.getTypes(), beanType))
{
throw new IllegalArgumentException("The given beanType is not a type " + beanType +" of the bean " + bean );
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java 2009-08-14 20:40:38 UTC (rev 3496)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Beans.java 2009-08-14 21:12:44 UTC (rev 3497)
@@ -17,7 +17,6 @@
package org.jboss.webbeans.util;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
import java.util.Collection;
import java.util.HashSet;
import java.util.Map;
@@ -336,19 +335,6 @@
return false;
}
- public static boolean isTypePresent(Bean<?> bean, Type type)
- {
- type = Types.boxedType(type);
- for (Type beanType : bean.getTypes())
- {
- if (Types.boxedType(beanType).equals(type))
- {
- return true;
- }
- }
- return false;
- }
-
/**
* Check if any of the beans is a policy
*
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-08-14 20:40:38 UTC (rev 3496)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-08-14 21:12:44 UTC (rev 3497)
@@ -1,8 +1,8 @@
package org.jboss.jsr299.tck.tests.context.application.ejb;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
@@ -20,7 +20,7 @@
@SpecVersion("20090625")
public class EJBApplicationContextTest extends AbstractJSR299Test
{
- @Test(groups = { "broken", "contexts", "webservice", "integration" })
+ @Test(groups = { "broken", "contexts", "webservice", "integration", "jboss-as-broken" })
@SpecAssertion(section = "6.7.3", id = "b")
public void testApplicationScopeActiveDuringWebServiceInvocation()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-08-14 20:40:38 UTC (rev 3496)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-08-14 21:12:44 UTC (rev 3497)
@@ -22,6 +22,7 @@
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
/**
@@ -33,6 +34,7 @@
// TODO Add extension stuff
@Test
@SpecVersion("20090625")
+@BeansXml("beans.xml")
public class DeploymentTest extends AbstractJSR299Test
{
@Test(groups="rewrite")
@@ -58,7 +60,7 @@
assert ManagerObserver.isRequestContextActive();
}
- @Test(groups = { "broken", "rewrite" })
+ @Test(groups = {})
@SpecAssertions({
@SpecAssertion(section = "11.1", id = "f")
})
@@ -67,8 +69,6 @@
assert !getBeans(User.class).isEmpty();
assert getBeans(DataAccessAuthorizationDecorator.class).isEmpty();
assert getBeans(Interceptor1.class).isEmpty();
-
- // I have no idea how this bean is supposed to be disabled PLM
assert getBeans(DisabledBean.class).isEmpty();
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DisabledBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DisabledBean.java 2009-08-14 20:40:38 UTC (rev 3496)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DisabledBean.java 2009-08-14 21:12:44 UTC (rev 3497)
@@ -1,5 +1,8 @@
package org.jboss.jsr299.tck.tests.deployment.lifecycle;
+import javax.enterprise.inject.Policy;
+
+@Policy
class DisabledBean
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java 2009-08-14 20:40:38 UTC (rev 3496)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java 2009-08-14 21:12:44 UTC (rev 3497)
@@ -35,7 +35,7 @@
@SpecVersion("20090625")
public class UseBeforeValidationTest extends AbstractJSR299Test
{
- @Test(groups = {"ri-broken", "broken"})
+ @Test(groups = {"ri-broken", "rewrite"})
//Still not clear how the container should now allow this, but the RI is clearly not implementing this assertion
// TODO Needs Extension stuff adding
// WBRI-300
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-08-14 20:40:38 UTC (rev 3496)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-08-14 21:12:44 UTC (rev 3497)
@@ -75,15 +75,6 @@
assert Shop.deliveryObservedBy.equals(FarmShop.class.getName());
}
- @Test(groups = { "events", "broken" })
- @SpecAssertion(section = "10.5", id = "ca")
- public void testAsynchronousObserverThrowsExceptionIsLogged() throws InterruptedException
- {
- getCurrentManager().fireEvent('a');
- Thread.sleep(200);
- //TODO How can we assert that the exception was logged?
- }
-
@Test(groups = { "events" }, expectedExceptions = IllegalArgumentException.class)
@SpecAssertion(section = "11.3.11", id = "c")
public <T> void testEventObjectContainsTypeVariablesWhenResolvingFails()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java 2009-08-14 20:40:38 UTC (rev 3496)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java 2009-08-14 21:12:44 UTC (rev 3497)
@@ -1,9 +1,11 @@
package org.jboss.jsr299.tck.tests.event.eventTypes;
+import javax.enterprise.inject.TypeLiteral;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
@@ -58,17 +60,15 @@
assert observer.getTotalEventsObserved() == 4;
}
- @Test(groups = { "event", "broken", "rewrite" }, expectedExceptions = IllegalArgumentException.class)
+ @Test(groups = { "event" }, expectedExceptions=IllegalArgumentException.class)
@SpecAssertion(section = "10.1", id = "cb")
- //TODO There is still no type variable involved in this test nor is there a way to write this in Java
- public void testEventTypeFiredByEventInterfaceMayNotContainTypeVariable()
+ public <T> void testEventTypeFiredByEventInterfaceMayNotContainTypeVariable()
{
- getInstanceByType(TuneSelect.class).soloArtistPlaying(new Artist<Solo>());
+ getInstanceByType(new TypeLiteral<TuneSelect<T>>(){}).soloArtistPlaying(new Artist<T>());
}
- @Test(groups = { "event", "rewrite", "broken" }, expectedExceptions = IllegalArgumentException.class)
+ @Test(groups = { "event"}, expectedExceptions = IllegalArgumentException.class)
@SpecAssertion(section = "10.1", id = "cb")
- //TODO There is still no type variable involved in this test nor is there a way to write this in Java
public void testEventTypeFiredByBeanManagerMayNotContainTypeVariable()
{
getCurrentManager().fireEvent(new Artist<Solo>());
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/TuneSelect.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/TuneSelect.java 2009-08-14 20:40:38 UTC (rev 3496)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/TuneSelect.java 2009-08-14 21:12:44 UTC (rev 3497)
@@ -3,9 +3,9 @@
import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
-class TuneSelect
+class TuneSelect<T>
{
- @Any Event<Artist<Solo>> soloArtistEvent;
+ @Any Event<Artist<T>> soloArtistEvent;
@Any Event<Song> songEvent;
@@ -21,7 +21,7 @@
broadcastEvent.fire(b);
}
- public void soloArtistPlaying(Artist<Solo> soloArtist)
+ public void soloArtistPlaying(Artist<T> soloArtist)
{
soloArtistEvent.fire(soloArtist);
}
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/beans.xml 2009-08-14 21:12:44 UTC (rev 3497)
@@ -0,0 +1,3 @@
+<beans>
+
+</beans>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/deployment/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-14 20:40:38 UTC (rev 3496)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-14 21:12:44 UTC (rev 3497)
@@ -4251,8 +4251,9 @@
<text>Any observer method called before completion of a transaction may call |setRollbackOnly()| to force a transaction rollback. An observer method may not directly initiate, commit or rollback JTA transactions.</text>
</assertion>
- <assertion id="ca">
+ <assertion id="ca" testable="false">
<text>Observers may throw exceptions. If an observer method is a transactional observer method, any exception is caught and logged by the container.</text>
+ <note>We can't verify what is logged</note>
</assertion>
<assertion id="cb">
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3496 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating and 28 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-14 16:40:38 -0400 (Fri, 14 Aug 2009)
New Revision: 3496
Removed:
ri/trunk/api/src/main/resources/web-beans.xsd
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java
tck/trunk/impl/src/main/resources/META-INF/test-unit.properties
tck/trunk/impl/src/main/resources/tck-audit.xml
tck/trunk/impl/src/main/resources/tck-tests.xml
Log:
Clean up tests marked for review, merge review and rewrite (too much detail), enable rewrite tests, change incontainer-ri-broken -> jboss-as-broken (more descriptive), verify all ri-broken tests have a linked WBRI
Deleted: ri/trunk/api/src/main/resources/web-beans.xsd
===================================================================
--- ri/trunk/api/src/main/resources/web-beans.xsd 2009-08-14 16:45:22 UTC (rev 3495)
+++ ri/trunk/api/src/main/resources/web-beans.xsd 2009-08-14 20:40:38 UTC (rev 3496)
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-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.
--->
-
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- targetNamespace="http://seamframework.org/WebBeans"
- xmlns:web-beans="http://seamframework.org/WebBeans">
-
- <xs:element name="web-beans">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="web-beans:component" />
- <xs:element ref="web-beans:deploy"/>
- <xs:element ref="web-beans:interceptor" />
- <xs:element ref="web-beans:interceptors" />
- <xs:element ref="web-beans:decorators" />
- <xs:element ref="web-beans:ejb-lookup" />
- </xs:choice>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="component">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="web-beans:class" />
- <xs:element ref="web-beans:deployment" />
- <xs:element ref="web-beans:binding" />
- <xs:element ref="web-beans:scope" />
- <xs:element ref="web-beans:named" />
- <xs:element ref="web-beans:stereotype" maxOccurs="unbounded"/>
- <xs:element ref="web-beans:producer-method" />
- <xs:element ref="web-beans:producer-type" />
- <xs:element ref="web-beans:remote" />
- <xs:element ref="web-beans:bound-to" />
- <xs:element ref="web-beans:topic" />
- <xs:element ref="web-beans:interceptor-binding" />
- </xs:choice>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="deploy">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="web-beans:deployment-type" />
- </xs:choice>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="interceptor">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="web-beans:class" />
- <xs:element ref="web-beans:binding" />
- </xs:choice>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="interceptors">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="interceptor" type="xs:string" />
- </xs:choice>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="decorators">
- <xs:complexType>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="decorator"/>
- </xs:choice>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="class" type="xs:string" />
-
- <xs:element name="deployment" type="xs:string" />
-
- <xs:element name="binding" type="xs:string" />
-
- <xs:element name="scope" type="xs:string" />
-
- <xs:element name="named" type="xs:string" />
-
- <xs:element name="stereotype" type="xs:string" />
-
- <xs:element name="producer-method" type="xs:string" />
-
- <xs:element name="producer-type" type="xs:string" />
-
- <xs:element name="deployment-type" type="xs:string" />
-
- <xs:element name="remote" type="xs:string" />
-
- <xs:element name="bound-to" type="xs:string" />
-
- <xs:element name="topic" type="xs:string" />
-
- <xs:element name="interceptor-binding" type="xs:string" />
-
- <xs:element name="decorator" type="xs:string" />
-
- <xs:element name="ejb-lookup" type="xs:string" />
-
-</xs:schema>
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -31,7 +31,7 @@
public class PassivatingContextTest extends AbstractJSR299Test
{
- @Test(groups = { "contexts", "passivation", "review" })
+ @Test(groups = { "contexts", "passivation", "rewrite" })
@SpecAssertion(section = "6.6.1", id = "ba")
public void testManagedBeanWithSerializableImplementationClassOK()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptor/EnterpriseBeanWithNonPassivatingBeanConstructorParameterInInterceptorTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -18,6 +18,7 @@
{
@Test(groups = { "contexts", "passivation", "ri-broken" })
@SpecAssertion(section = "6.6.4", id = "bdb")
+ // WBRI-361
public void testSessionBeanWithNonPassivatingBeanConstructorParamInInterceptorFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerInDecorator/EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -18,7 +18,7 @@
@BeansXml("beans.xml")
public class EnterpriseBeanWithNonPassivatingInitializerInDecoratorTest extends AbstractJSR299Test
{
- @Test(groups = { "contexts", "passivation", "ri-broken" })
+ @Test(groups = { "contexts", "passivation" })
@SpecAssertion(section = "6.6.4", id = "bdf")
public void testSessionBeanWithNonPassivatingInitializerFieldInDecoratorFails()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInitializerParameterInInterceptor/EnterpriseBeanWithNonPassivatingInitializerParameterInInterceptorTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -18,6 +18,7 @@
{
@Test(groups = { "contexts", "passivation", "ri-broken" })
@SpecAssertion(section = "6.6.4", id = "bdc")
+ //WBRI-361
public void testSessionBeanWithNonPassivatingInitializerParamInInterceptorFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/enterpriseBeanWithNonPassivatingInjectedFieldInInterceptor/EnterpriseBeanWithNonPassivatingInjectedFieldInInterceptorTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -18,6 +18,7 @@
{
@Test(groups = { "contexts", "passivation", "ri-broken"})
@SpecAssertion(section = "6.6.4", id = "bda")
+ // WBRI-361
public void testSessionBeanWithNonPassivatingInjectedFieldInInterceptorFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -15,6 +15,7 @@
{
@Test(groups = { "contexts", "passivation", "ri-broken" })
@SpecAssertion(section = "6.6.4", id = "aad")
+ // WBRI-361
public void testPassivationCapableBeanWithNonPassivatingInterceptorFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/interceptorWithNonPassivatingInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -15,6 +15,7 @@
{
@Test(groups = { "contexts", "passivation", "ri-broken" })
@SpecAssertion(section = "6.6.4", id = "aae")
+ // WBRI-361
public void testPassivationCapableBeanWithNonPassivatingInterceptorFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/managedBeanWithNonSerializableInterceptorClass/ManagedBeanWithNonSerializableInterceptorClassTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -15,6 +15,7 @@
{
@Test(groups = { "contexts", "passivation", "ri-broken"})
@SpecAssertion(section = "6.6.1", id = "bb")
+ // WBRI-361
public void testManagedBeanWithNonSerializableInterceptorClassNotOK()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/RequestContextTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -53,7 +53,7 @@
* The request context is destroyed at the end of the servlet request, after
* the Servlet service() method returns.
*/
- @Test(groups = { "contexts", "servlet", "integration", "review" })
+ @Test(groups = { "contexts", "servlet", "integration", "rewrite" })
@SpecAssertion(section="6.7.1", id="baa")
// TODO Need to tidy this one up, make it actually check that the context is active til after the service method ends
public void testRequestScopeIsDestroyedAfterServletRequest() throws Exception
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -28,7 +28,7 @@
@SpecVersion("20090625")
public class AddDefinitionErrorTest extends AbstractJSR299Test
{
- @Test(groups="incontainer-ri-broken")
+ @Test(groups="jboss-as-broken")
// WBRI-312
@SpecAssertion(section = "11.5.2", id = "ca")
public void testObserverDefinitionErrorTreatedAsDefinitionError()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -38,7 +38,7 @@
@SpecVersion("20090625")
public class AddDeploymentProblemTest extends AbstractJSR299Test
{
- @Test(groups={"rewrite", "incontainer-ri-broken"})
+ @Test(groups={"rewrite", "jboss-as-broken"})
// TODO Needs Extension stuff adding
// WBRI-312
@SpecAssertion(section = "11.5.3", id = "b")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/beanDiscoveryMethodThrowsException/BeforeBeanDiscoveryThrowsExceptionTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -40,7 +40,7 @@
public class BeforeBeanDiscoveryThrowsExceptionTest extends AbstractJSR299Test
{
- @Test(groups="incontainer-ri-broken")
+ @Test(groups="jboss-as-broken")
// WBRI-312
@SpecAssertion(section="11.5.1", id="ag")
public void testThrowsException()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -20,7 +20,7 @@
@SpecVersion("20090625")
public class AfterBeanDiscoveryObserverExecutionFailureTest extends AbstractJSR299Test
{
- @Test(groups={"incontainer-ri-broken", "rewrite"})
+ @Test(groups={"jboss-as-broken", "rewrite"})
//TODO Needs Extension stuff adding
// WBRI-312
@SpecAssertion(section = "11.5.2", id = "g")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -37,7 +37,7 @@
@SpecVersion("20090625")
public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test
{
- @Test(groups={"incontainer-ri-broken", "rewrite"})
+ @Test(groups={"jboss-as-broken", "rewrite"})
// TODO Needs Extension stuff adding
// WBRI-312
@SpecAssertion(section = "11.5.3", id = "c")
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/failsDuringValidation/AfterBeanDiscoveryFailureTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -48,6 +48,7 @@
@SpecAssertion(section = "12.2", id = "e"),
@SpecAssertion(section = "12.2", id = "f")
})
+ // WBRI-312
public void testDeploymentFailsDuringValidation()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -37,19 +37,6 @@
getCurrentManager().fireEvent("validate injected parameters");
}
- @Test(groups = { "events" })
- @SpecAssertions({
- @SpecAssertion(section = "10.5", id = "review"), // was b
- @SpecAssertion(section = "10.5", id = "review") // was h
- })
- public void testObserverMethodCalledImmediately()
- {
- StaticObserver.reset();
- getCurrentManager().fireEvent(new Delivery());
- assert StaticObserver.isDeliveryReceived() && StaticObserver.getThreadObservingEvent().equals(Thread.currentThread());
- StaticObserver.reset();
- }
-
/**
* FIXME the spec doesn't follow this exactly because technically it isn't supposed to use
* the bean resolution alorithm to obtain the instance, which it does.
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/eventTypes/EventTypesTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -58,7 +58,7 @@
assert observer.getTotalEventsObserved() == 4;
}
- @Test(groups = { "event", "broken", "review" }, expectedExceptions = IllegalArgumentException.class)
+ @Test(groups = { "event", "broken", "rewrite" }, expectedExceptions = IllegalArgumentException.class)
@SpecAssertion(section = "10.1", id = "cb")
//TODO There is still no type variable involved in this test nor is there a way to write this in Java
public void testEventTypeFiredByEventInterfaceMayNotContainTypeVariable()
@@ -66,7 +66,7 @@
getInstanceByType(TuneSelect.class).soloArtistPlaying(new Artist<Solo>());
}
- @Test(groups = { "event", "review", "broken" }, expectedExceptions = IllegalArgumentException.class)
+ @Test(groups = { "event", "rewrite", "broken" }, expectedExceptions = IllegalArgumentException.class)
@SpecAssertion(section = "10.1", id = "cb")
//TODO There is still no type variable involved in this test nor is there a way to write this in Java
public void testEventTypeFiredByBeanManagerMayNotContainTypeVariable()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -23,10 +23,10 @@
import javax.ejb.EJBException;
import javax.enterprise.inject.AnnotationLiteral;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
@@ -138,19 +138,6 @@
// assert dog.isCorrectContext();
}
- @Test(groups = { "events", "ri-broken" })
- @SpecAssertion(section = "review", id = "review") // the spec now only mentions asynchronous observer methods in passing
- // WBRI-303
- public void testAsynchronousObserverAlsoTransactional() throws InterruptedException
- {
- dog.setCorrectContext(false);
- dog.setCorrectTransactionState(false);
- Agent dogAgent = getInstanceByType(Agent.class);
- dogAgent.sendInTransaction('a');
- Thread.sleep(200);
- assert dog.isCorrectTransactionState();
- }
-
@Test(groups = { "events", "integration" })
@SpecAssertion(section = "10.5", id = "bd")
public void testObserverCanSetRollbackOnlyOnTransaction()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -103,6 +103,7 @@
@Test(groups = "ri-broken")
@SpecAssertion(section = "11.3.14", id = "aa")
+ // WBRI-363
public void testDetermineBindingType()
{
assert getCurrentManager().isBindingType(Tame.class);
@@ -110,6 +111,7 @@
@Test(groups = "ri-broken")
@SpecAssertion(section = "11.3.14", id = "ab")
+ // WBRI-363
public void testDetermineScopeType()
{
assert getCurrentManager().isScopeType(ApplicationScoped.class);
@@ -117,12 +119,14 @@
@Test(groups = "ri-broken")
@SpecAssertion(section = "11.3.14", id = "ac")
+ // WBRI-363
public void testDetermineStereotype()
{
assert getCurrentManager().isBindingType(AnimalStereotype.class);
}
@Test(groups = "ri-broken")
+ // WBRI-363
@SpecAssertion(section = "11.3.14", id = "ad")
public void testDetermineInterceptorBindingType()
{
@@ -131,6 +135,7 @@
@Test(groups = "ri-broken")
@SpecAssertion(section = "11.3.14", id = "ae")
+ // WBRI-364
public void testGetMetaAnnotationsForStereotype()
{
Set<Annotation> stereotypeAnnotations = getCurrentManager().getStereotypeDefinition(AnimalStereotype.class);
@@ -144,6 +149,7 @@
@Test(groups = "ri-broken")
@SpecAssertion(section = "11.3.14", id = "af")
+ // WBRI-364
public void testGetMetaAnnotationsForInterceptorBindingType()
{
Set<Annotation> metaAnnotations = getCurrentManager().getInterceptorBindingTypeDefinition(Transactional.class);
@@ -156,6 +162,7 @@
@Test(groups = "ri-broken")
@SpecAssertion(section = "11.3.14", id = "ag")
+ // WBRI-364
public void testGetScopeType()
{
ScopeType scopeType = getCurrentManager().getScopeDefinition(RequestScoped.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -30,6 +30,7 @@
// Must be an integration test as it needs a resource copied to a folder
@IntegrationTest
@SpecVersion("20090625")
+// TODO All tests fall under WBRI-345 for now, please create new issues for any failing tests after WBRI-345 is done
public class ProducerTest extends AbstractJSR299Test
{
@Test(groups = "ri-broken")
@@ -131,7 +132,7 @@
{
PreferredDogProducer.setNoisyDogProducerCalled(false);
Producer<Dog> producer = ProducerProcessor.getNoisyDogProducer();
- Dog dog = (Dog) producer.produce(new CreationalContextImpl<Dog>());
+ Dog dog = producer.produce(new CreationalContextImpl<Dog>());
assert PreferredDogProducer.isNoisyDogProducerCalled();
assert dog.getColor().equals(PreferredDogProducer.DOG_COLOR);
}
@@ -147,7 +148,7 @@
public void testProduceAccessesProducerField()
{
Producer<Dog> producer = ProducerProcessor.getQuietDogProducer();
- Dog dog = (Dog) producer.produce(new CreationalContextImpl<Dog>());
+ Dog dog = producer.produce(new CreationalContextImpl<Dog>());
assert dog.getColor().equals(PreferredDogProducer.DOG_COLOR);
}
@@ -159,7 +160,7 @@
{
PreferredDogProducer.setNoisyDogDisposed(false);
Producer<Dog> producer = ProducerProcessor.getNoisyDogProducer();
- Dog dog = (Dog) producer.produce(new CreationalContextImpl<Dog>());
+ Dog dog = producer.produce(new CreationalContextImpl<Dog>());
producer.dispose(dog);
assert PreferredDogProducer.isNoisyDogDisposed();
}
@@ -172,7 +173,7 @@
{
PreferredDogProducer.setQuietDogDisposed(false);
Producer<Dog> producer = ProducerProcessor.getQuietDogProducer();
- Dog dog = (Dog) producer.produce(new CreationalContextImpl<Dog>());
+ Dog dog = producer.produce(new CreationalContextImpl<Dog>());
producer.dispose(dog);
assert PreferredDogProducer.isQuietDogDisposed();
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/broken/injectionTargetError/InjectionTargetDefinitionErrorTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -33,6 +33,7 @@
@SpecAssertions({
@SpecAssertion(section = "11.5.6", id = "da")
})
+ // WBRII-345
public void testAddingDefinitionError()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -62,7 +62,7 @@
// Marked as review because I think the EJB proxy should have the AnotherInterface interface
// also, need to verify that the instance is passivation capable
- @Test(groups = { "beanLifecycle", "commonsAnnotations", "integration", "review" })
+ @Test(groups = { "beanLifecycle", "commonsAnnotations", "integration", "rewrite" })
@SpecAssertions({
@SpecAssertion(section = "7.3.6", id = "l"),
@SpecAssertion(section = "7.3.6", id = "m"),
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -16,11 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.lookup.injection.enterprise;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.tests.lookup.injection.DeluxeHenHouse;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
@@ -52,7 +51,7 @@
assert getInstanceByType(InjectedSessionBeanLocal.class).getFarm().isInjectionPerformedCorrectly();
}
- @Test(groups = "ri-broken")
+ @Test(groups = "jboss-as-broken")
@SpecAssertion(section = "5.6", id = "e")
//JBAS-7046
public void testInjectionOnEJBInterceptor()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -16,10 +16,10 @@
*/
package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Resource;
@@ -41,7 +41,7 @@
@SpecVersion("20090625")
public class InjectionIntoNonContextualComponentTest extends AbstractJSR299Test
{
- @Test(groups = "ri-broken")
+ @Test(groups = "jboss-as-broken")
@SpecAssertions( {
@SpecAssertion(section = "5.6", id = "e"),
@SpecAssertion(section = "5.6.4", id = "a") })
@@ -53,7 +53,7 @@
webClient.getPage(getContextPath() + "Test/Servlet");
}
- @Test(groups = "ri-broken")
+ @Test(groups = "jboss-as-broken")
@SpecAssertions( {
@SpecAssertion(section = "5.6", id = "e"),
@SpecAssertion(section = "5.6.4", id = "a") })
@@ -65,7 +65,7 @@
webClient.getPage(getContextPath() + "TestFilter");
}
- @Test(groups = "ri-broken")
+ @Test(groups = "jboss-as-broken")
@SpecAssertion(section = "5.6", id = "e")
//JBAS-7046
public void testInjectionIntoServletListener() throws Exception
@@ -75,7 +75,7 @@
webClient.getPage(getContextPath() + "Test/ServletListener");
}
- @Test(groups = "ri-broken")
+ @Test(groups = "jboss-as-broken")
@SpecAssertion(section = "5.6", id = "e")
//JBAS-7046
public void testInjectionIntoTagHandler() throws Exception
@@ -87,7 +87,7 @@
assert response.getContentAsString().contains(TestTagHandler.SUCCESS);
}
- @Test(groups = "ri-broken")
+ @Test(groups = "jboss-as-broken")
@SpecAssertion(section = "5.6", id = "e")
//JBAS-7046
public void testInjectionIntoTagLibraryListener() throws Exception
@@ -97,7 +97,7 @@
webClient.getPage(getContextPath() + "Test/TagLibraryListener");
}
- @Test(groups = "ri-broken")
+ @Test(groups = "jboss-as-broken")
@SpecAssertion(section = "5.6", id = "d")
//JBAS-7046
public void testInjectionIntoJSFManagedBean() throws Exception
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2009-08-14 20:40:38 UTC (rev 3496)
@@ -18,9 +18,9 @@
import javax.xml.ws.WebServiceRef;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.Resource;
@@ -36,8 +36,9 @@
@WebServiceRef(wsdlLocation = "http://localhost:8080/org.jboss.jsr299.tck.tests.lookup.injection.non.con...")
SheepWSEndPointService service;
- @Test(groups = "ri-broken")
+ @Test(groups = "jboss-as-broken")
@SpecAssertion(section = "5.6", id = "e")
+ // JBAS-7046
public void testInjectionIntoWebServiceEndpoint() throws Exception
{
service = new SheepWSEndPointService();
Modified: tck/trunk/impl/src/main/resources/META-INF/test-unit.properties
===================================================================
--- tck/trunk/impl/src/main/resources/META-INF/test-unit.properties 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/resources/META-INF/test-unit.properties 2009-08-14 20:40:38 UTC (rev 3496)
@@ -14,4 +14,4 @@
unimplemented_test_groups=stub,broken
# A comma-separated list of TestNG test groups that are summarised at the end of the report
-summary_test_groups=ri-broken,review,rewrite
+summary_test_groups=ri-broken,rewrite,jboss-as-broken, broken
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-14 20:40:38 UTC (rev 3496)
@@ -3598,8 +3598,9 @@
</section>
<section id="8" title="Decorators">
- <assertion id="a">
+ <assertion id="a" testable="false">
<text>Decorators may be bound to any managed bean that is not itself an interceptor or decorator or to any EJB session or message-driven bean.</text>
+ <note>Doesn't specify an error</note>
</assertion>
</section>
Modified: tck/trunk/impl/src/main/resources/tck-tests.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-tests.xml 2009-08-14 16:45:22 UTC (rev 3495)
+++ tck/trunk/impl/src/main/resources/tck-tests.xml 2009-08-14 20:40:38 UTC (rev 3496)
@@ -12,12 +12,9 @@
</method-selectors>
<groups>
<run>
- <exclude name="stub" />
<exclude name="ri-broken" />
- <exclude name="underInvestigation" />
- <exclude name="broken" />
- <exclude name="rewrite" />
- <exclude name="deployment" />
+ <exclude name="jboss-as-broken" />
+ <exclude name="broken" />
</run>
</groups>
<packages>
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3495 - ri/trunk/api/src/main/resources.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-14 12:45:22 -0400 (Fri, 14 Aug 2009)
New Revision: 3495
Modified:
ri/trunk/api/src/main/resources/beans.xsd
Log:
add version
Modified: ri/trunk/api/src/main/resources/beans.xsd
===================================================================
--- ri/trunk/api/src/main/resources/beans.xsd 2009-08-14 16:44:39 UTC (rev 3494)
+++ ri/trunk/api/src/main/resources/beans.xsd 2009-08-14 16:45:22 UTC (rev 3495)
@@ -20,7 +20,8 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
targetNamespace="http://seamframework.org/ns/CDI"
- xmlns:cdi="http://seamframework.org/ns/CDI">
+ xmlns:cdi="http://seamframework.org/ns/CDI"
+ version="1.0">
<xs:element name="beans">
<xs:complexType>
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3494 - ri/trunk/api/src/main/resources.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-14 12:44:39 -0400 (Fri, 14 Aug 2009)
New Revision: 3494
Added:
ri/trunk/api/src/main/resources/beans.xsd
Log:
fix xsd
Copied: ri/trunk/api/src/main/resources/beans.xsd (from rev 3426, ri/trunk/api/src/main/resources/web-beans.xsd)
===================================================================
--- ri/trunk/api/src/main/resources/beans.xsd (rev 0)
+++ ri/trunk/api/src/main/resources/beans.xsd 2009-08-14 16:44:39 UTC (rev 3494)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ targetNamespace="http://seamframework.org/ns/CDI"
+ xmlns:cdi="http://seamframework.org/ns/CDI">
+
+ <xs:element name="beans">
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="cdi:policies"/>
+ <xs:element ref="cdi:interceptors" />
+ <xs:element ref="cdi:decorators" />
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="policies">
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="cdi:class" />
+ <xs:element ref="cdi:annotation" />
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="interceptors">
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="cdi:class" />
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="decorators">
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="cdi:class"/>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="class" type="xs:string" />
+
+ <xs:element name="annotation" type="xs:string" />
+
+</xs:schema>
\ No newline at end of file
Property changes on: ri/trunk/api/src/main/resources/beans.xsd
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3493 - ri/trunk/impl/src/main/java/org/jboss/webbeans/util and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-14 12:25:19 -0400 (Fri, 14 Aug 2009)
New Revision: 3493
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObjectList.java
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java
Log:
WBRI-302
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-08-14 15:12:29 UTC (rev 3492)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-08-14 16:25:19 UTC (rev 3493)
@@ -572,27 +572,28 @@
private void checkEventType(Type eventType)
{
Type[] types;
- if (eventType instanceof Class)
+ Type resolvedType = new Reflections.HierarchyDiscovery(eventType).getResolvedType();
+ if (resolvedType instanceof Class)
{
- types = Reflections.getActualTypeArguments((Class<?>) eventType);
+ types = new Type[0];
}
- else if (eventType instanceof ParameterizedType)
+ else if (resolvedType instanceof ParameterizedType)
{
- types = ((ParameterizedType) eventType).getActualTypeArguments();
+ types = ((ParameterizedType) resolvedType).getActualTypeArguments();
}
else
{
- throw new IllegalArgumentException("Event type " + eventType + " isn't a concrete type");
+ throw new IllegalArgumentException("Event type " + resolvedType + " is not allowed");
}
for (Type type : types)
{
if (type instanceof WildcardType)
{
- throw new IllegalArgumentException("Cannot provide an event type parameterized with a wildcard " + eventType);
+ throw new IllegalArgumentException("Cannot provide an event type parameterized with a wildcard " + resolvedType);
}
if (type instanceof TypeVariable)
{
- throw new IllegalArgumentException("Cannot provide an event type parameterized with a type parameter " + eventType);
+ throw new IllegalArgumentException("Cannot provide an event type parameterized with a type parameter " + resolvedType);
}
}
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-08-14 15:12:29 UTC (rev 3492)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-08-14 16:25:19 UTC (rev 3493)
@@ -79,7 +79,12 @@
public Type getResolvedType()
{
- return resolveType(type, type);
+ if (type instanceof Class)
+ {
+ Class<?> clazz = (Class<?>) type;
+ return resolveType(clazz);
+ }
+ return type;
}
private void discoverTypes(Type type)
@@ -89,16 +94,7 @@
if (type instanceof Class)
{
Class<?> clazz = (Class<?>) type;
- if (clazz.getTypeParameters().length > 0)
- {
- TypeVariable[] actualTypeParameters = clazz.getTypeParameters();
- ParameterizedType parameterizedType = new ParameterizedTypeImpl(clazz, actualTypeParameters, clazz.getDeclaringClass());
- add(parameterizedType);
- }
- else
- {
- add(clazz);
- }
+ add(resolveType(clazz));
discoverFromClass(clazz);
}
else
@@ -116,6 +112,20 @@
}
}
+ private Type resolveType(Class<?> clazz)
+ {
+ if (clazz.getTypeParameters().length > 0)
+ {
+ TypeVariable<?>[] actualTypeParameters = clazz.getTypeParameters();
+ ParameterizedType parameterizedType = new ParameterizedTypeImpl(clazz, actualTypeParameters, clazz.getDeclaringClass());
+ return parameterizedType;
+ }
+ else
+ {
+ return clazz;
+ }
+ }
+
@SuppressWarnings("unchecked")
private void discoverFromClass(Class<?> clazz)
{
@@ -376,13 +386,14 @@
*/
public static Type[] getActualTypeArguments(Class<?> clazz)
{
- if (clazz.getGenericSuperclass() instanceof ParameterizedType)
+ Type type = new HierarchyDiscovery(clazz).getResolvedType();
+ if (type instanceof ParameterizedType)
{
- return ((ParameterizedType) clazz.getGenericSuperclass()).getActualTypeArguments();
+ return ((ParameterizedType) type).getActualTypeArguments();
}
else
{
- return new Type[0];
+ return EMPTY_TYPES;
}
}
@@ -670,7 +681,7 @@
if (type1 instanceof Class)
{
Class<?> clazz = (Class<?>) type1;
- if (isAssignableFrom(clazz, new Type[0], type2))
+ if (isAssignableFrom(clazz, EMPTY_TYPES, type2))
{
return true;
}
@@ -756,7 +767,7 @@
else if (type2 instanceof Class)
{
Class<?> clazz = (Class<?>) type2;
- if (isAssignableFrom(rawType1, actualTypeArguments1, clazz, new Type[0]))
+ if (isAssignableFrom(rawType1, actualTypeArguments1, clazz, EMPTY_TYPES))
{
return true;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-08-14 15:12:29 UTC (rev 3492)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-08-14 16:25:19 UTC (rev 3493)
@@ -97,26 +97,11 @@
//TODO How can we assert that the exception was logged?
}
-
- @Test(groups = { "events", "underInvestigation" })
- @SpecAssertion(section = "11.2.7", id = "review") // removed from spec?
- public void testObserverMethodCallsManagerAddObserverWithObserverObject()
- {
- assert false;
- }
-
- @Test(groups = { "events", "underInvestigation" })
- @SpecAssertion(section = "10.4.1", id = "review") // removed from spec?
- public void testObserverMethodCallsManagerAddObserverWithAllBindingAnnotationsExceptFires()
- {
- assert false;
- }
-
@Test(groups = { "events" }, expectedExceptions = IllegalArgumentException.class)
@SpecAssertion(section = "11.3.11", id = "c")
- public void testEventObjectContainsTypeVariablesWhenResolvingFails()
+ public <T> void testEventObjectContainsTypeVariablesWhenResolvingFails()
{
- eventObjectContainsTypeVariables(new ArrayList<String>());
+ eventObjectContainsTypeVariables(new ArrayList<T>());
}
private <E> void eventObjectContainsTypeVariables(ArrayList<E> eventToFire)
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObjectList.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObjectList.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObjectList.java 2009-08-14 16:25:19 UTC (rev 3493)
@@ -0,0 +1,28 @@
+/*
+ * 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.jsr299.tck.tests.event.observer.wildcardAndTypeVariable;
+
+import java.util.ArrayList;
+
+/**
+ * @author pmuir
+ *
+ */
+public class ObjectList extends ArrayList<Object>
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObjectList.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java 2009-08-14 15:12:29 UTC (rev 3492)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java 2009-08-14 16:25:19 UTC (rev 3493)
@@ -19,12 +19,11 @@
-import java.util.ArrayList;
import java.util.List;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
@@ -39,9 +38,8 @@
@SpecVersion("20090625")
public class ObserverMethodWithParametertizedTypeTest extends AbstractJSR299Test
{
- @Test(groups = { "events", "ri-broken"})
+ @Test(groups = { "events"})
@SpecAssertion(section = "10.4.1", id = "cb")
- // WBRI-302
public void testObserverMethodCanObserveTypeVariable()
{
BostonTerrier.observed = false;
@@ -50,14 +48,13 @@
assert BostonTerrier.observed;
}
- @Test(groups = { "events", "ri-broken" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "10.4.1", id = "ca")
- // WBRI-302
public void testObserverMethodCanObserveWildcardType()
{
WildBostonTerrier.observed = false;
// TODO Not sure if this should match a wildcard event, I think it should as ? is an upper bound of all types PLM
- List<?> event = new ArrayList<Object>();
+ List<Object> event = new ObjectList();
getCurrentManager().fireEvent(event);
assert WildBostonTerrier.observed;
}
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3492 - ri/trunk/impl/src/main/java/org/jboss/webbeans/bean and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-14 11:12:29 -0400 (Fri, 14 Aug 2009)
New Revision: 3492
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/DaoProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/MapProducer.java
Removed:
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/NoParameterizedCollectionInjection.java
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducer.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java
Log:
WBRI-311
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-08-14 12:58:23 UTC (rev 3491)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-08-14 15:12:29 UTC (rev 3492)
@@ -669,17 +669,17 @@
throw new IllegalArgumentException("Not a binding type " + annotation);
}
}
- for (Type type : element.getActualTypeArguments())
- {
- if (type instanceof WildcardType)
- {
- throw new IllegalArgumentException("Cannot resolve a type parameterized with a wildcard " + element);
- }
- if (type instanceof TypeVariable<?>)
- {
- throw new IllegalArgumentException("Cannot resolve a type parameterized with a type parameter " + element);
- }
- }
+// for (Type type : element.getActualTypeArguments())
+// {
+// if (type instanceof WildcardType)
+// {
+// throw new IllegalArgumentException("Cannot resolve a type parameterized with a wildcard " + element);
+// }
+// if (type instanceof TypeVariable<?>)
+// {
+// throw new IllegalArgumentException("Cannot resolve a type parameterized with a type parameter " + element);
+// }
+// }
if (bindings != null && bindings.length > element.getMetaAnnotations(BindingType.class).size())
{
throw new IllegalArgumentException("Duplicate bindings (" + Arrays.asList(bindings) + ") type passed " + element.toString());
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-08-14 12:58:23 UTC (rev 3491)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-08-14 15:12:29 UTC (rev 3492)
@@ -158,14 +158,14 @@
ParameterizedType parameterizedType = (ParameterizedType) ij.getType();
for (Type type : parameterizedType.getActualTypeArguments())
{
- if (type instanceof TypeVariable<?>)
- {
- throw new DefinitionException("Injection point cannot have a type variable type parameter " + ij);
- }
- if (type instanceof WildcardType)
- {
- throw new DefinitionException("Injection point cannot have a wildcard type parameter " + ij);
- }
+// if (type instanceof TypeVariable<?>)
+// {
+// throw new DefinitionException("Injection point cannot have a type variable type parameter " + ij);
+// }
+// if (type instanceof WildcardType)
+// {
+// throw new DefinitionException("Injection point cannot have a wildcard type parameter " + ij);
+// }
}
}
checkFacadeInjectionPoint(ij, Instance.class);
@@ -179,7 +179,7 @@
}
if (resolvedBeans.size() > 1)
{
- throw new DeploymentException("The injection point " + ij + " with binding types " + Names.annotationsToString(ij.getBindings()) + " in " + ij.getBean() + " has ambiguous dependencies");
+ throw new DeploymentException("The injection point " + ij + " with binding types " + Names.annotationsToString(ij.getBindings()) + " in " + ij.getBean() + " has ambiguous dependencies " + resolvedBeans);
}
Bean<?> resolvedBean = (Bean<?>) resolvedBeans.iterator().next();
if (beanManager.getServices().get(MetaAnnotationStore.class).getScopeModel(resolvedBean.getScopeType()).isNormal() && !Proxies.isTypeProxyable(ij.getType()))
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-08-14 12:58:23 UTC (rev 3491)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-08-14 15:12:29 UTC (rev 3492)
@@ -329,10 +329,6 @@
{
throw new DefinitionException("Simple bean " + type + " cannot be a non-static inner class");
}
- if (getAnnotatedItem().isParameterizedType())
- {
- throw new DefinitionException("Simple bean " + type + " cannot be a parameterized type");
- }
boolean passivating = manager.getServices().get(MetaAnnotationStore.class).getScopeModel(scopeType).isPassivating();
if (passivating && !Reflections.isSerializable(getBeanClass()))
{
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java 2009-08-14 12:58:23 UTC (rev 3491)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java 2009-08-14 15:12:29 UTC (rev 3492)
@@ -198,19 +198,19 @@
*/
protected boolean isTypeManagedBeanOrDecorator(WBClass<?> clazz)
{
- Class<?> rawType = clazz.getJavaClass();
+ Class<?> javaClass = clazz.getJavaClass();
EJBApiAbstraction ejbApiAbstraction = manager.getServices().get(EJBApiAbstraction.class);
JsfApiAbstraction jsfApiAbstraction = manager.getServices().get(JsfApiAbstraction.class);
ServletApiAbstraction servletApiAbstraction = manager.getServices().get(ServletApiAbstraction.class);
return !clazz.isNonStaticMemberClass() &&
- !Reflections.isParameterizedType(rawType) &&
- !servletApiAbstraction.SERVLET_CLASS.isAssignableFrom(rawType) &&
- !servletApiAbstraction.FILTER_CLASS.isAssignableFrom(rawType) &&
- !servletApiAbstraction.SERVLET_CONTEXT_LISTENER_CLASS.isAssignableFrom(rawType) &&
- !servletApiAbstraction.HTTP_SESSION_LISTENER_CLASS.isAssignableFrom(rawType) &&
- !servletApiAbstraction.SERVLET_REQUEST_LISTENER_CLASS.isAssignableFrom(rawType) &&
- !ejbApiAbstraction.ENTERPRISE_BEAN_CLASS.isAssignableFrom(rawType) &&
- !jsfApiAbstraction.UICOMPONENT_CLASS.isAssignableFrom(rawType) &&
+ !Reflections.isParamerterizedTypeWithWildcard(javaClass) &&
+ !servletApiAbstraction.SERVLET_CLASS.isAssignableFrom(javaClass) &&
+ !servletApiAbstraction.FILTER_CLASS.isAssignableFrom(javaClass) &&
+ !servletApiAbstraction.SERVLET_CONTEXT_LISTENER_CLASS.isAssignableFrom(javaClass) &&
+ !servletApiAbstraction.HTTP_SESSION_LISTENER_CLASS.isAssignableFrom(javaClass) &&
+ !servletApiAbstraction.SERVLET_REQUEST_LISTENER_CLASS.isAssignableFrom(javaClass) &&
+ !ejbApiAbstraction.ENTERPRISE_BEAN_CLASS.isAssignableFrom(javaClass) &&
+ !jsfApiAbstraction.UICOMPONENT_CLASS.isAssignableFrom(javaClass) &&
hasSimpleWebBeanConstructor(clazz);
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-08-14 12:58:23 UTC (rev 3491)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-08-14 15:12:29 UTC (rev 3492)
@@ -30,6 +30,7 @@
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
@@ -47,6 +48,8 @@
public class Reflections
{
+ private static final Type[] EMPTY_TYPES = {};
+
public static class HierarchyDiscovery
{
@@ -82,19 +85,33 @@
private void discoverTypes(Type type)
{
if (type != null)
- {
- add(type);
+ {
if (type instanceof Class)
{
- discoverFromClass((Class<?>) type);
+ Class<?> clazz = (Class<?>) type;
+ if (clazz.getTypeParameters().length > 0)
+ {
+ TypeVariable[] actualTypeParameters = clazz.getTypeParameters();
+ ParameterizedType parameterizedType = new ParameterizedTypeImpl(clazz, actualTypeParameters, clazz.getDeclaringClass());
+ add(parameterizedType);
+ }
+ else
+ {
+ add(clazz);
+ }
+ discoverFromClass(clazz);
}
- else if (type instanceof ParameterizedType)
+ else
{
- Type rawType = ((ParameterizedType) type).getRawType();
- if (rawType instanceof Class)
+ if (type instanceof ParameterizedType)
{
- discoverFromClass((Class<?>) rawType);
+ Type rawType = ((ParameterizedType) type).getRawType();
+ if (rawType instanceof Class)
+ {
+ discoverFromClass((Class<?>) rawType);
+ }
}
+ add(type);
}
}
}
@@ -390,6 +407,30 @@
{
return type.getTypeParameters().length > 0;
}
+
+ public static boolean isParamerterizedTypeWithWildcard(Class<?> type)
+ {
+ if (isParameterizedType(type))
+ {
+ return containsWildcards(type.getTypeParameters());
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ public static boolean containsWildcards(Type[] types)
+ {
+ for (Type type : types)
+ {
+ if (type instanceof WildcardType)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
/**
* Invokes a method and wraps exceptions
@@ -579,9 +620,27 @@
*/
public static boolean isAssignableFrom(Class<?> rawType1, Type[] actualTypeArguments1, Class<?> rawType2, Type[] actualTypeArguments2)
{
- return Types.boxedClass(rawType1).isAssignableFrom(Types.boxedClass(rawType2)) && Arrays.equals(actualTypeArguments1, actualTypeArguments2);
+ return Types.boxedClass(rawType1).isAssignableFrom(Types.boxedClass(rawType2)) && isAssignableFrom(actualTypeArguments1, actualTypeArguments2);
}
+ public static boolean isAssignableFrom(Type[] actualTypeArguments1, Type[] actualTypeArguments2)
+ {
+ for (int i = 0; i < actualTypeArguments1.length; i++)
+ {
+ Type type1 = actualTypeArguments1[i];
+ Type type2 = Object.class;
+ if (actualTypeArguments2.length > i)
+ {
+ type2 = actualTypeArguments2[i];
+ }
+ if (!isAssignableFrom(type1, type2))
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+
public static boolean isAssignableFrom(Type type1, Set<? extends Type> types2)
{
for (Type type2 : types2)
@@ -594,6 +653,18 @@
return false;
}
+ public static boolean isAssignableFrom(Type type1, Type[] types2)
+ {
+ for (Type type2 : types2)
+ {
+ if (isAssignableFrom(type1, type2))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
public static boolean isAssignableFrom(Type type1, Type type2)
{
if (type1 instanceof Class)
@@ -604,32 +675,75 @@
return true;
}
}
- else if (type1 instanceof ParameterizedType)
+ if (type1 instanceof ParameterizedType)
{
- ParameterizedType parameterizedType = (ParameterizedType) type1;
- if (parameterizedType.getRawType() instanceof Class)
+ ParameterizedType parameterizedType1 = (ParameterizedType) type1;
+ if (parameterizedType1.getRawType() instanceof Class)
{
- if (isAssignableFrom((Class<?>) parameterizedType.getRawType(), parameterizedType.getActualTypeArguments(), type2))
+ if (isAssignableFrom((Class<?>) parameterizedType1.getRawType(), parameterizedType1.getActualTypeArguments(), type2))
{
return true;
}
}
}
+ if (type1 instanceof WildcardType)
+ {
+ WildcardType wildcardType = (WildcardType) type1;
+ if (isTypeBounded(type2, wildcardType.getLowerBounds(), wildcardType.getUpperBounds()))
+ {
+ return true;
+ }
+ }
+ if (type2 instanceof WildcardType)
+ {
+ WildcardType wildcardType = (WildcardType) type2;
+ if (isTypeBounded(type1, wildcardType.getUpperBounds(), wildcardType.getLowerBounds()))
+ {
+ return true;
+ }
+ }
+ if (type1 instanceof TypeVariable<?>)
+ {
+ TypeVariable<?> typeVariable = (TypeVariable<?>) type1;
+ if (isTypeBounded(type2, EMPTY_TYPES, typeVariable.getBounds()))
+ {
+ return true;
+ }
+ }
+ if (type2 instanceof TypeVariable<?>)
+ {
+ TypeVariable<?> typeVariable = (TypeVariable<?>) type2;
+ if (isTypeBounded(type1, typeVariable.getBounds(), EMPTY_TYPES))
+ {
+ return true;
+ }
+ }
return false;
}
- public static boolean isAssignableFrom(Class<?> rawType1, Type[] actualTypeArguments1, Type type2)
+ public static boolean isTypeBounded(Type type, Type[] lowerBounds, Type[] upperBounds)
{
- if (type2 instanceof Class)
+ if (lowerBounds.length > 0)
{
- Class<?> clazz = (Class<?>) type2;
- if (isAssignableFrom(rawType1, actualTypeArguments1, clazz, new Type[0]))
+ if (!isAssignableFrom(type, lowerBounds))
{
- return true;
+ return false;
}
}
- else if (type2 instanceof ParameterizedType)
+ if (upperBounds.length > 0)
{
+ if (!isAssignableFrom(upperBounds, type))
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public static boolean isAssignableFrom(Class<?> rawType1, Type[] actualTypeArguments1, Type type2)
+ {
+ if (type2 instanceof ParameterizedType)
+ {
ParameterizedType parameterizedType = (ParameterizedType) type2;
if (parameterizedType.getRawType() instanceof Class)
{
@@ -639,6 +753,14 @@
}
}
}
+ else if (type2 instanceof Class)
+ {
+ Class<?> clazz = (Class<?>) type2;
+ if (isAssignableFrom(rawType1, actualTypeArguments1, clazz, new Type[0]))
+ {
+ return true;
+ }
+ }
return false;
}
@@ -681,6 +803,18 @@
}
return false;
}
+
+ public static boolean isAssignableFrom(Type[] types1, Type type2)
+ {
+ for (Type type : types1)
+ {
+ if (isAssignableFrom(type, type2))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
public static boolean isSerializable(Class<?> clazz)
{
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java 2009-08-14 12:58:23 UTC (rev 3491)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ListInstance.java 2009-08-14 15:12:29 UTC (rev 3492)
@@ -10,9 +10,9 @@
@Any
Instance<List> instance;
- public List get()
+ public Instance<List> get()
{
- return instance.get();
+ return instance;
}
}
Deleted: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/NoParameterizedCollectionInjection.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/NoParameterizedCollectionInjection.java 2009-08-14 12:58:23 UTC (rev 3491)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/NoParameterizedCollectionInjection.java 2009-08-14 15:12:29 UTC (rev 3492)
@@ -1,45 +0,0 @@
-package org.jboss.webbeans.test.unit.implementation.producer.field;
-
-import java.util.Collection;
-
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
-
-public class NoParameterizedCollectionInjection
-{
-
- private Collection value;
-
- @Current
- private Collection fieldInjection;
-
- private Collection setterInjection;
-
- @Initializer
- public void init(Collection setterInjection)
- {
- this.setterInjection = setterInjection;
- }
-
- @Initializer
- public NoParameterizedCollectionInjection(Collection com)
- {
- this.value = com;
- }
-
- public Collection getValue()
- {
- return value;
- }
-
- public Collection getFieldInjection()
- {
- return fieldInjection;
- }
-
- public Collection getSetterInjection()
- {
- return setterInjection;
- }
-
-}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducer.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducer.java 2009-08-14 12:58:23 UTC (rev 3491)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducer.java 2009-08-14 15:12:29 UTC (rev 3492)
@@ -16,12 +16,6 @@
}
@Produces
- public List createList()
- {
- return Arrays.asList(1, 2, 3);
- }
-
- @Produces
public ArrayList<Integer> createIntegerList()
{
List<Integer> list = Arrays.asList(1, 2, 3, 4);
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java 2009-08-14 12:58:23 UTC (rev 3491)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/field/ParameterizedProducerTest.java 2009-08-14 15:12:29 UTC (rev 3492)
@@ -36,17 +36,6 @@
assert item.getSetterInjection().size() == 2;
}
-
- @Test
- public void testNoParameterizedCollectionInjection()
- {
-
- NoParameterizedCollectionInjection item = getCurrentManager().getInstanceByType(NoParameterizedCollectionInjection.class);
- assert item.getFieldInjection().size() == 3;
- assert item.getValue().size() == 3;
- assert item.getSetterInjection().size() == 3;
-
- }
@Test
public void testIntegerCollectionInjection()
@@ -65,7 +54,7 @@
public void testInstanceList()
{
ListInstance listInstance = getCurrentManager().getInstanceByType(ListInstance.class);
- assert listInstance.get().size() == 3;
+ assert listInstance.get().isAmbiguous();
}
@Test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-08-14 12:58:23 UTC (rev 3491)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-08-14 15:12:29 UTC (rev 3492)
@@ -6,6 +6,7 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
@@ -70,13 +71,13 @@
* Checks if all annotations are in a given set of annotations
*
* @param annotations The annotation set
- * @param annotationTypes The annotations to match
+ * @param requiredAnnotationTypes The annotations to match
* @return True if match, false otherwise
*/
- public boolean annotationSetMatches(Set<? extends Annotation> annotations, Class<? extends Annotation>... annotationTypes)
+ public boolean annotationSetMatches(Set<? extends Annotation> annotations, Class<? extends Annotation>... requiredAnnotationTypes)
{
List<Class<? extends Annotation>> annotationTypeList = new ArrayList<Class<? extends Annotation>>();
- annotationTypeList.addAll(Arrays.asList(annotationTypes));
+ annotationTypeList.addAll(Arrays.asList(requiredAnnotationTypes));
for (Annotation annotation : annotations)
{
if (annotationTypeList.contains(annotation.annotationType()))
@@ -90,6 +91,24 @@
}
return annotationTypeList.size() == 0;
}
+
+ public boolean typeSetMatches(Set<Type> types, Class<?>... requiredTypes)
+ {
+ List<Class<?>> typeList = new ArrayList<Class<?>>();
+ typeList.addAll(Arrays.asList(requiredTypes));
+ for (Type type : types)
+ {
+ if (type instanceof Class<?>)
+ {
+ typeList.remove(type);
+ }
+ else if (type instanceof ParameterizedType)
+ {
+ typeList.remove(((ParameterizedType) type).getRawType());
+ }
+ }
+ return typeList.size() == 0;
+ }
public <T> Bean<T> getUniqueBean(Class<T> type, Annotation... bindings)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-08-14 12:58:23 UTC (rev 3491)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-08-14 15:12:29 UTC (rev 3492)
@@ -17,8 +17,11 @@
package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution.parameterized;
import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.inject.spi.Bean;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
@@ -32,66 +35,69 @@
public class AssignabilityOfRawAndParameterizedTypesTest extends AbstractJSR299Test
{
- @Test(groups = { "resolution", "ri-broken" })
+ @Test(groups = { "resolution" })
@SpecAssertions({
@SpecAssertion(section = "5.3.3", id = "a"),
@SpecAssertion(section = "2.2.1", id = "f"),
@SpecAssertion(section = "2.2.1", id = "g")
})
- // WBRI-311
public void testAssignabilityToRawType()
{
- assert getBeans(Dao.class).size() == 2; // Dao and ObjectDao
+ Set<Bean<Dao>> beans = getBeans(Dao.class);
+ assert getBeans(Dao.class).size() == 3; // Dao, DaoProducer.getDao() and ObjectDao
}
- @Test(groups= {"resolution", "ri-broken"})
+ @Test(groups= {"resolution"})
@SpecAssertion(section = "5.3.3", id = "b")
- // WBRI-311
public void testAssignabilityOfParameterizedTypeWithActualTypesToParameterizedTypeWithActualTypes()
{
- assert getBeans(new TypeLiteral<HashMap<Integer, Integer>>(){}).size() == 1;
- assert getBeans(new TypeLiteral<HashMap<Integer, Integer>>(){}
- ).iterator().next().getTypes().contains(IntegerHashMap.class);
+ assert getBeans(new TypeLiteral<Map<Integer, Integer>>(){}).size() == 2;
+ assert getBeans(new TypeLiteral<HashMap<Integer, Integer>>(){}).iterator().next().getTypes().contains(IntegerHashMap.class);
}
- @Test(groups = { "resolution", "ri-broken" })
+ @Test(groups = { "resolution"})
@SpecAssertions({
- @SpecAssertion(section = "5.3.2", id = "b"),
@SpecAssertion(section = "5.3.3", id = "c")})
- // WBRI-311
public void testAssignabilityOfParameterizedTypeWithActualTypesToParameterizedTypeWithWildcards()
{
+ assert getBeans(new TypeLiteral<HashMap<? extends Number, ? super Integer>>() {}).size() == 1;
+ assert getBeans(new TypeLiteral<HashMap<? extends Number, ? super Integer>>() {}).iterator().next().getTypes().contains(IntegerHashMap.class);
+ }
+
+ @Test(groups = { "resolution"})
+ @SpecAssertions({
+ @SpecAssertion(section = "5.3.2", id = "b")
+ })
+ public void testAssignabilityOfParameterizedTypeWithActualTypesToParameterizedTypeWithWildcardsAtInjectionPoint()
+ {
assert getInstanceByType(InjectedBean.class).getMap() instanceof IntegerHashMap;
}
- @Test(groups = { "resolution", "ri-broken" })
+ @Test(groups = { "resolution" })
@SpecAssertion(section = "5.3.3", id = "d")
- // WBRI-311
public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithWildcards()
{
- assert getBeans(new TypeLiteral<Result<? extends Throwable, ? super Exception>>(){}).size() == 1;
- assert getBeans(new TypeLiteral<Result<? extends Throwable, ? super Exception>>(){}
- ).iterator().next().getTypes().contains(Result.class);
+ Set<Bean<Result<? extends Throwable, ? super Exception>>> beans = getBeans(new TypeLiteral<Result<? extends Throwable, ? super Exception>>(){});
+ assert beans.size() == 1;
+ assert typeSetMatches(beans.iterator().next().getTypes(), Result.class, Object.class);
}
- @Test(groups = { "resolution", "ri-broken" })
+ @Test(groups = { "resolution" })
@SpecAssertion(section = "5.3.3", id = "e")
- // WBRI-311
public void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeWithActualTypes()
{
- assert getBeans(new TypeLiteral<Result<Exception, Exception>>(){}).size() == 1;
- assert getBeans(new TypeLiteral<Result<Exception, Exception>>(){}
- ).iterator().next().getTypes().contains(Result.class);
+ Set<Bean<Result<Exception, Exception>>> beans = getBeans(new TypeLiteral<Result<Exception, Exception>>(){});
+ assert beans.size() == 1;
+ assert typeSetMatches(beans.iterator().next().getTypes(), Result.class, Object.class);
}
- @Test(groups = { "resolution", "ri-broken" })
+ @Test(groups = { "resolution" })
@SpecAssertion(section = "5.3.3", id = "f")
- // WBRI-311
public <T1 extends Exception, T2 extends Exception> void testAssignabilityOfParameterizedTypeWithTypeVariablesToParameterizedTypeTypeVariable()
{
- assert getBeans(new TypeLiteral<Result<T1, T2>>(){}).size() == 1;
- assert getBeans(new TypeLiteral<Result<Exception, Exception>>(){}
- ).iterator().next().getTypes().contains(Result.class);
+ Set<Bean<Result<T1, T2>>> beans = getBeans(new TypeLiteral<Result<T1, T2>>(){});
+ assert beans.size() == 1;
+ assert typeSetMatches(beans.iterator().next().getTypes(), Result.class, Object.class);
}
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/DaoProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/DaoProducer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/DaoProducer.java 2009-08-14 15:12:29 UTC (rev 3492)
@@ -0,0 +1,34 @@
+/*
+ * 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.jsr299.tck.tests.lookup.typesafe.resolution.parameterized;
+
+import javax.enterprise.inject.Produces;
+
+/**
+ * @author pmuir
+ *
+ */
+public class DaoProducer
+{
+
+ @Produces
+ public Dao<Object, Object> getDao()
+ {
+ return new Dao<Object, Object>();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/DaoProducer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/MapProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/MapProducer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/MapProducer.java 2009-08-14 15:12:29 UTC (rev 3492)
@@ -0,0 +1,37 @@
+/*
+ * 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.jsr299.tck.tests.lookup.typesafe.resolution.parameterized;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.enterprise.inject.Produces;
+
+/**
+ * @author pmuir
+ *
+ */
+public class MapProducer
+{
+
+ @Produces
+ public Map<Integer, Integer> produceMap()
+ {
+ return new HashMap<Integer, Integer>();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/MapProducer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 8 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3491 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-14 08:58:23 -0400 (Fri, 14 Aug 2009)
New Revision: 3491
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withTypeVariable/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/inject/withWildcardType/
Log:
remove dud tests
16 years, 8 months
- 1
- 0