Weld SVN: r7065 - cdi-tck/branches/1.0/impl/src/main/resources.
by weld-commits@lists.jboss.org
Author: petemuir
Date: 2010-10-30 15:15:30 -0400 (Sat, 30 Oct 2010)
New Revision: 7065
Modified:
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
Log:
CDITCK-181
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-10-30 19:15:03 UTC (rev 7064)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-10-30 19:15:30 UTC (rev 7065)
@@ -16,18 +16,6 @@
<classes>
<!-- Issues in the TCK -->
- <!-- CDITCK-181 -->
- <class name="org.jboss.jsr299.tck.tests.lookup.clientProxy.ClientProxyTest">
- <methods>
- <exclude name="testInactiveScope" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.event.EventTest">
- <methods>
- <exclude name="testStaticObserverMethodInvoked" />
- </methods>
- </class>
-
<!-- CDITCK-182 -->
<class name="org.jboss.jsr299.tck.tests.policy.enterprise.SessionBeanPolicyTest">
<methods>
14 years, 3 months
Weld SVN: r7064 - cdi-tck/branches/1.0/impl/src/main/resources.
by weld-commits@lists.jboss.org
Author: petemuir
Date: 2010-10-30 15:15:03 -0400 (Sat, 30 Oct 2010)
New Revision: 7064
Modified:
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
Log:
CDITCK-180
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-10-30 19:14:25 UTC (rev 7063)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-10-30 19:15:03 UTC (rev 7064)
@@ -16,14 +16,6 @@
<classes>
<!-- Issues in the TCK -->
- <!-- CDITCK-180 -->
- <class name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.EnterpriseBeanSpecializationTest">
- <methods>
- <exclude name="testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean" />
- <exclude name="testSpecializingBeanHasNameOfSpecializedBean" />
- </methods>
- </class>
-
<!-- CDITCK-181 -->
<class name="org.jboss.jsr299.tck.tests.lookup.clientProxy.ClientProxyTest">
<methods>
14 years, 3 months
Weld SVN: r7063 - cdi-tck/branches/1.0/impl/src/main/resources.
by weld-commits@lists.jboss.org
Author: petemuir
Date: 2010-10-30 15:14:25 -0400 (Sat, 30 Oct 2010)
New Revision: 7063
Modified:
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
Log:
CDITCK-178
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-10-30 19:13:19 UTC (rev 7062)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-10-30 19:14:25 UTC (rev 7063)
@@ -16,13 +16,6 @@
<classes>
<!-- Issues in the TCK -->
- <!-- CDITCK-178 -->
- <class name="org.jboss.jsr299.tck.tests.decorators.definition.DecoratorDefinitionTest">
- <methods>
- <exclude name="testDecoratedTypes" />
- </methods>
- </class>
-
<!-- CDITCK-180 -->
<class name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.EnterpriseBeanSpecializationTest">
<methods>
14 years, 3 months
Weld SVN: r7062 - cdi-tck/branches/1.0/impl/src/main/resources.
by weld-commits@lists.jboss.org
Author: petemuir
Date: 2010-10-30 15:13:19 -0400 (Sat, 30 Oct 2010)
New Revision: 7062
Modified:
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
Log:
CDITCK-176
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-10-30 19:12:19 UTC (rev 7061)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-10-30 19:13:19 UTC (rev 7062)
@@ -16,38 +16,6 @@
<classes>
<!-- Issues in the TCK -->
- <!-- CDITCK-176 -->
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor.DecoratorWithNonPassivatingBeanConstructorTest">
- <methods>
- <exclude name="testPassivationCapableBeanWithNonPassivatingDecoratorBeanConstructorFails" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInitializerMethod.DecoratorWithNonPassivatingInitializerMethodTest">
- <methods>
- <exclude name="testPassivationCapableBeanWithNonPassivatingInitializerInDecoratorFails" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingInjectedField.DecoratorWithNonPassivatingInjectedFieldTest">
- <methods>
- <exclude name="testPassivationCapableBeanWithNonPassivatingDecoratorInjectedFieldFails" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.enterpriseBeanWithNonPassivatingDecorator.EnterpriseBeanWithNonPassivatingDecoratorTest">
- <methods>
- <exclude name="testEnterpriseBeanWithNonPassivatingDecoratorFails" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.DecoratorListedTwiceInBeansXmlTest">
- <methods>
- <exclude name="testDecoratorListedTwiceInBeansXmlNotOK" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.decorators.definition.broken.nonExistantClassInBeansXml.NonExistantDecoratorClassInBeansXmlTest">
- <methods>
- <exclude name="testNonExistantDecoratorClassInBeansXmlNotOK" />
- </methods>
- </class>
-
<!-- CDITCK-178 -->
<class name="org.jboss.jsr299.tck.tests.decorators.definition.DecoratorDefinitionTest">
<methods>
14 years, 3 months
Weld SVN: r7061 - cdi-tck/branches/1.0/impl/src/main/resources.
by weld-commits@lists.jboss.org
Author: petemuir
Date: 2010-10-30 15:12:19 -0400 (Sat, 30 Oct 2010)
New Revision: 7061
Modified:
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
Log:
CDITCK-138
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-10-30 19:11:59 UTC (rev 7060)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-10-30 19:12:19 UTC (rev 7061)
@@ -16,13 +16,6 @@
<classes>
<!-- Issues in the TCK -->
- <!-- CDITCK-138 -->
- <class name="org.jboss.jsr299.tck.tests.lookup.injectionpoint.InjectionPointTest">
- <methods>
- <exclude name="testIsDelegate" />
- </methods>
- </class>
-
<!-- CDITCK-176 -->
<class name="org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor.DecoratorWithNonPassivatingBeanConstructorTest">
<methods>
14 years, 3 months
Weld SVN: r7060 - cdi-tck/branches/1.0/impl/src/main/resources.
by weld-commits@lists.jboss.org
Author: petemuir
Date: 2010-10-30 15:11:59 -0400 (Sat, 30 Oct 2010)
New Revision: 7060
Modified:
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
Log:
CDITCK-137
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-10-30 19:11:36 UTC (rev 7059)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-10-30 19:11:59 UTC (rev 7060)
@@ -16,13 +16,6 @@
<classes>
<!-- Issues in the TCK -->
- <!-- CDITCK-137 -->
- <class name="org.jboss.jsr299.tck.tests.decorators.invocation.DecoratorInvocationTest">
- <methods>
- <exclude name="testChainedDecoratorInvocation" />
- </methods>
- </class>
-
<!-- CDITCK-138 -->
<class name="org.jboss.jsr299.tck.tests.lookup.injectionpoint.InjectionPointTest">
<methods>
14 years, 3 months
Weld SVN: r7059 - in cdi-tck/branches/1.0/impl/src/main: java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError and 2 other directories.
by weld-commits@lists.jboss.org
Author: petemuir
Date: 2010-10-30 15:11:36 -0400 (Sat, 30 Oct 2010)
New Revision: 7059
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
Log:
CDITCK-174
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java 2010-10-30 19:05:39 UTC (rev 7058)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java 2010-10-30 19:11:36 UTC (rev 7059)
@@ -38,7 +38,7 @@
observerMethod = null;
}
- public void observeObserverMethodForEventA(@Observes ProcessObserverMethod<EventA, EventAObserver> event)
+ public void observeObserverMethodForEventA(@Observes ProcessObserverMethod<EventAObserver, EventA> event)
{
eventTypes.add(event.getObserverMethod().getObservedType());
annotatedMethod = event.getAnnotatedMethod();
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java 2010-10-30 19:05:39 UTC (rev 7058)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java 2010-10-30 19:11:36 UTC (rev 7059)
@@ -23,7 +23,7 @@
class ProcessObserverMethodObserver implements Extension
{
- public void observeObserverMethodForEventB(@Observes ProcessObserverMethod<EventB, ?> event)
+ public void observeObserverMethodForEventB(@Observes ProcessObserverMethod<?, EventB> event)
{
event.addDefinitionError(new RuntimeException("Definition error for EventB"));
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java 2010-10-30 19:05:39 UTC (rev 7058)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java 2010-10-30 19:11:36 UTC (rev 7059)
@@ -22,7 +22,7 @@
class ProcessObserverMethodObserver implements Extension
{
- public void observeObserverMethodForEventC(@Observes ProcessObserverMethod<EventC, ?> event)
+ public void observeObserverMethodForEventC(@Observes ProcessObserverMethod<?, EventC> event)
{
throw new RuntimeException("Definition error for EventC");
}
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-10-30 19:05:39 UTC (rev 7058)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-10-30 19:11:36 UTC (rev 7059)
@@ -30,25 +30,6 @@
</methods>
</class>
- <!-- CDITCK-174 -->
- <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>
-
<!-- CDITCK-176 -->
<class name="org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor.DecoratorWithNonPassivatingBeanConstructorTest">
<methods>
14 years, 3 months
Weld SVN: r7058 - in cdi-tck/branches/1.0: impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver and 3 other directories.
by weld-commits@lists.jboss.org
Author: petemuir
Date: 2010-10-30 15:05:39 -0400 (Sat, 30 Oct 2010)
New Revision: 7058
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java
cdi-tck/branches/1.0/pom.xml
Log:
Update to CDI API 1.0 SP3
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java 2010-10-30 19:04:52 UTC (rev 7057)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/dependentIsConditionalObserver/AlarmSystem.java 2010-10-30 19:05:39 UTC (rev 7058)
@@ -21,7 +21,7 @@
class AlarmSystem
{
- public void onBreakInAttempt(@Observes(receive = Reception.IF_EXISTS) BreakIn breakIn)
+ public void onBreakInAttempt(@Observes(notifyObserver = Reception.IF_EXISTS) BreakIn breakIn)
{
assert false;
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java 2010-10-30 19:04:52 UTC (rev 7057)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/AnotherObserver.java 2010-10-30 19:05:39 UTC (rev 7058)
@@ -30,7 +30,7 @@
wasNotified = true;
}
- void conditionalObserve(@Observes(receive = Reception.IF_EXISTS) ConditionalEvent e)
+ void conditionalObserve(@Observes(notifyObserver = Reception.IF_EXISTS) ConditionalEvent e)
{
}
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java 2010-10-30 19:04:52 UTC (rev 7057)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/conditional/RecluseSpider.java 2010-10-30 19:05:39 UTC (rev 7058)
@@ -31,7 +31,7 @@
private boolean instanceNotified = false;
private Web web;
- public void observe(@Observes(receive = Reception.IF_EXISTS) ConditionalEvent someEvent)
+ public void observe(@Observes(notifyObserver = Reception.IF_EXISTS) ConditionalEvent someEvent)
{
notified = true;
instanceNotified = true;
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java 2010-10-30 19:04:52 UTC (rev 7057)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java 2010-10-30 19:05:39 UTC (rev 7058)
@@ -146,7 +146,7 @@
return TransactionPhase.IN_PROGRESS;
}
- public Reception receive()
+ public Reception notifyObserver()
{
return Reception.ALWAYS;
}
Modified: cdi-tck/branches/1.0/pom.xml
===================================================================
--- cdi-tck/branches/1.0/pom.xml 2010-10-30 19:04:52 UTC (rev 7057)
+++ cdi-tck/branches/1.0/pom.xml 2010-10-30 19:05:39 UTC (rev 7058)
@@ -78,7 +78,8 @@
<jboss.test.harness.version>1.1.0-CR6</jboss.test.harness.version>
<testng.version>5.10</testng.version>
<jsr250.api.version>1.0</jsr250.api.version>
- <cdi.api.version>1.0-SP2</cdi.api.version>
+ <cdi.api.version>1.0-SP3
+</cdi.api.version>
<atinject.api.version>1</atinject.api.version>
<ejb.api.version>3.1.0</ejb.api.version>
<jsr250.api.version>1.0</jsr250.api.version>
14 years, 3 months
Weld SVN: r7057 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint.
by weld-commits@lists.jboss.org
Author: petemuir
Date: 2010-10-30 15:04:52 -0400 (Sat, 30 Oct 2010)
New Revision: 7057
Removed:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cattery.java
Log:
CDITCK-138
Deleted: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cattery.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cattery.java 2010-10-30 17:28:10 UTC (rev 7056)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/Cattery.java 2010-10-30 19:04:52 UTC (rev 7057)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.injectionpoint;
-
-import javax.inject.Inject;
-
-public class Cattery
-{
-
- @Inject Cat cat;
-
- public Cat getCat()
- {
- return cat;
- }
-
-}
14 years, 3 months