Weld SVN: r7164 - cdi-tck/branches/1.0/impl/src/main/resources.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-12-31 11:27:42 -0500 (Fri, 31 Dec 2010)
New Revision: 7164
Modified:
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
Log:
Update exclude lists
Modified: cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml 2010-12-30 17:15:23 UTC (rev 7163)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml 2010-12-31 16:27:42 UTC (rev 7164)
@@ -19,6 +19,53 @@
</packages>
<classes>
<!-- Issues in the TCK -->
+
+ <!-- CDITCK-202 -->
+ <class name="org.jboss.jsr299.tck.tests.event.observer.enterprise.EnterpriseEventInheritenceTest">
+ <methods>
+ <exclude name="testNonStaticObserverMethodInherited" />
+ <exclude name="testNonStaticObserverMethodIndirectlyInherited" />
+ </methods>
+ </class>
+
+ <!-- CDITCK-201 -->
+ <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest">
+ <methods>
+ <exclude name="testInjectionIntoWebServiceEndpoint" />
+ </methods>
+ </class>
+
+ <!-- CDITCK-200 -->
+ <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest">
+ <methods>
+ <exclude name="testInjectionIntoWebServiceEndpoint" />
+ </methods>
+ </class>
+
+ <!-- CDITCK-199 -->
+ <class name="org.jboss.jsr299.tck.tests.extensions.processBean.ProcessBeanTest">
+ <methods>
+ <exclude name="testProcessProducerFieldEvent" />
+ <exclude name="testProcessProducerMethodEvent" />
+ </methods>
+ </class>
+ <class name="org.jboss.jsr299.tck.tests.extensions.observer.ProcessObserverMethodEventTest">
+ <methods>
+ <exclude name="testGetAnnotatedMethod" />
+ <exclude name="testGetObserverMethod" />
+ <exclude name="testProcessObserverMethodEventsSent" />
+ </methods>
+ </class>
+ <class name="org.jboss.jsr299.tck.tests.extensions.observer.broken.definitionError.ProcessObserverMethodErrorTest">
+ <methods>
+ <exclude name="testAddDefinitionError" />
+ </methods>
+ </class>
+ <class name="org.jboss.jsr299.tck.tests.extensions.observer.broken.exception.ProcessObserverMethodExceptionTest">
+ <methods>
+ <exclude name="testExceptionIsDefinitionError" />
+ </methods>
+ </class>
<!-- Issues in Weld (the RI) -->
Modified: cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-12-30 17:15:23 UTC (rev 7163)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-12-31 16:27:42 UTC (rev 7164)
@@ -17,13 +17,6 @@
<!-- Issues in the TCK -->
<!-- Issues in Weld (the RI) -->
-
- <!-- WELD-401 -->
- <class name="org.jboss.jsr299.tck.tests.event.broken.observer.notBusinessMethod.EJBObserverMethodNotBusinessMethodTest">
- <methods>
- <exclude name="testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails" />
- </methods>
- </class>
</classes>
</test>
13 years, 11 months
[weld/core] 1134e2: Remove excludes for fixed tests
by noreply@github.com
Branch: refs/heads/master
Home: https://github.com/weld/core
Commit: 1134e20d8393682cef310e832c1437f8d5742443
https://github.com/weld/core/commit/1134e20d8393682cef310e832c1437f8d5742443
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-12-30 (Thu, 30 Dec 2010)
Changed paths:
M jboss-tck-runner/src/test/resources/tck-tests.xml
Log Message:
-----------
Remove excludes for fixed tests
Commit: d49964d3a93551f8a6d26a493407091f9ebc8f55
https://github.com/weld/core/commit/d49964d3a93551f8a6d26a493407091f9ebc8f55
Author: Pete Muir <pmuir(a)bleepbleep.org.uk>
Date: 2010-12-30 (Thu, 30 Dec 2010)
Changed paths:
M impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java
A impl/src/main/java/org/jboss/weld/injection/ForwardingInjectionPoint.java
M impl/src/main/java/org/jboss/weld/injection/SimpleInjectionPoint.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/injectionPoint/Estate.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/injectionPoint/Farm.java
M tests-arquillian/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java
Log Message:
-----------
WELD-812
* Add a test to reproduce
* Fix by simply wrapping an existing IP to "fix"
information it contains
13 years, 11 months
Weld SVN: r7163 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-12-30 12:15:23 -0500 (Thu, 30 Dec 2010)
New Revision: 7163
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
Log:
Make EJB related test incontainer only
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2010-12-30 14:51:34 UTC (rev 7162)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2010-12-30 17:15:23 UTC (rev 7163)
@@ -28,6 +28,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.IntegrationTest;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
import org.jboss.testharness.impl.packaging.ear.EjbJarXml;
@@ -43,6 +44,7 @@
@BeansXml("beans.xml")
@EjbJarXml("ejb-jar.xml")
@SpecVersion(spec="cdi", version="20091101")
+@IntegrationTest
public class EnterpriseBeanDefinitionTest extends AbstractJSR299Test
{
@Test(groups = { "enterpriseBeans" })
13 years, 11 months
Weld SVN: r7162 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-12-30 09:51:34 -0500 (Thu, 30 Dec 2010)
New Revision: 7162
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Egg.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EventPayload.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Farmer.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/FarmerLocal.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcher.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IntermediateStockWatcher.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmer.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockPrice.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcher.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcherLocal.java
Log:
CDITCK-202
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Egg.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Egg.java 2010-12-30 14:39:31 UTC (rev 7161)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Egg.java 2010-12-30 14:51:34 UTC (rev 7162)
@@ -18,4 +18,10 @@
class Egg extends EventPayload
{
+
+ public void recordVisit(FarmerLocal farmer)
+ {
+ recordVisit(farmer.getName());
+ }
+
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2010-12-30 14:39:31 UTC (rev 7161)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2010-12-30 14:51:34 UTC (rev 7162)
@@ -42,7 +42,9 @@
{
Egg egg = new Egg();
getCurrentManager().fireEvent(egg);
- assert typeSetMatches(egg.getClassesVisited(), Farmer.class, LazyFarmer.class);
+ assert egg.getVisited().size() == 2;
+ assert egg.getVisited().contains(Farmer.class.getSimpleName());
+ assert egg.getVisited().contains(LazyFarmer.class.getSimpleName());
}
@Test(groups = { "events", "inheritance" })
@@ -51,6 +53,9 @@
{
StockPrice stockPrice = new StockPrice();
getCurrentManager().fireEvent(stockPrice);
- assert typeSetMatches(stockPrice.getClassesVisited(), StockWatcher.class, IndirectStockWatcher.class, IntermediateStockWatcher.class);
+ assert stockPrice.getVisited().size() == 3;
+ assert stockPrice.getVisited().contains(StockWatcher.class.getSimpleName());
+ assert stockPrice.getVisited().contains(IntermediateStockWatcher.class.getSimpleName());
+ assert stockPrice.getVisited().contains(IndirectStockWatcher.class.getSimpleName());
}
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EventPayload.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EventPayload.java 2010-12-30 14:39:31 UTC (rev 7161)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EventPayload.java 2010-12-30 14:51:34 UTC (rev 7162)
@@ -19,17 +19,17 @@
import java.util.ArrayList;
import java.util.List;
-class EventPayload
+abstract class EventPayload
{
- private List<Class<?>> classesVisited = new ArrayList<Class<?>>();
+ private List<String> visited = new ArrayList<String>();
- public List<Class<?>> getClassesVisited()
+ public List<String> getVisited()
{
- return classesVisited;
+ return visited;
}
- public void recordVisit(Object o)
+ public void recordVisit(String name)
{
- classesVisited.add(o.getClass());
+ visited.add(name);
}
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Farmer.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Farmer.java 2010-12-30 14:39:31 UTC (rev 7161)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Farmer.java 2010-12-30 14:51:34 UTC (rev 7162)
@@ -25,5 +25,10 @@
{
egg.recordVisit(this);
}
+
+ public String getName()
+ {
+ return Farmer.class.getSimpleName();
+ }
}
\ No newline at end of file
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/FarmerLocal.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/FarmerLocal.java 2010-12-30 14:39:31 UTC (rev 7161)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/FarmerLocal.java 2010-12-30 14:51:34 UTC (rev 7162)
@@ -21,5 +21,9 @@
public @Local interface FarmerLocal
{
+
void observeEggLaying(@Observes Egg egg);
+
+ public String getName();
+
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcher.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcher.java 2010-12-30 14:39:31 UTC (rev 7161)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcher.java 2010-12-30 14:51:34 UTC (rev 7162)
@@ -20,4 +20,11 @@
public @Stateful class IndirectStockWatcher extends IntermediateStockWatcher implements IndirectStockWatcherLocal,StockWatcherLocal
{
+
+ @Override
+ public String getName()
+ {
+ return IndirectStockWatcher.class.getSimpleName();
+ }
+
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IntermediateStockWatcher.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IntermediateStockWatcher.java 2010-12-30 14:39:31 UTC (rev 7161)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IntermediateStockWatcher.java 2010-12-30 14:51:34 UTC (rev 7162)
@@ -18,4 +18,10 @@
class IntermediateStockWatcher extends StockWatcher
{
+
+ @Override
+ public String getName()
+ {
+ return IntermediateStockWatcher.class.getSimpleName();
+ }
}
\ No newline at end of file
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmer.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmer.java 2010-12-30 14:39:31 UTC (rev 7161)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmer.java 2010-12-30 14:51:34 UTC (rev 7162)
@@ -20,4 +20,11 @@
public @Stateful class LazyFarmer extends Farmer implements LazyFarmerLocal,FarmerLocal
{
+
+ @Override
+ public String getName()
+ {
+ return LazyFarmer.class.getSimpleName();
+ }
+
}
\ No newline at end of file
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockPrice.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockPrice.java 2010-12-30 14:39:31 UTC (rev 7161)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockPrice.java 2010-12-30 14:51:34 UTC (rev 7162)
@@ -18,4 +18,10 @@
class StockPrice extends EventPayload
{
+
+ public void recordVisit(StockWatcherLocal stockWatcher)
+ {
+ recordVisit(stockWatcher.getName());
+ }
+
}
\ No newline at end of file
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcher.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcher.java 2010-12-30 14:39:31 UTC (rev 7161)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcher.java 2010-12-30 14:51:34 UTC (rev 7162)
@@ -25,5 +25,10 @@
{
price.recordVisit(this);
}
+
+ public String getName()
+ {
+ return StockWatcher.class.getSimpleName();
+ }
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcherLocal.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcherLocal.java 2010-12-30 14:39:31 UTC (rev 7161)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcherLocal.java 2010-12-30 14:51:34 UTC (rev 7162)
@@ -22,4 +22,7 @@
public @Local interface StockWatcherLocal
{
void observeStockPrice(@Observes StockPrice price);
+
+ String getName();
+
}
13 years, 11 months
Weld SVN: r7161 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-12-30 09:39:31 -0500 (Thu, 30 Dec 2010)
New Revision: 7161
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Egg.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EventPayload.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Farmer.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/FarmerLocal.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcher.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IntermediateStockWatcher.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmer.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockPrice.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcher.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcherLocal.java
Log:
CDITCK-202
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Egg.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Egg.java 2010-12-17 14:06:50 UTC (rev 7160)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Egg.java 2010-12-30 14:39:31 UTC (rev 7161)
@@ -18,4 +18,10 @@
class Egg extends EventPayload
{
+
+ public void recordVisit(FarmerLocal farmer)
+ {
+ recordVisit(farmer.getName());
+ }
+
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2010-12-17 14:06:50 UTC (rev 7160)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2010-12-30 14:39:31 UTC (rev 7161)
@@ -42,7 +42,9 @@
{
Egg egg = new Egg();
getCurrentManager().fireEvent(egg);
- assert typeSetMatches(egg.getClassesVisited(), Farmer.class, LazyFarmer.class);
+ assert egg.getVisited().size() == 2;
+ assert egg.getVisited().contains(Farmer.class.getSimpleName());
+ assert egg.getVisited().contains(LazyFarmer.class.getSimpleName());
}
@Test(groups = { "events", "inheritance" })
@@ -51,6 +53,9 @@
{
StockPrice stockPrice = new StockPrice();
getCurrentManager().fireEvent(stockPrice);
- assert typeSetMatches(stockPrice.getClassesVisited(), StockWatcher.class, IndirectStockWatcher.class, IntermediateStockWatcher.class);
+ assert stockPrice.getVisited().size() == 3;
+ assert stockPrice.getVisited().contains(StockWatcher.class.getSimpleName());
+ assert stockPrice.getVisited().contains(IntermediateStockWatcher.class.getSimpleName());
+ assert stockPrice.getVisited().contains(IndirectStockWatcher.class.getSimpleName());
}
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EventPayload.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EventPayload.java 2010-12-17 14:06:50 UTC (rev 7160)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EventPayload.java 2010-12-30 14:39:31 UTC (rev 7161)
@@ -19,17 +19,17 @@
import java.util.ArrayList;
import java.util.List;
-class EventPayload
+abstract class EventPayload
{
- private List<Class<?>> classesVisited = new ArrayList<Class<?>>();
+ private List<String> visited = new ArrayList<String>();
- public List<Class<?>> getClassesVisited()
+ public List<String> getVisited()
{
- return classesVisited;
+ return visited;
}
- public void recordVisit(Object o)
+ public void recordVisit(String name)
{
- classesVisited.add(o.getClass());
+ visited.add(name);
}
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Farmer.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Farmer.java 2010-12-17 14:06:50 UTC (rev 7160)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Farmer.java 2010-12-30 14:39:31 UTC (rev 7161)
@@ -25,5 +25,10 @@
{
egg.recordVisit(this);
}
+
+ public String getName()
+ {
+ return Farmer.class.getSimpleName();
+ }
}
\ No newline at end of file
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/FarmerLocal.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/FarmerLocal.java 2010-12-17 14:06:50 UTC (rev 7160)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/FarmerLocal.java 2010-12-30 14:39:31 UTC (rev 7161)
@@ -21,5 +21,9 @@
public @Local interface FarmerLocal
{
+
void observeEggLaying(@Observes Egg egg);
+
+ public String getName();
+
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcher.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcher.java 2010-12-17 14:06:50 UTC (rev 7160)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcher.java 2010-12-30 14:39:31 UTC (rev 7161)
@@ -20,4 +20,11 @@
public @Stateful class IndirectStockWatcher extends IntermediateStockWatcher implements IndirectStockWatcherLocal,StockWatcherLocal
{
+
+ @Override
+ public String getName()
+ {
+ return IndirectStockWatcher.class.getSimpleName();
+ }
+
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IntermediateStockWatcher.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IntermediateStockWatcher.java 2010-12-17 14:06:50 UTC (rev 7160)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IntermediateStockWatcher.java 2010-12-30 14:39:31 UTC (rev 7161)
@@ -18,4 +18,10 @@
class IntermediateStockWatcher extends StockWatcher
{
+
+ @Override
+ public String getName()
+ {
+ return IntermediateStockWatcher.class.getSimpleName();
+ }
}
\ No newline at end of file
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmer.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmer.java 2010-12-17 14:06:50 UTC (rev 7160)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmer.java 2010-12-30 14:39:31 UTC (rev 7161)
@@ -20,4 +20,11 @@
public @Stateful class LazyFarmer extends Farmer implements LazyFarmerLocal,FarmerLocal
{
+
+ @Override
+ public String getName()
+ {
+ return LazyFarmer.class.getSimpleName();
+ }
+
}
\ No newline at end of file
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockPrice.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockPrice.java 2010-12-17 14:06:50 UTC (rev 7160)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockPrice.java 2010-12-30 14:39:31 UTC (rev 7161)
@@ -18,4 +18,10 @@
class StockPrice extends EventPayload
{
+
+ public void recordVisit(StockWatcherLocal stockWatcher)
+ {
+ recordVisit(stockWatcher.getName());
+ }
+
}
\ No newline at end of file
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcher.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcher.java 2010-12-17 14:06:50 UTC (rev 7160)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcher.java 2010-12-30 14:39:31 UTC (rev 7161)
@@ -25,5 +25,10 @@
{
price.recordVisit(this);
}
+
+ public String getName()
+ {
+ return StockWatcher.class.getSimpleName();
+ }
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcherLocal.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcherLocal.java 2010-12-17 14:06:50 UTC (rev 7160)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcherLocal.java 2010-12-30 14:39:31 UTC (rev 7161)
@@ -22,4 +22,7 @@
public @Local interface StockWatcherLocal
{
void observeStockPrice(@Observes StockPrice price);
+
+ String getName();
+
}
13 years, 11 months
[weld/core] 11eb22: WELD-806
by noreply@github.com
Branch: refs/heads/master
Home: https://github.com/weld/core
Commit: 11eb22065c3899a87481fff1fb891360a6ed5f04
https://github.com/weld/core/commit/11eb22065c3899a87481fff1fb891360a6ed5f04
Author: Marius Bogoevici <marius.bogoevici(a)gmail.com>
Date: 2010-12-23 (Thu, 23 Dec 2010)
Changed paths:
M examples/jsf/pastecode/src/main/java/org/jboss/weld/examples/pastecode/session/PopulateDatabase.java
Log Message:
-----------
WELD-806
Commit: 040bfb30b7accd0af507b2162d7d0b485c22fecb
https://github.com/weld/core/commit/040bfb30b7accd0af507b2162d7d0b485c22fecb
Author: Marius Bogoevici <marius.bogoevici(a)gmail.com>
Date: 2010-12-23 (Thu, 23 Dec 2010)
Changed paths:
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithExclusions/Counter.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithExclusions/EjbInterceptor.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithExclusions/EjbInterceptor2.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithExclusions/EjbInterceptor3.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithExclusions/EjbInterceptor4.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithExclusions/Helper.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithExclusions/Simple.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithExclusions/SimpleImpl.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithExclusions/TestInjectionWithExclusions.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithMethodExclusions/Counter.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithMethodExclusions/EjbInterceptor.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithMethodExclusions/EjbInterceptor2.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithMethodExclusions/EjbInterceptor3.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithMethodExclusions/EjbInterceptor4.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithMethodExclusions/Helper.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithMethodExclusions/Simple.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithMethodExclusions/Simple2.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithMethodExclusions/Simple2Impl.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithMethodExclusions/SimpleImpl.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/injectionWithMethodExclusions/TestInjectionWithExclusionsOnMethods.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnClass/CdiInterceptor.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnClass/Counter.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnClass/EjbInterceptor.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnClass/InterceptorOrderTest.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnClass/Processor.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnClass/Secured.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnClass/SimpleProcessor.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnMethod/CdiInterceptor.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnMethod/CdiInterceptor2.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnMethod/Counted.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnMethod/Counter.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnMethod/EjbInterceptor.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnMethod/EjbInterceptor2.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnMethod/InterceptorOrderTest.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnMethod/Processor.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnMethod/Secured.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithEjbInterceptorOnMethod/SimpleProcessor.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithExclusions/CdiInterceptor.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithExclusions/CdiInterceptor2.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithExclusions/Counted.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithExclusions/Counter.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithExclusions/EjbInterceptor.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithExclusions/EjbInterceptor2.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithExclusions/InterceptorOrderTest.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithExclusions/Processor.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithExclusions/Secured.java
A tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/interceptorsOrderWithExclusions/SimpleProcessor.java
M tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/retry/FailingProcessor.java
M tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/retry/RetryInterceptor.java
M tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/retry/RetryInterceptorTest.java
M tests-arquillian/src/test/java/org/jboss/weld/tests/interceptors/retry/SecuredInterceptor.java
Log Message:
-----------
Various extended interceptor tests
13 years, 11 months