[webbeans-commits] Webbeans SVN: r3229 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-07-25 17:01:32 -0400 (Sat, 25 Jul 2009)
New Revision: 3229
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
Log:
remove the runindependentcontext
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-07-25 20:58:18 UTC (rev 3228)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-07-25 21:01:32 UTC (rev 3229)
@@ -1,5 +1,7 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.newBean;
+import java.util.Set;
+
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
@@ -69,43 +71,27 @@
@SpecAssertion(section = "3.10", id = "w")
public void testNewBeanHasNoProducerFields() throws Exception
{
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- FoxLocal fox = getInstanceByType(FoxLocal.class);
- FoxLocal newFox = getInstanceByType(FoxLocal.class,new NewLiteral());
- newFox.setDen(new Den("NewFoxDen"));
- Den theOnlyDen = getInstanceByType(Den.class,new AnnotationLiteral<Tame>(){});
- assert theOnlyDen.getName().equals(fox.getDen().getName());
- }
-
- }.run();
+ FoxLocal fox = getInstanceByType(FoxLocal.class);
+ FoxLocal newFox = getInstanceByType(FoxLocal.class,new NewLiteral());
+ newFox.setDen(new Den("NewFoxDen"));
+ Den theOnlyDen = getInstanceByType(Den.class,new AnnotationLiteral<Tame>(){});
+ assert theOnlyDen.getName().equals(fox.getDen().getName());
}
@Test(groups = { "new", "ri-broken", "disposal" })
@SpecAssertion(section = "3.10", id = "x")
- public void testNewBeanHasNoDisposerMethods() throws Exception
+ public void testNewBeanHasNoDisposalMethods() throws Exception
{
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- FoxLocal fox = getInstanceByType(FoxLocal.class);
- FoxLocal newFox = getInstanceByType(FoxLocal.class,new NewLiteral());
- Bean<Litter> litterBean = getBeans(Litter.class).iterator().next();
- CreationalContext<Litter> creationalContext = getCurrentManager().createCreationalContext(litterBean);
- Litter litter = getInstanceByType(Litter.class);
- litterBean.destroy(litter, creationalContext);
- assert fox.isLitterDisposed();
- assert !newFox.isLitterDisposed();
- }
-
- }.run();
+ FoxLocal fox = getInstanceByType(FoxLocal.class);
+ FoxLocal newFox = getInstanceByType(FoxLocal.class,new NewLiteral());
+ Set<Bean<Litter>> beans = getBeans(Litter.class, new AnnotationLiteral<Tame>() {});
+ assert beans.size() == 1;
+ Bean<Litter> litterBean = beans.iterator().next();
+ CreationalContext<Litter> creationalContext = getCurrentManager().createCreationalContext(litterBean);
+ Litter litter = litterBean.create(creationalContext);
+ litterBean.destroy(litter, creationalContext);
+ assert fox.isLitterDisposed();
+ assert !newFox.isLitterDisposed();
}
}
15 years, 2 months
[webbeans-commits] Webbeans SVN: r3228 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-07-25 16:58:18 -0400 (Sat, 25 Jul 2009)
New Revision: 3228
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java
Log:
mark test broken
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java 2009-07-25 20:57:30 UTC (rev 3227)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java 2009-07-25 20:58:18 UTC (rev 3228)
@@ -50,10 +50,11 @@
assert alarm.getNumViolentBreakIns() == 1;
}
- @Test(groups = {"events" }, expectedExceptions = IllegalArgumentException.class)
+ @Test(groups = {"events", "broken" }, expectedExceptions = IllegalArgumentException.class)
@SpecAssertion(section = "10.3.1", id = "eab")
public void testEventSelectThrowsExceptionIfEventTypeHasTypeVariable()
{
+ // TODO This test *doesn't* pass an event with a type variable in, it passes in a raw class PLM
SecuritySensor sensor = getInstanceByType(SecuritySensor.class);
sensor.securityEvent.select(SecurityEvent_Illegal.class);
}
15 years, 2 months
[webbeans-commits] Webbeans SVN: r3227 - ri/trunk/impl/src/main/java/org/jboss/webbeans.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-07-25 16:57:30 -0400 (Sat, 25 Jul 2009)
New Revision: 3227
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java
Log:
Better error message
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-07-25 18:48:31 UTC (rev 3226)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-07-25 20:57:30 UTC (rev 3227)
@@ -215,7 +215,7 @@
if (all.size() > 0 && !resolved.containsAll(all))
{
StringBuffer buff = new StringBuffer();
- buff.append("The following Disposal methods where not resolved\n");
+ buff.append("The following Disposal methods where not declared but not resolved to a producer method\n");
all.removeAll(resolved);
for (DisposalMethodBean<?> bean : all)
{
15 years, 2 months
[webbeans-commits] Webbeans SVN: r3226 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-07-25 14:48:31 -0400 (Sat, 25 Jul 2009)
New Revision: 3226
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Retriever.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
Log:
Fix this no-interface view test to actually use a no-interface EJB
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-07-25 18:42:46 UTC (rev 3225)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-07-25 18:48:31 UTC (rev 3226)
@@ -61,18 +61,13 @@
assert !dogBean.getTypes().contains(Pitbull.class);
}
- /**
- * If the EJB has a bean class local view and the bean class is not a
- * parameterized type, the set of bean types contains the bean class and all
- * superclasses.
- */
@Test(groups = { "ejb 3.1", "ri-broken" })
@SpecAssertion(section = "3.2.2", id = "ba")
- public void testEnterpriseBeanWithLocalViewAndNotParameterizedTypeHasClassAndSuperclassesAsBeanTypes()
+ public void testEnterpriseBeanClassLocalView()
{
//TODO We need a 3.1 compliant container for this test
- Bean<DogLocal> dogBean = getBeans(DogLocal.class).iterator().next();
- assert dogBean.getTypes().contains(Pitbull.class);
+ Bean<Retriever> dogBean = getBeans(Retriever.class).iterator().next();
+ assert dogBean.getTypes().contains(Retriever.class);
}
@Test(groups = "enterpriseBeans")
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Retriever.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Retriever.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Retriever.java 2009-07-25 18:48:31 UTC (rev 3226)
@@ -0,0 +1,32 @@
+/*
+ * 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.implementation.enterprise.definition;
+
+import javax.ejb.LocalBean;
+
+import com.sun.xml.internal.ws.developer.Stateful;
+
+/**
+ * @author pmuir
+ *
+ */
+@Stateful
+@LocalBean
+public class Retriever
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Retriever.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 2 months
[webbeans-commits] Webbeans SVN: r3225 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-07-25 14:42:46 -0400 (Sat, 25 Jul 2009)
New Revision: 3225
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
Log:
fixes to test to comply with spec (same cc used for create and destroy)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-07-25 18:36:42 UTC (rev 3224)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-07-25 18:42:46 UTC (rev 3225)
@@ -187,7 +187,7 @@
assert OrderProcessor.postConstructCalled;
}
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertion(section = "4.2", id = "bbb")
public void testSubClassInheritsPreDestroyOnSuperclass() throws Exception
{
@@ -195,20 +195,20 @@
assert getBeans(DirectOrderProcessorLocal.class).size() == 1;
Bean<DirectOrderProcessorLocal> bean = getBeans(DirectOrderProcessorLocal.class).iterator().next();
CreationalContext<DirectOrderProcessorLocal> creationalContext = getCurrentManager().createCreationalContext(bean);
- DirectOrderProcessorLocal instance = getInstanceByType(DirectOrderProcessorLocal.class);
+ DirectOrderProcessorLocal instance = bean.create(creationalContext);
bean.destroy(instance, creationalContext);
assert OrderProcessor.preDestroyCalled;
}
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertion(section = "4.2", id = "bbd")
public void testIndirectSubClassInheritsPreDestroyOnSuperclass() throws Exception
{
OrderProcessor.preDestroyCalled = false;
- assert getBeans(IndirectOrderProcessor.class).size() == 1;
- Bean<IndirectOrderProcessor> bean = getBeans(IndirectOrderProcessor.class).iterator().next();
- CreationalContext<IndirectOrderProcessor> creationalContext = getCurrentManager().createCreationalContext(bean);
- IndirectOrderProcessor instance = getInstanceByType(IndirectOrderProcessor.class);
+ assert getBeans(OrderProcessorLocal.class).size() == 1;
+ Bean<OrderProcessorLocal> bean = getBeans(OrderProcessorLocal.class).iterator().next();
+ CreationalContext<OrderProcessorLocal> creationalContext = getCurrentManager().createCreationalContext(bean);
+ OrderProcessorLocal instance = bean.create(creationalContext);
bean.destroy(instance, creationalContext);
assert OrderProcessor.preDestroyCalled;
}
15 years, 2 months
[webbeans-commits] Webbeans SVN: r3224 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-07-25 14:36:42 -0400 (Sat, 25 Jul 2009)
New Revision: 3224
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
Log:
fix test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-07-25 18:23:57 UTC (rev 3223)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-07-25 18:36:42 UTC (rev 3224)
@@ -154,14 +154,14 @@
assert alteStadt.getAnotherPlaceOfInterest() != null;
}
- @Test(groups = { "enterpriseBeans", "lifecycle", "ri-broken" })
+ @Test(groups = { "enterpriseBeans", "lifecycle" })
@SpecAssertion(section = "5.6.5", id = "a")
public void testDependentObjectsDestroyed()
{
- UniStadt marburg = getInstanceByType(UniStadt.class);
- assert marburg != null : "Couldn't find the main SFSB";
Bean<UniStadt> uniStadtBean = getBeans(UniStadt.class).iterator().next();
CreationalContext<UniStadt> creationalContext = getCurrentManager().createCreationalContext(uniStadtBean);
+ UniStadt marburg = uniStadtBean.create(creationalContext);
+ assert marburg != null : "Couldn't find the main SFSB";
uniStadtBean.destroy(marburg, creationalContext);
GrossStadt frankfurt = getInstanceByType(GrossStadt.class);
assert frankfurt.isSchlossDestroyed();
15 years, 2 months
[webbeans-commits] Webbeans SVN: r3223 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-07-25 14:23:57 -0400 (Sat, 25 Jul 2009)
New Revision: 3223
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
Log:
serialization test now passes
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-07-25 18:20:24 UTC (rev 3222)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-07-25 18:23:57 UTC (rev 3223)
@@ -74,7 +74,7 @@
assert interfaces.contains(Serializable.class);
}
- @Test(groups = { "ri-broken", "enterpriseBeans", "clientProxy", "lifecycle", "integration" })
+ @Test(groups = { "enterpriseBeans", "clientProxy", "lifecycle", "integration" })
@SpecAssertions( {
@SpecAssertion(section = "6.6.2", id = "a")
})
15 years, 2 months
[webbeans-commits] Webbeans SVN: r3222 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer: wildcardAndTypeVariable and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-07-25 14:20:24 -0400 (Sat, 25 Jul 2009)
New Revision: 3222
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/Behavior.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/BostonTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/GenericBostonTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithTypeVariableEventTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithWildcardedEventTypeTest.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/WildBostonTerrier.java
Log:
Fix the tests (hopefully, not sure about use of generics). RI is broken
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable (from rev 3215, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType)
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/Behavior.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/Behavior.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/Behavior.java 2009-07-25 18:20:24 UTC (rev 3222)
@@ -0,0 +1,26 @@
+/*
+ * 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;
+
+/**
+ * @author pmuir
+ *
+ */
+public interface Behavior
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/Behavior.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/BostonTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/BostonTerrier.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/BostonTerrier.java 2009-07-25 18:20:24 UTC (rev 3222)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.event.observer.wildcardAndTypeVariable;
+
+import javax.enterprise.event.Observes;
+
+class BostonTerrier
+{
+
+ public static boolean observed;
+
+ public <T extends Behavior> void observesEventWithTypeParameter(@Observes T behavior)
+ {
+ observed = true;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/BostonTerrier.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/GenericBostonTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/GenericBostonTerrier.java 2009-07-25 13:16:47 UTC (rev 3215)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/GenericBostonTerrier.java 2009-07-25 18:20:24 UTC (rev 3222)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.tests.event.observer.wildcardAndGenericType;
-
-import java.util.List;
-
-import javax.enterprise.event.Observes;
-
-class GenericBostonTerrier
-{
- public <T> void observesEventWithTypeParameter(@Observes List<T> someArray)
- {
- }
-}
Added: 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 (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java 2009-07-25 18:20:24 UTC (rev 3222)
@@ -0,0 +1,62 @@
+/*
+ * 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;
+import java.util.List;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.testng.annotations.Test;
+
+/**
+ * Tests an observer method defined to observe an event type which
+ * is generic and a type variable
+ *
+ * Spec version: 20090625
+ *
+ * @author David Allen
+ */
+@Artifact
+public class ObserverMethodWithParametertizedTypeTest extends AbstractJSR299Test
+{
+ @Test(groups = { "events", "ri-broken"})
+ @SpecAssertion(section = "10.4.1", id = "cb")
+ public void testObserverMethodCanObserveTypeVariable()
+ {
+ BostonTerrier.observed = false;
+ Behavior event = new Behavior() {};
+ getCurrentManager().fireEvent(event);
+ assert BostonTerrier.observed;
+ }
+
+ @Test(groups = { "events", "ri-broken" })
+ @SpecAssertion(section = "10.4.1", id = "ca")
+ 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>();
+ getCurrentManager().fireEvent(event);
+ assert WildBostonTerrier.observed;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithParametertizedTypeTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithTypeVariableEventTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/ObserverMethodWithTypeVariableEventTypeTest.java 2009-07-25 13:16:47 UTC (rev 3215)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithTypeVariableEventTypeTest.java 2009-07-25 18:20:24 UTC (rev 3222)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.jsr299.tck.tests.event.observer.wildcardAndGenericType;
-
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DefinitionError;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
-
-/**
- * Tests an observer method defined to observe an event type which
- * is generic and wildcarded.
- *
- * Spec version: 20090625
- *
- * @author David Allen
- */
-@Artifact
-(a)ExpectedDeploymentException(DefinitionError.class)
-public class ObserverMethodWithTypeVariableEventTypeTest extends AbstractJSR299Test
-{
- @Test(groups = { "events", "ri-broken" })
- @SpecAssertion(section = "10.4.1", id = "cb")
- public void testObserverMethodCanObserveParameterizedEvents()
- {
- assert false;
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithWildcardedEventTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/ObserverMethodWithWildcardedEventTypeTest.java 2009-07-25 13:16:47 UTC (rev 3215)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/ObserverMethodWithWildcardedEventTypeTest.java 2009-07-25 18:20:24 UTC (rev 3222)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.jsr299.tck.tests.event.observer.wildcardAndGenericType;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.testng.annotations.Test;
-
-/**
- * Tests an observer method defined to observe an event type which
- * is generic and wildcarded.
- *
- * Spec version: 20090625
- *
- * @author David Allen
- */
-@Artifact
-public class ObserverMethodWithWildcardedEventTypeTest extends AbstractJSR299Test
-{
- @Test(groups = { "events", "ri-broken" })
- @SpecAssertion(section = "10.4.1", id = "ca")
- public void testObserverMethodCanObserveParameterizedEvents()
- {
- assert false;
- }
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/WildBostonTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndGenericType/WildBostonTerrier.java 2009-07-25 13:16:47 UTC (rev 3215)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/wildcardAndTypeVariable/WildBostonTerrier.java 2009-07-25 18:20:24 UTC (rev 3222)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.event.observer.wildcardAndGenericType;
+package org.jboss.jsr299.tck.tests.event.observer.wildcardAndTypeVariable;
import java.util.List;
@@ -6,7 +6,11 @@
class WildBostonTerrier
{
+
+ public static boolean observed;
+
public void observesEventTypeWithWildcard(@Observes List<?> someArray)
{
+ observed = true;
}
}
15 years, 2 months
[webbeans-commits] Webbeans SVN: r3221 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-07-25 14:19:25 -0400 (Sat, 25 Jul 2009)
New Revision: 3221
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
Log:
Test itself is broken
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-07-25 18:17:19 UTC (rev 3220)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-07-25 18:19:25 UTC (rev 3221)
@@ -167,7 +167,7 @@
assert !getCurrentManager().resolveObserverMethods(new String()).isEmpty();
}
- @Test(groups = { "events", "ri-broken" })
+ @Test(groups = { "events", "broken" })
@SpecAssertion(section = "12.3", id = "oa")
public void testObserverMethodNotAutomaticallyRegisteredForDisabledBeans()
{
@@ -380,20 +380,6 @@
{
getCurrentManager().resolveObserverMethods(eventToFire);
}
-
- @Test(groups = { "events", "ri-broken" })
- @SpecAssertion(section = "unknown", id = "unknown")
- public void testEventObjectContainsWildcardsWhenResolvingFails()
- {
- eventObjectContainsWildcards(new ArrayList<String>());
- }
-
- private void eventObjectContainsWildcards(ArrayList<?> eventToFire)
- {
- // FIXME create a valid observer and assert it is found
- getCurrentManager().resolveObserverMethods(eventToFire);
- }
-
@Test(groups = { "events" })
@SpecAssertions( {
15 years, 2 months
[webbeans-commits] Webbeans SVN: r3220 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-07-25 14:17:19 -0400 (Sat, 25 Jul 2009)
New Revision: 3220
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java
Log:
Fix RI
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-07-25 17:59:45 UTC (rev 3219)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-07-25 18:17:19 UTC (rev 3220)
@@ -22,7 +22,6 @@
import java.lang.reflect.TypeVariable;
import java.lang.reflect.WildcardType;
import java.util.ArrayList;
-import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -55,7 +54,6 @@
import org.jboss.webbeans.util.Names;
import org.jboss.webbeans.util.Proxies;
import org.jboss.webbeans.util.Reflections;
-import org.jboss.webbeans.util.collections.ListComparator;
/**
* Checks a list of beans for DeploymentExceptions and their subclasses
@@ -223,7 +221,7 @@
{
buff.append(bean.toString());
}
- throw new UnsatisfiedResolutionException(buff.toString());
+ throw new DefinitionException(buff.toString());
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-07-25 17:59:45 UTC (rev 3219)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/UnresolvedDisposalMethodDefinitionTest.java 2009-07-25 18:17:19 UTC (rev 3220)
@@ -16,7 +16,7 @@
@BeansXml("beans.xml")
public class UnresolvedDisposalMethodDefinitionTest extends AbstractJSR299Test
{
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertion(section = "3.3.9", id = "ca")
public void testUnresolvedDisposalMethod()
{
15 years, 2 months