Weld SVN: r5529 - cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-20 08:52:37 -0500 (Wed, 20 Jan 2010)
New Revision: 5529
Modified:
cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/beans.xml
Log:
backport CDITCK-90
Modified: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/beans.xml
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/beans.xml 2010-01-20 13:51:36 UTC (rev 5528)
+++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/definition/stereotype/inheritance/beans.xml 2010-01-20 13:52:37 UTC (rev 5529)
@@ -1,5 +1,5 @@
<beans>
<alternatives>
- <class>org.jboss.jsr299.tck.tests.definition.stereotype.inheritance.NamedRequestPolicyStereotype</class>
+ <stereotype>org.jboss.jsr299.tck.tests.definition.stereotype.inheritance.NamedRequestPolicyStereotype</stereotype>
</alternatives>
</beans>
14 years, 4 months
Weld SVN: r5528 - in cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests: decorators/definition/inject/delegateConstructor and 5 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-20 08:51:36 -0500 (Wed, 20 Jan 2010)
New Revision: 5528
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorDecorator.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/TimestampLogger.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/TimestampLogger.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/ObserverDecorator.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerDecorator.java
Log:
backport CDITCK-86
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorDecorator.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorDecorator.java 2010-01-20 13:50:18 UTC (rev 5527)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorDecorator.java 2010-01-20 13:51:36 UTC (rev 5528)
@@ -9,7 +9,7 @@
import javax.inject.Inject;
@Decorator
-class InteriorDecorator
+class InteriorDecorator implements Interior
{
@Inject @Delegate @Room Interior interior;
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java 2010-01-20 13:50:18 UTC (rev 5527)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateConstructor/TimestampLogger.java 2010-01-20 13:51:36 UTC (rev 5528)
@@ -26,7 +26,7 @@
*
*/
@Decorator
-public class TimestampLogger
+public class TimestampLogger implements Logger
{
public static final String PREFIX = TimestampLogger.class.getSimpleName();
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/TimestampLogger.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/TimestampLogger.java 2010-01-20 13:50:18 UTC (rev 5527)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateField/TimestampLogger.java 2010-01-20 13:51:36 UTC (rev 5528)
@@ -26,7 +26,7 @@
*
*/
@Decorator
-public class TimestampLogger
+public class TimestampLogger implements Logger
{
public static final String PREFIX = TimestampLogger.class.getSimpleName();
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java 2010-01-20 13:50:18 UTC (rev 5527)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/inject/delegateInitializerMethod/TimestampLogger.java 2010-01-20 13:51:36 UTC (rev 5528)
@@ -26,7 +26,7 @@
*
*/
@Decorator
-public class TimestampLogger
+public class TimestampLogger implements Logger
{
public static final String PREFIX = TimestampLogger.class.getSimpleName();
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java 2010-01-20 13:50:18 UTC (rev 5527)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator1.java 2010-01-20 13:51:36 UTC (rev 5528)
@@ -26,7 +26,7 @@
*
*/
@Decorator
-public class FooDecorator1
+public class FooDecorator1 implements Foo
{
private static InjectionPoint injectionPoint;
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java 2010-01-20 13:50:18 UTC (rev 5527)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/FooDecorator2.java 2010-01-20 13:51:36 UTC (rev 5528)
@@ -26,7 +26,7 @@
*
*/
@Decorator
-public class FooDecorator2
+public class FooDecorator2 implements Foo
{
private static InjectionPoint injectionPoint;
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/TimestampLogger.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/TimestampLogger.java 2010-01-20 13:50:18 UTC (rev 5527)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/TimestampLogger.java 2010-01-20 13:51:36 UTC (rev 5528)
@@ -26,7 +26,7 @@
*
*/
@Decorator
-public class TimestampLogger
+public class TimestampLogger implements Logger
{
public static final String PREFIX = TimestampLogger.class.getSimpleName();
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/ObserverDecorator.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/ObserverDecorator.java 2010-01-20 13:50:18 UTC (rev 5527)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/observer/ObserverDecorator.java 2010-01-20 13:51:36 UTC (rev 5528)
@@ -26,7 +26,7 @@
*
*/
@Decorator
-public class ObserverDecorator
+public class ObserverDecorator implements Observer
{
@Inject @Delegate
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerDecorator.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerDecorator.java 2010-01-20 13:50:18 UTC (rev 5527)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerDecorator.java 2010-01-20 13:51:36 UTC (rev 5528)
@@ -26,7 +26,7 @@
*
*/
@Decorator
-public class ProducerDecorator
+public class ProducerDecorator implements Producer
{
@Inject @Delegate
14 years, 4 months
Weld SVN: r5527 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-20 08:50:18 -0500 (Wed, 20 Jan 2010)
New Revision: 5527
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java
Log:
backport CDITCK-87
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2010-01-20 13:49:32 UTC (rev 5526)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2010-01-20 13:50:18 UTC (rev 5527)
@@ -61,7 +61,7 @@
boolean implementsInterface = false;
for (Class<?> interfaze : decorators.get(0).getClass().getInterfaces())
{
- if (interfaze.equals(Decorator.class))
+ if (Decorator.class.isAssignableFrom(interfaze))
{
implementsInterface = true;
break;
14 years, 4 months
Weld SVN: r5526 - in cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests: lookup/typesafe/resolution and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-20 08:49:32 -0500 (Wed, 20 Jan 2010)
New Revision: 5526
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/FunnelWeaver.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cat.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DomesticCat.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Emu.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FlightlessBird.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Lion.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java
Log:
backport CDITCK-84
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/FunnelWeaver.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/FunnelWeaver.java 2010-01-20 13:48:06 UTC (rev 5525)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/FunnelWeaver.java 2010-01-20 13:49:32 UTC (rev 5526)
@@ -1,6 +1,14 @@
package org.jboss.jsr299.tck.tests.implementation.producer.method.definition;
+import javax.enterprise.inject.Alternative;
+
class FunnelWeaver<T>
{
+ String name;
+
+ FunnelWeaver(String name)
+ {
+ this.name = name;
+ }
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java 2010-01-20 13:48:06 UTC (rev 5525)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/SpiderProducer.java 2010-01-20 13:49:32 UTC (rev 5526)
@@ -28,7 +28,7 @@
@Produces public FunnelWeaver<Spider> getFunnelWeaverSpider()
{
- return new FunnelWeaver<Spider>();
+ return new FunnelWeaver<Spider>("Weaver");
}
@Produces public Animal makeASpider()
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java 2010-01-20 13:48:06 UTC (rev 5525)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/AnimalFarmer.java 2010-01-20 13:49:32 UTC (rev 5526)
@@ -2,5 +2,8 @@
class AnimalFarmer extends Farmer<Animal>
{
-
+ AnimalFarmer()
+ {
+ super("AnimalFarmer");
+ }
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cat.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cat.java 2010-01-20 13:48:06 UTC (rev 5525)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Cat.java 2010-01-20 13:49:32 UTC (rev 5526)
@@ -2,5 +2,10 @@
public class Cat<T>
{
+ String name;
+ public Cat(String name)
+ {
+ this.name = name;
+ }
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DomesticCat.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DomesticCat.java 2010-01-20 13:48:06 UTC (rev 5525)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/DomesticCat.java 2010-01-20 13:49:32 UTC (rev 5526)
@@ -6,7 +6,7 @@
public DomesticCat(String name)
{
- // TODO Auto-generated constructor stub
+ super(name);
}
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Emu.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Emu.java 2010-01-20 13:48:06 UTC (rev 5525)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Emu.java 2010-01-20 13:49:32 UTC (rev 5526)
@@ -5,5 +5,8 @@
@Typed(FlightlessBird.class)
public class Emu extends FlightlessBird<Australian>
{
-
+ public Emu()
+ {
+ super("Emu");
+ }
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java 2010-01-20 13:48:06 UTC (rev 5525)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Farmer.java 2010-01-20 13:49:32 UTC (rev 5526)
@@ -2,5 +2,11 @@
class Farmer<T>
{
+ String name;
+ Farmer(String name)
+ {
+ this.name = name;
+ }
+
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FlightlessBird.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FlightlessBird.java 2010-01-20 13:48:06 UTC (rev 5525)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/FlightlessBird.java 2010-01-20 13:49:32 UTC (rev 5526)
@@ -3,4 +3,11 @@
public class FlightlessBird<T>
{
+ String name;
+
+ public FlightlessBird(String name)
+ {
+ this.name = name;
+ }
+
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Lion.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Lion.java 2010-01-20 13:48:06 UTC (rev 5525)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Lion.java 2010-01-20 13:49:32 UTC (rev 5526)
@@ -5,7 +5,7 @@
public Lion(String name)
{
- // TODO Auto-generated constructor stub
+ super(name);
}
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java 2010-01-20 13:48:06 UTC (rev 5525)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ScottishFishFarmer.java 2010-01-20 13:49:32 UTC (rev 5526)
@@ -2,5 +2,8 @@
class ScottishFishFarmer extends Farmer<ScottishFish>
{
-
+ ScottishFishFarmer()
+ {
+ super("ScottishFishFarmer");
+ }
}
14 years, 4 months
Weld SVN: r5525 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-20 08:48:06 -0500 (Wed, 20 Jan 2010)
New Revision: 5525
Added:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Spidery.java
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java
Log:
backport r5273
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java 2010-01-20 13:41:04 UTC (rev 5524)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Foo.java 2010-01-20 13:48:06 UTC (rev 5525)
@@ -1,3 +1,20 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright <Year>, Red Hat, Inc. and/or its affiliates, 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.producer.field.definition;
import static java.lang.annotation.ElementType.FIELD;
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java 2010-01-20 13:41:04 UTC (rev 5524)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderConsumer.java 2010-01-20 13:48:06 UTC (rev 5525)
@@ -4,7 +4,7 @@
class FunnelWeaverSpiderConsumer
{
- @Inject
+ @Inject @Spidery
private FunnelWeaver<Spider> injectedSpider;
public FunnelWeaver<Spider> getInjectedSpider()
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java 2010-01-20 13:41:04 UTC (rev 5524)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/FunnelWeaverSpiderProducer.java 2010-01-20 13:48:06 UTC (rev 5525)
@@ -5,8 +5,10 @@
class FunnelWeaverSpiderProducer
{
private static FunnelWeaver<Spider> spider;
- @Produces public FunnelWeaver<Spider> getFunnelWeaverSpider = new FunnelWeaver<Spider>();
+ @Produces @Spidery
+ public FunnelWeaver<Spider> getFunnelWeaverSpider = new FunnelWeaver<Spider>();
+
public FunnelWeaverSpiderProducer()
{
spider = this.getFunnelWeaverSpider;
Added: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Spidery.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Spidery.java (rev 0)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Spidery.java 2010-01-20 13:48:06 UTC (rev 5525)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright <Year>, Red Hat, Inc. and/or its affiliates, 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.producer.field.definition;
+
+import javax.inject.Qualifier;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@Qualifier
+@interface Spidery
+{
+
+}
\ No newline at end of file
Property changes on: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/Spidery.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
14 years, 4 months
Weld SVN: r5524 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-20 08:41:04 -0500 (Wed, 20 Jan 2010)
New Revision: 5524
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/DogAgent.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java
Log:
backport CDITCK-75
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/DogAgent.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/DogAgent.java 2010-01-20 13:38:35 UTC (rev 5523)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/DogAgent.java 2010-01-20 13:41:04 UTC (rev 5524)
@@ -3,7 +3,6 @@
import static javax.ejb.TransactionManagementType.BEAN;
import javax.annotation.Resource;
-import javax.annotation.security.RunAs;
import javax.ejb.EJBException;
import javax.ejb.Stateless;
import javax.ejb.TransactionManagement;
@@ -15,7 +14,6 @@
@Stateless
@TransactionManagement(BEAN)
-@RunAs("Bubba")
@Named
@Default
public class DogAgent implements Agent
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java 2010-01-20 13:38:35 UTC (rev 5523)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java 2010-01-20 13:41:04 UTC (rev 5524)
@@ -50,19 +50,6 @@
dog = (PomeranianInterface) getInstanceByName("Teddy");
}
-// @AfterMethod(alwaysRun = true)
-// public void teardownTest()
-// {
-// try
-// {
-// dog.removeSessionBean();
-// }
-// catch (Exception e)
-// {
-// // Not important since the bean is now gone one way or the other
-// }
-// }
-
@Test(groups = { "events", "integration" })
@SpecAssertion(section = "10.4.4", id = "a")
public void testTransactionalObserverNotifiedImmediatelyWhenNoTransactionInProgress()
@@ -73,8 +60,6 @@
assert dogAgent != null;
dogAgent.sendOutsideTransaction(BigInteger.TEN);
assert dog.isCorrectTransactionState();
- // TODO Fix the security contexts
- // assert dog.isCorrectContext();
}
@Test(groups = { "events", "integration" })
@@ -135,8 +120,6 @@
Agent dogAgent = getInstanceByType(Agent.class);
dogAgent.sendInTransaction(new RuntimeException("test event"));
assert dog.isCorrectTransactionState();
- // TODO Fix the security contexts
- // assert dog.isCorrectContext();
}
@Test(groups = { "events", "integration" })
14 years, 4 months
Weld SVN: r5523 - in cdi-tck/branches/1.0/impl/src/main: java/org/jboss/jsr299/tck/interceptors/tests/invocationContext and 20 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-20 08:38:35 -0500 (Wed, 20 Jan 2010)
New Revision: 5523
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/InvocationContextTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/CustomDecoratorTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java
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/newBean/NewEnterpriseBeanICTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/SessionBeanInterceptorOrderTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
Log:
Remove all groups for broken tests
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/definition/DefinitionTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -26,9 +26,10 @@
@SpecVersion(spec = "int", version = "3.1.PFD")
public class DefinitionTest extends AbstractJSR299Test
{
- @Test(groups="ri-broken")
- @SpecAssertion(section = "1", id= "a")
- public void testInterceptorMethodDefinedOnTargetClass() {
+ @Test
+ @SpecAssertion(section = "1", id = "a")
+ public void testInterceptorMethodDefinedOnTargetClass()
+ {
assert getInstanceByType(ClassWithAroundInvokeMethod.class).foo().equals("barbar");
}
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/InvocationContextTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/InvocationContextTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/InvocationContextTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -43,7 +43,7 @@
assert Interceptor1.isGetTargetOK();
}
- @Test(groups="jboss-as-broken")
+ @Test
@SpecAssertion(section = "6", id = "f")
public void testGetTimerMethod()
{
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/InvocationOrderTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -27,7 +27,7 @@
@SpecVersion(spec = "int", version = "3.1.PFD")
public class InvocationOrderTest extends AbstractJSR299Test
{
- @Test(groups="ri-broken")
+ @Test
@SpecAssertions({
@SpecAssertion(section = "5.1", id = "c"),
@SpecAssertion(section = "5.1", id = "d"),
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -20,8 +20,10 @@
@SpecVersion(spec="cdi", version="20091101")
public class EJBApplicationContextTest extends AbstractJSR299Test
{
- @Test(groups = { "rewrite", "contexts", "webservice", "integration", "jboss-as-broken" })
+
+ @Test(groups = { "rewrite", "contexts", "webservice", "integration", "broken" })
@SpecAssertion(section = "6.7.3", id = "b")
+ // CDITCK-60
public void testApplicationScopeActiveDuringWebServiceInvocation()
{
//TODO This test might work better with a separate client over HTTP
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ejb/EJBRequestContextTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -25,8 +25,7 @@
* bean, during any call to an EJB timeout method and during message delivery
* to any EJB message driven bean.
*/
- // WELD-12
- @Test(groups = { "jboss-as-broken", "contexts", "ejb3.1", "integration" })
+ @Test(groups = { "contexts", "ejb3.1", "integration" })
@SpecAssertion(section = "6.7.1", id = "gc")
public void testRequestScopeActiveDuringCallToEjbTimeoutMethod() throws Exception
{
@@ -40,8 +39,7 @@
* The request context is destroyed after the remote method invocation,
* timeout or message delivery completes.
*/
- // WELD-12
- @Test(groups = { "jboss-as-broken", "contexts", "ejb3.1", "integration" })
+ @Test(groups = { "contexts", "ejb3.1", "integration" })
@SpecAssertion(section = "6.7.1", id = "hc")
public void testRequestScopeDestroyedAfterCallToEjbTimeoutMethod() throws Exception
{
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/CustomDecoratorTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/CustomDecoratorTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/CustomDecoratorTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -36,9 +36,8 @@
@Extension("javax.enterprise.inject.spi.Extension")
public class CustomDecoratorTest extends AbstractJSR299Test
{
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertion(section = "8.3", id = "b")
- // WELD-269
public void testCustomImplementationOfDecoratorInterface()
{
assert getInstanceByType(Vehicle.class).start().equals("Bus started and decorated.");
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/custom/broken/finalBeanClass/CustomDecoratorMatchingBeanWithFinalClassTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -35,9 +35,8 @@
@ExpectedDeploymentException(DeploymentFailure.class)
public class CustomDecoratorMatchingBeanWithFinalClassTest extends AbstractJSR299Test
{
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertion(section = "8.3", id = "ab")
- // WELD-274
public void testCustomDecoratorDecoratingFinalBean()
{
assert false;
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanClass/FinalBeanClassTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -36,9 +36,8 @@
public class FinalBeanClassTest extends AbstractJSR299Test
{
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertion(section="8.3", id="ab")
- // WELD-272
public void testAppliesToFinalManagedBeanClass()
{
assert false;
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/finalBeanMethod/FinalBeanMethodTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -36,9 +36,8 @@
public class FinalBeanMethodTest extends AbstractJSR299Test
{
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertion(section="8.3", id="ac")
- // WELD-272
public void testAppliesToFinalMethodOnManagedBeanClass()
{
assert false;
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -39,7 +39,7 @@
public class EJBDecoratorInvocationTest extends AbstractJSR299Test
{
- @Test(groups="ri-broken")
+ @Test
@SpecAssertions({
@SpecAssertion(section="7.2", id="d")
})
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -60,7 +60,7 @@
return artifact;
}
- @Test(groups = {"jboss-as-broken"})
+ @Test
@SpecAssertions({
@SpecAssertion(section = "12.1", id="bbb")
})
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -17,7 +17,7 @@
@SpecVersion(spec="cdi", version="20091101")
public class SingletonWithRequestScopeTest extends AbstractJSR299Test
{
- @Test(groups = { "jboss-as-broken" })
+ @Test
@SpecAssertion(section = "3.2", id = "da")
public void testSingletonWithRequestScopeFails()
{
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/broken/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -17,7 +17,7 @@
@SpecVersion(spec="cdi", version="20091101")
public class SingletonWithSessionScopeTest extends AbstractJSR299Test
{
- @Test(groups = { "jboss-as-broken" })
+ @Test
@SpecAssertion(section = "3.2", id = "da")
public void testSingletonWithSessionScopeFails()
{
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-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -36,7 +36,7 @@
}
- @Test(groups = { "new", "jboss-as-broken" })
+ @Test(groups = { "new" })
@SpecAssertion(section = "3.7.1", id = "ab")
public void testConstructorAnnotatedInjectCalled()
{
@@ -71,9 +71,8 @@
assert !dogBean.getTypes().contains(Pitbull.class);
}
- @Test(groups = { "ejb 3.1", "jboss-as-broken" })
+ @Test(groups = { "ejb 3.1" })
@SpecAssertion(section = "3.2.2", id = "ba")
- // WBRI-231
public void testEnterpriseBeanClassLocalView()
{
//TODO We need a 3.1 compliant container for this test
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -22,7 +22,7 @@
public class NewEnterpriseBeanICTest extends AbstractJSR299Test
{
- @Test(groups = { "new", "jboss-as-broken" })
+ @Test(groups = { "new" })
@SpecAssertion(section = "3.12", id = "l")
public void testNewBeanHasSameConstructor()
{
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/SessionBeanInterceptorOrderTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/SessionBeanInterceptorOrderTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/SessionBeanInterceptorOrderTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -18,7 +18,7 @@
@BeansXml("beans.xml")
public class SessionBeanInterceptorOrderTest extends AbstractJSR299Test
{
- @Test(groups = "jboss-as-broken")
+ @Test
@SpecAssertion(section = "9.4", id = "fb")
public void testInterceptorsDeclaredUsingInterceptorsCalledBeforeInterceptorBinding()
{
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -57,13 +57,12 @@
assert getInstanceByType(InjectedSessionBeanLocal.class).getFarm().isInjectionPerformedCorrectly();
}
- //@Test(groups = "jboss-as-broken")
+ @Test
@SpecAssertions({
@SpecAssertion(section = "5.5", id = "ed"),
@SpecAssertion(section = "5.5.2", id = "ao"),
@SpecAssertion(section = "5.5.2", id = "ap")
})
- //JBAS-7046
public void testInjectionOnEJBInterceptor()
{
// Test interceptor that intercepts contextual Session Bean
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ContainerEventTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -62,12 +62,11 @@
@SpecVersion(spec = "cdi", version = "20091101")
public class ContainerEventTest extends AbstractJSR299Test
{
- @Test(groups = "jboss-as-broken")
+ @Test
@SpecAssertions({
@SpecAssertion(section = "11.5.6", id = "aac"),
@SpecAssertion(section = "11.5.6", id = "abc"),
@SpecAssertion(section = "12.3", id = "de")})
- // WELDINT-22
public void testProcessInjectionTargetEventFiredForServletListener()
{
assert ProcessInjectionTargetObserver.getListenerEvent() != null;
@@ -85,36 +84,33 @@
validateTagHandlerAnnotatedType(ProcessInjectionTargetObserver.getTagHandlerEvent().getAnnotatedType());
}
- @Test(groups = "jboss-as-broken")
+ @Test
@SpecAssertions({
@SpecAssertion(section = "11.5.6", id = "aae"),
@SpecAssertion(section = "11.5.6", id = "abe"),
@SpecAssertion(section = "12.3", id = "dg")})
- // WELDINT-22
public void testProcessInjectionTargetEventFiredForTagLibraryListener()
{
assert ProcessInjectionTargetObserver.getTagLibraryListenerEvent() != null;
validateTagLibraryListenerAnnotatedType(ProcessInjectionTargetObserver.getTagLibraryListenerEvent().getAnnotatedType());
}
- @Test(groups = "jboss-as-broken")
+ @Test
@SpecAssertions({
@SpecAssertion(section = "11.5.6", id = "aah"),
@SpecAssertion(section = "11.5.6", id = "abh"),
@SpecAssertion(section = "12.3", id = "dj")})
- // WELDINT-22
public void testProcessInjectionTargetEventFiredForServlet()
{
assert ProcessInjectionTargetObserver.getServletEvent() != null;
validateServletAnnotatedType(ProcessInjectionTargetObserver.getServletEvent().getAnnotatedType());
}
- @Test(groups = "jboss-as-broken")
+ @Test
@SpecAssertions({
@SpecAssertion(section = "11.5.6", id = "aai"),
@SpecAssertion(section = "11.5.6", id = "abi"),
@SpecAssertion(section = "12.3", id = "dk")})
- // WELDINT-22
public void testProcessInjectionTargetEventFiredForFilter()
{
assert ProcessInjectionTargetObserver.getFilterEvent() != null;
@@ -129,13 +125,12 @@
validateJsfManagedBeanAnnotatedType(ProcessInjectionTargetObserver.getJsfManagedBeanEvent().getAnnotatedType());
}
- @Test(groups = "jboss-as-broken")
+ @Test
@SpecAssertions({
@SpecAssertion(section = "11.5.6", id = "aas"),
@SpecAssertion(section = "11.5.6", id = "aao"),
@SpecAssertion(section = "11.5.6", id = "aan"),
@SpecAssertion(section = "11.5.6", id = "aap")})
- // WELDINT-22
public void testTypeOfProcessInjectionTargetParameter() {
assert !ProcessInjectionTargetObserver.isStringObserved();
assert ProcessInjectionTargetObserver.isTagHandlerSubTypeObserved();
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -37,7 +37,7 @@
@WebServiceRef(wsdlLocation = "http://localhost:8080/org.jboss.jsr299.tck.tests.lookup.injection.non.con...")
SheepWSEndPointService service;
- @Test(groups = "jboss-as-broken")
+ @Test
@SpecAssertions({
@SpecAssertion(section = "5.5", id = "ee"),
@SpecAssertion(section = "5.5.2", id = "aq"),
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/broken/not/bean/InjectionPointTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -28,16 +28,16 @@
import org.testng.annotations.Test;
@Artifact
-@SpecVersion(spec="cdi", version="20091101")
+@SpecVersion(spec = "cdi", version = "20091101")
@ExpectedDeploymentException(DeploymentFailure.class)
@IntegrationTest
@Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml")
public class InjectionPointTest extends AbstractJSR299Test
{
- @Test(groups = "jboss-as-broken")
+ @Test
@SpecAssertion(section = "5.5.7", id = "ga")
- //WELDINT-26
- public void testDefinitionErrorDetected() {
+ public void testDefinitionErrorDetected()
+ {
assert false;
}
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2010-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2010-01-20 13:38:35 UTC (rev 5523)
@@ -11,12 +11,11 @@
@Artifact
@IntegrationTest
-@SpecVersion(spec="cdi", version="20091101")
+@SpecVersion(spec = "cdi", version = "20091101")
public class ManagerTest extends AbstractJSR299Test
{
- @Test(groups = { "manager", "ejb3", "integration", "jboss-as-broken" })
+ @Test(groups = { "manager", "ejb3", "integration"})
@SpecAssertion(section = "11.3", id = "da")
- // Requires new injection framework carlo is working on I think PLM
public void testManagerLookupInJndi() throws Exception
{
BeanManager beanManager = getInstanceByType(JndiBeanManagerInjected.class).getManagerFromJndi();
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-01-20 13:27:41 UTC (rev 5522)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-01-20 13:38:35 UTC (rev 5523)
@@ -7,13 +7,9 @@
<selector-class name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector" />
</method-selector>
</method-selectors>
- <groups>
- <run>
- <exclude name="broken" />
- </run>
- </groups>
<packages>
<package name="org.jboss.jsr299.tck.tests.*" />
+ <package name="org.jboss.jsr299.tck.interceptors.tests.*" />
</packages>
</test>
14 years, 4 months
Weld SVN: r5522 - core/trunk/jboss-as.
by weld-commits＠lists.jboss.org
Author: mgencur(a)redhat.com
Date: 2010-01-20 08:27:41 -0500 (Wed, 20 Jan 2010)
New Revision: 5522
Modified:
core/trunk/jboss-as/build.xml
core/trunk/jboss-as/pom.xml
Log:
added updating of all configuration of JBossAS
Modified: core/trunk/jboss-as/build.xml
===================================================================
--- core/trunk/jboss-as/build.xml 2010-01-19 17:33:51 UTC (rev 5521)
+++ core/trunk/jboss-as/build.xml 2010-01-20 13:27:41 UTC (rev 5522)
@@ -2,7 +2,7 @@
<project name="JBoss5DeployerInstall" default="update" basedir=".">
<target name="update" description="Update JBoss 5.x or 6.x for Weld">
- <fail message="Use mvn -Pupdate-jboss-as"/>
+ <fail message="Set JBOSS_HOME environment variable and use mvn -Pupdate-jboss-as"/>
</target>
</project>
Modified: core/trunk/jboss-as/pom.xml
===================================================================
--- core/trunk/jboss-as/pom.xml 2010-01-19 17:33:51 UTC (rev 5521)
+++ core/trunk/jboss-as/pom.xml 2010-01-20 13:27:41 UTC (rev 5522)
@@ -110,6 +110,13 @@
<include name="**/*" />
</fileset>
</copy>
+
+ <copy
+ todir="${jboss.home}/server/all/deployers/weld.deployer">
+ <fileset dir="target/weld.deployer">
+ <include name="**/*" />
+ </fileset>
+ </copy>
</tasks>
</configuration>
</execution>
14 years, 4 months
Weld SVN: r5521 - in cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken: exceptionInAfterBeanDiscoveryObserver and 1 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-19 12:33:51 -0500 (Tue, 19 Jan 2010)
New Revision: 5521
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java
Log:
oops
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2010-01-19 17:30:30 UTC (rev 5520)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDeploymentProblem/AddDeploymentProblemTest.java 2010-01-19 17:33:51 UTC (rev 5521)
@@ -23,6 +23,7 @@
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.jsr299.Extension;
import org.testng.annotations.Test;
@@ -38,6 +39,7 @@
@Extension(value="javax.enterprise.inject.spi.Extension")
@ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
+@IntegrationTest
public class AddDeploymentProblemTest extends AbstractJSR299Test
{
@Test(groups={"rewrite"})
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2010-01-19 17:30:30 UTC (rev 5520)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanDiscoveryObserver/AfterBeanDiscoveryObserverExecutionFailureTest.java 2010-01-19 17:33:51 UTC (rev 5521)
@@ -6,6 +6,7 @@
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.jsr299.Extension;
import org.testng.annotations.Test;
@@ -20,6 +21,7 @@
@ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@Extension(value="javax.enterprise.inject.spi.Extension")
+@IntegrationTest
public class AfterBeanDiscoveryObserverExecutionFailureTest extends AbstractJSR299Test
{
@Test(groups={"rewrite"})
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2010-01-19 17:30:30 UTC (rev 5520)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/exceptionInAfterBeanValidationObserver/AfterDeploymentValidationObserverExecutionFailureTest.java 2010-01-19 17:33:51 UTC (rev 5521)
@@ -23,6 +23,7 @@
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
import org.jboss.testharness.impl.packaging.jsr299.Extension;
import org.testng.annotations.Test;
@@ -37,6 +38,7 @@
@ExpectedDeploymentException(DeploymentFailure.class)
@SpecVersion(spec="cdi", version="20091101")
@Extension(value="javax.enterprise.inject.spi.Extension")
+@IntegrationTest
public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test
{
14 years, 4 months
Weld SVN: r5520 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname and 3 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-01-19 12:30:30 -0500 (Tue, 19 Jan 2010)
New Revision: 5520
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java
core/trunk/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java
core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java
core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
Log:
CDITCK-91
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2010-01-19 17:29:12 UTC (rev 5519)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2010-01-19 17:30:30 UTC (rev 5520)
@@ -102,7 +102,7 @@
}
}
- assert bean != null;
+ assert bean == null;
assert specializedBean != null;
assert specializedBean.getBeanClass().getSuperclass().equals(Lion.class);
}
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2010-01-19 17:29:12 UTC (rev 5519)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/byname/ResolutionByNameTest.java 2010-01-19 17:30:30 UTC (rev 5520)
@@ -44,7 +44,7 @@
{
// Cod, Plaice and AlaskaPlaice are named "whitefish" - Cod is a not-enabled policy, AlaskaPlaice specializes Plaice
Set<Bean<?>> beans = getCurrentManager().getBeans("whitefish");
- assert beans.size() == 2;
+ assert beans.size() == 1;
assert getCurrentManager().resolve(beans).getTypes().contains(AlaskaPlaice.class);
// Both Salmon and Sole are named "fish" - Sole is an enabled policy
beans = getCurrentManager().getBeans("fish");
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java 2010-01-19 17:29:12 UTC (rev 5519)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/Validator.java 2010-01-19 17:30:30 UTC (rev 5520)
@@ -347,7 +347,7 @@
for (String name : namedAccessibleBeans.keySet())
{
- Set<Bean<?>> resolvedBeans = beanManager.getBeanResolver().resolve(namedAccessibleBeans.get(name));
+ Set<Bean<?>> resolvedBeans = beanManager.getBeanResolver().resolve(Beans.removeDisabledAndSpecializedBeans(namedAccessibleBeans.get(name), beanManager.getEnabledAlternativeClasses(), beanManager.getEnabledAlternativeStereotypes(), beanManager.getSpecializedBeans()));
if (resolvedBeans.size() > 1)
{
throw new DeploymentException(AMBIGUOUS_EL_NAME, name, resolvedBeans);
Modified: core/trunk/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java 2010-01-19 17:29:12 UTC (rev 5519)
+++ core/trunk/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java 2010-01-19 17:30:30 UTC (rev 5520)
@@ -58,7 +58,7 @@
matchedBeans.add(bean);
}
}
- return Beans.retainEnabledAlternatives(matchedBeans, beanManager.getEnabledAlternativeClasses(), beanManager.getEnabledAlternativeStereotypes());
+ return Beans.removeDisabledAndSpecializedBeans(matchedBeans, beanManager.getEnabledAlternativeClasses(), beanManager.getEnabledAlternativeStereotypes(), beanManager.getSpecializedBeans());
}
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java 2010-01-19 17:29:12 UTC (rev 5519)
+++ core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeBeanResolver.java 2010-01-19 17:30:30 UTC (rev 5520)
@@ -68,7 +68,7 @@
for (Bean<?> bean : from)
{
- if (alternativePresent ? bean.isAlternative() : true && !Beans.isSpecialized(bean, from, beanManager.getSpecializedBeans()))
+ if (alternativePresent ? bean.isAlternative() : true)
{
disambiguatedBeans.add(bean);
}
@@ -112,7 +112,7 @@
@Override
protected Set<T> filterResult(Set<T> matched)
{
- return Beans.retainEnabledAlternatives(matched, beanManager.getEnabledAlternativeClasses(), beanManager.getEnabledAlternativeStereotypes());
+ return Beans.removeDisabledAndSpecializedBeans(matched, beanManager.getEnabledAlternativeClasses(), beanManager.getEnabledAlternativeStereotypes(), getBeanManager().getSpecializedBeans());
}
@Override
Modified: core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
===================================================================
--- core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2010-01-19 17:29:12 UTC (rev 5519)
+++ core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2010-01-19 17:30:30 UTC (rev 5520)
@@ -112,7 +112,17 @@
<exclude name="testProducerPoliciesOnClass" />
<exclude name="testProducerPoliciesOnMethodAndField" />
</methods>
- ></class>
+ </class>
+ <class name="org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.SimpleBeanLifecycleTest">
+ <methods>
+ <exclude name="testSpecializedBeanExtendsManagedBean" />
+ </methods>
+ </class>
+ <class name="org.jboss.jsr299.tck.tests.lookup.byname.ResolutionByNameTest">
+ <methods>
+ <exclude name="testAmbiguousELNamesResolved" />
+ </methods>
+ </class>
</classes>
</test>
14 years, 4 months