[webbeans-commits] Webbeans SVN: r1259 - in tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit: inheritance/specialization/enterprise and 8 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Wed Jan 28 04:01:00 EST 2009
Author: shane.bryzak at jboss.com
Date: 2009-01-28 04:00:59 -0500 (Wed, 28 Jan 2009)
New Revision: 1259
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/ManagerTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java
Log:
updated inheritance and lookup tests to latest spec
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java 2009-01-28 08:29:38 UTC (rev 1258)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/realization/RealizationTest.java 2009-01-28 09:00:59 UTC (rev 1259)
@@ -13,6 +13,11 @@
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.testng.annotations.Test;
+/**
+ *
+ * Spec version: PRD2
+ *
+ */
public class RealizationTest extends AbstractTest
{
@@ -28,7 +33,7 @@
return deploymentTypes;
}
- @Test @SpecAssertion(section="4.1")
+ @Test @SpecAssertion(section="4.4")
public void testRealizedBeanWithProducerMethodHasSameScope()
{
deployBeans(Cow.class);
@@ -36,7 +41,7 @@
assert manager.resolveByType(Dung.class, SMELLY_LITERAL).iterator().next().getScopeType().equals(RequestScoped.class);
}
- @Test @SpecAssertion(section="4.1")
+ @Test @SpecAssertion(section="4.4")
public void testRealizedBeanWithProducerMethodHasDeploymentTypeOfRealizingClass()
{
deployBeans(Cow.class);
@@ -44,7 +49,7 @@
assert manager.resolveByType(Dung.class, SMELLY_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
}
- @Test @SpecAssertion(section="4.1")
+ @Test @SpecAssertion(section="4.4")
public void testRealizedBeanWithProducerMethodHasSameBindings()
{
deployBeans(Cow.class);
@@ -53,7 +58,7 @@
assert manager.resolveByType(Dung.class, SMELLY_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Smelly.class);
}
- @Test at SpecAssertion(section="4.1")
+ @Test at SpecAssertion(section="4.4")
public void testRealizedBeanWithProducerMethodHasBindingsOfMethodAndRealizingType()
{
deployBeans(TameCow.class);
@@ -62,7 +67,7 @@
assert annotationSetMatches(manager.resolveByType(Dung.class, SMELLY_LITERAL).iterator().next().getBindings(), Smelly.class, Tame.class);
}
- @Test @SpecAssertion(section="4.1")
+ @Test @SpecAssertion(section="4.4")
public void testRealizedBeanWithProducerMethodHasSameStereotypes()
{
deployBeans(LabradorKennel.class);
@@ -76,7 +81,7 @@
assert false;
}
- @Test @SpecAssertion(section="4.1")
+ @Test @SpecAssertion(section="4.4")
public void testRealizedBeanWithProducerFieldHasSameScope()
{
deployBeans(Horse.class);
@@ -84,7 +89,7 @@
assert manager.resolveByType(Dung.class, SMELLY_LITERAL).iterator().next().getScopeType().equals(RequestScoped.class);
}
- @Test @SpecAssertion(section="4.1")
+ @Test @SpecAssertion(section="4.4")
public void testRealizedBeanWithProducerFieldHasDeploymentTypeOfRealizingClass()
{
deployBeans(Horse.class);
@@ -92,7 +97,7 @@
assert manager.resolveByType(Dung.class, SMELLY_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class);
}
- @Test @SpecAssertion(section="4.1")
+ @Test @SpecAssertion(section="4.4")
public void testRealizedBeanWithProducerFieldHasSameBindings()
{
deployBeans(Horse.class);
@@ -101,7 +106,7 @@
assert manager.resolveByType(Dung.class, SMELLY_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Smelly.class);
}
- @Test @SpecAssertion(section="4.1")
+ @Test @SpecAssertion(section="4.4")
public void testRealizedBeanWithProducerFieldHasBindingsOfMethodAndRealizingType()
{
deployBeans(TameHorse.class);
@@ -110,7 +115,7 @@
assert annotationSetMatches(manager.resolveByType(Dung.class, SMELLY_LITERAL).iterator().next().getBindings(), Smelly.class, Tame.class);
}
- @Test @SpecAssertion(section="4.1")
+ @Test @SpecAssertion(section="4.4")
public void testRealizedBeanWithProducerFieldHasSameStereotypes()
{
deployBeans(Stable.class);
@@ -118,25 +123,25 @@
assert manager.resolveByType(Horse.class).iterator().next().getScopeType().equals(RequestScoped.class);
}
- @Test(groups="stub") @SpecAssertion(section="4.1")
+ @Test(groups="stub") @SpecAssertion(section="4.4")
public void testRealizedBeanWithProducerFieldHasSameInterceptorBindings()
{
assert false;
}
- @Test(groups="stub") @SpecAssertion(section="4.1")
+ @Test(groups="stub") @SpecAssertion(section="4.4")
public void testDisposalMethodInherited()
{
assert false;
}
- @Test(groups="stub") @SpecAssertion(section="4.1")
+ @Test(groups="stub") @SpecAssertion(section="4.4")
public void testRealizedDisposalMethodHasBindingsOfMethodAndRealizingType()
{
assert false;
}
- @Test @SpecAssertion(section="4.1")
+ @Test @SpecAssertion(section="4.4")
public void testObserverMethodInheritedAndHasSameBindings()
{
deployBeans(FarmHouse.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-01-28 08:29:38 UTC (rev 1258)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-01-28 09:00:59 UTC (rev 1259)
@@ -15,8 +15,8 @@
import org.testng.annotations.Test;
/**
- * @see Section 3.2.7, 3.3.7, 3.4.5, 6.7, 6.8, 8.5.8
*
+ * Spec version: PRD2
*/
public class EnterpriseBeanSpecializationTest extends AbstractTest
{
@@ -32,7 +32,8 @@
private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {};
- @Test @SpecAssertion(section = {"4.3.1", "3.2.7"})
+ @Test
+ @SpecAssertion(section = {"4.3.1", "3.2.7"})
public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
{
deployBeans(Farmer.class, LazyFarmer.class);
@@ -51,13 +52,15 @@
assert manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer");
}
- @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section = "4.3.1")
+ @Test(expectedExceptions=DefinitionException.class)
+ @SpecAssertion(section = "4.3.1")
public void testSpecializingAndSpecializedBeanHasName()
{
deployBeans(FarmYard_Broken.class);
}
- @Test(groups="broken") @SpecAssertion(section={"4.3.1", "3.2.7"})
+ @Test(groups="broken")
+ @SpecAssertion(section={"4.3.1", "3.2.7"})
public void testSpecializedBeanNotInstantiated() throws Exception
{
deployBeans(LazyFarmer.class, Farmer.class);
@@ -74,13 +77,15 @@
}.run();
}
- @Test(expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
+ @Test(expectedExceptions=InconsistentSpecializationException.class)
+ @SpecAssertion(section="4.3.1")
public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean()
{
deployBeans(Farmer.class, OrganicFarmer_Broken.class);
}
- @Test(groups="broken") @SpecAssertion(section="4.3.1")
+ @Test(groups="broken")
+ @SpecAssertion(section="4.3.1")
public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception
{
deployBeans(Office.class, Building.class);
@@ -97,37 +102,43 @@
}.run();
}
- @Test(expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
+ @Test(expectedExceptions=InconsistentSpecializationException.class)
+ @SpecAssertion(section="4.3.1")
public void testTwoBeansSpecializeTheSameBean()
{
deployBeans(Farmer.class, SheepFarmer_Broken.class, FishFarmer_Broken.class);
}
- @Test(groups={"specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2.7")
+ @Test(groups={"specialization"},expectedExceptions=DefinitionException.class)
+ @SpecAssertion(section="3.2.7")
public void testSpecializingClassDirectlyExtendsSimpleBean()
{
deployBeans(Tractor_Broken.class);
}
- @Test(groups={"specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2.7")
+ @Test(groups={"specialization"},expectedExceptions=DefinitionException.class)
+ @SpecAssertion(section="3.2.7")
public void testSpecializingClassDirectlyExtendsNothing()
{
deployBeans(Cow_Broken.class);
}
- @Test(groups={"specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.2.7")
+ @Test(groups={"specialization"},expectedExceptions=DefinitionException.class)
+ @SpecAssertion(section="3.2.7")
public void testSpecializingClassImplementsInterfaceAndExtendsNothing()
{
deployBeans(Donkey_Broken.class);
}
- @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.3.7")
+ @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class)
+ @SpecAssertion(section="3.3.7")
public void testSpecializingBeanDoesNotSupportAllLocalInterfacesOnSpecializedBean()
{
assert false;
}
- @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.3.7")
+ @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class)
+ @SpecAssertion(section="3.3.7")
public void testSpecializingBeanDoesNotSupportLocalInterfaceView()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-01-28 08:29:38 UTC (rev 1258)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-01-28 09:00:59 UTC (rev 1259)
@@ -15,7 +15,7 @@
import org.testng.annotations.Test;
/**
- * @see Section 3.2.7, 3.3.7, 3.4.5, 6.7, 6.8, 8.5.8
+ * Spec version: PRD2
*
*/
public class ProducerMethodSpecializationTest extends AbstractTest
@@ -72,31 +72,36 @@
}.run();
}
- @Test(expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
+ @Test(expectedExceptions=InconsistentSpecializationException.class)
+ @SpecAssertion(section="4.3.1")
public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean()
{
deployBeans(ClothesShop_Broken.class);
}
- @Test(expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
+ @Test(expectedExceptions=InconsistentSpecializationException.class)
+ @SpecAssertion(section="4.3.1")
public void testTwoBeansSpecializeTheSameBean()
{
deployBeans(PictureShop_Broken.class, Bookshop_Broken.class);
}
- @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4.5")
+ @Test(expectedExceptions=DefinitionException.class)
+ @SpecAssertion(section="3.4.5")
public void testSpecializedStaticMethod()
{
deployBeans(FurnitureShop_Broken.class);
}
- @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4.5")
+ @Test(expectedExceptions=DefinitionException.class)
+ @SpecAssertion(section="3.4.5")
public void testSpecializedMethodDoesNotOverrideAnotherProducerMethod()
{
deployBeans(FurnitureShop_Broken.class);
}
- @Test(expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.4.5")
+ @Test(expectedExceptions=DefinitionException.class)
+ @SpecAssertion(section="3.4.5")
public void testSpecializedMethodIndirectlyOverridesAnotherProducerMethod()
{
deployBeans(ShoeShop_Broken.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-01-28 08:29:38 UTC (rev 1258)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-01-28 09:00:59 UTC (rev 1259)
@@ -15,7 +15,7 @@
import org.testng.annotations.Test;
/**
- * @see Section 3.2.7, 3.3.7, 3.4.5, 6.7, 6.8, 8.5.8
+ * Spec version: PRD2
*
*/
public class SimpleBeanSpecializationTest extends AbstractTest
@@ -32,7 +32,7 @@
private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {};
- @Test @SpecAssertion(section = {"4.3.1", "3.3.7"})
+ @Test @SpecAssertion(section = {"4.3.1", "3.2.7"})
public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
{
deployBeans(LazyFarmer.class);
@@ -42,7 +42,7 @@
assert annotationSetMatches( manager.resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class);
}
- @Test @SpecAssertion(section = {"4.3.1", "3.3.7"})
+ @Test @SpecAssertion(section = {"4.3.1", "3.2.7"})
public void testSpecializingBeanHasNameOfSpecializedBean()
{
deployBeans(LazyFarmer.class);
@@ -57,7 +57,7 @@
deployBeans(FarmYard_Broken.class);
}
- @Test @SpecAssertion(section={"4.3.1", "3.3.7"})
+ @Test @SpecAssertion(section={"4.3.1", "3.2.7"})
public void testSpecializedBeanNotInstantiated() throws Exception
{
deployBeans(LazyFarmer.class, Farmer.class);
@@ -74,7 +74,8 @@
}.run();
}
- @Test(expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
+ @Test(expectedExceptions=InconsistentSpecializationException.class)
+ @SpecAssertion(section="4.3.1")
public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean()
{
deployBeans(OrganicFarmer_Broken.class);
@@ -97,25 +98,29 @@
}.run();
}
- @Test(expectedExceptions=InconsistentSpecializationException.class) @SpecAssertion(section="4.3.1")
+ @Test(expectedExceptions=InconsistentSpecializationException.class)
+ @SpecAssertion(section="4.3.1")
public void testTwoBeansSpecializeTheSameBean()
{
deployBeans(SheepFarmer_Broken.class, FishFarmer_Broken.class);
}
- @Test(groups={"specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.3.7")
+ @Test(groups={"specialization"},expectedExceptions=DefinitionException.class)
+ @SpecAssertion(section="3.2.7")
public void testSpecializingClassDirectlyExtendsEnterpriseBean()
{
deployBeans(FarmEquipment.class, Tractor_Broken.class);
}
- @Test(groups={"specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.3.7")
+ @Test(groups={"specialization"},expectedExceptions=DefinitionException.class)
+ @SpecAssertion(section="3.2.7")
public void testSpecializingClassDirectlyExtendsNothing()
{
deployBeans(Cow_Broken.class);
}
- @Test(groups={"specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.3.7")
+ @Test(groups={"specialization"},expectedExceptions=DefinitionException.class)
+ @SpecAssertion(section="3.2.7")
public void testSpecializingClassImplementsInterfaceAndExtendsNothing()
{
deployBeans(Donkey_Broken.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-01-28 08:29:38 UTC (rev 1258)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-01-28 09:00:59 UTC (rev 1259)
@@ -5,14 +5,17 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.impl.SpecAssertion;
-import org.jboss.webbeans.tck.impl.SpecVersion;
import org.testng.annotations.Test;
- at SpecVersion("20081206")
+/**
+ *
+ * Spec version: PRD2
+ *
+ */
public class InstantiationByNameTest extends AbstractTest
{
- @Test(groups="resolution") @SpecAssertion(section="4.10")
+ @Test(groups="resolution") @SpecAssertion(section="5.10")
public void testNoWebBeansFound() throws Exception
{
Bean<Cod> codBean = createSimpleBean(Cod.class);
@@ -23,7 +26,8 @@
assert manager.getInstanceByName("foo") == null;
}
- @Test(expectedExceptions=AmbiguousDependencyException.class) @SpecAssertion(section="4.10.1")
+ @Test(expectedExceptions=AmbiguousDependencyException.class)
+ @SpecAssertion(section="5.7.1")
public void testAmbiguousDependencies() throws Exception
{
Bean<Cod> codBean = createSimpleBean(Cod.class);
@@ -36,7 +40,7 @@
manager.getInstanceByName("whitefish");
}
- @Test(groups={"resolution", "beanLifecycle"}) @SpecAssertion(section="4.10.1")
+ @Test(groups={"resolution", "beanLifecycle"}) @SpecAssertion(section="5.7.1")
public void testGetInstanceByName()
{
Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
@@ -66,7 +70,7 @@
}
}
- @Test(groups={"stub", "resolution", "el"}) @SpecAssertion(section="4.10")
+ @Test(groups={"stub", "resolution", "el"}) @SpecAssertion(section="5.10")
public void testGetInstanceByNameCalledOncePerDistinctNameInElExpression()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-01-28 08:29:38 UTC (rev 1258)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-01-28 09:00:59 UTC (rev 1259)
@@ -8,10 +8,13 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.impl.SpecAssertion;
-import org.jboss.webbeans.tck.impl.SpecVersion;
import org.testng.annotations.Test;
- at SpecVersion("20081206")
+/**
+ *
+ * Spec version: PRD2
+ *
+ */
public class ResolutionByNameTest extends AbstractTest
{
@@ -32,7 +35,8 @@
* Web Bean by calling Manager.getInstance(), passing the Bean instance representing
* the Web Bean
*/
- @Test(groups={"stub", "el"}) @SpecAssertion(section="5.11")
+ @Test(groups={"stub", "el"})
+ @SpecAssertion(section="5.11")
public void testELResolver()
{
assert manager.getInstanceByName("nonexistant") == null;
@@ -54,7 +58,8 @@
* • Otherwise, if resolveByName() returned more than one Web Bean, throw an
* AmbiguousDependencyException.
*/
- @Test(expectedExceptions=AmbiguousDependencyException.class) @SpecAssertion(section="5.11")
+ @Test(expectedExceptions=AmbiguousDependencyException.class)
+ @SpecAssertion(section="5.11")
public void testDuplicateNamedBeans()
{
try
@@ -75,7 +80,7 @@
}
}
- @Test @SpecAssertion(section="5.11.1")
+ @Test @SpecAssertion(section="5.11")
public void testNamedBasedResolution()
{
@@ -107,7 +112,7 @@
assert manager.resolveByName("whitefish").contains(plaiceBean);
}
- @Test(groups="resolution") @SpecAssertion(section="5.11.1")
+ @Test(groups="resolution") @SpecAssertion(section="5.11")
public void testNoWebBeansFound() throws Exception
{
Bean<Cod> codBean = createSimpleBean(Cod.class);
@@ -128,7 +133,7 @@
* highest precedence deployment type that occurs in the set. If there are no matching Web Beans,
* an empty set is returned.
*/
- @Test(groups="stub") @SpecAssertion(section="5.11.1")
+ @Test(groups="stub") @SpecAssertion(section="5.11")
public void testOnlyHighestPrecedenceResolved()
{
// Both Cod and Plaice are named "whitefish" - Plaice has the highest deployment type (AnotherDeploymentType)
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-01-28 08:29:38 UTC (rev 1258)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-01-28 09:00:59 UTC (rev 1259)
@@ -12,10 +12,13 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.impl.SpecAssertion;
-import org.jboss.webbeans.tck.impl.SpecVersion;
import org.testng.annotations.Test;
- at SpecVersion("20081206")
+/**
+ *
+ * Spec version: PRD2
+ *
+ */
public class ClientProxyTest extends AbstractTest
{
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java 2009-01-28 08:29:38 UTC (rev 1258)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java 2009-01-28 09:00:59 UTC (rev 1259)
@@ -12,11 +12,14 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.impl.SpecAssertion;
-import org.jboss.webbeans.tck.impl.SpecVersion;
import org.jboss.webbeans.tck.impl.util.MockCreationalContext;
import org.testng.annotations.Test;
- at SpecVersion("20081206")
+/**
+ *
+ * Spec version: PRD2
+ *
+ */
public class InjectionTest extends AbstractTest
{
@@ -110,44 +113,38 @@
}
@Test(groups = { "stub", "injection", "webbeansxml" })
- @SpecAssertion(section = "3.7.2")
+ @SpecAssertion(section = "3.8.2")
public void testInjectFieldsDeclaredInXml()
{
assert false;
}
@Test(groups = { "stub", "injection", "webbeansxml" })
- @SpecAssertion(section = "3.7.2")
+ @SpecAssertion(section = "3.8.2")
public void testInjectedFieldDeclaredInXmlIgnoresJavaAnnotations()
{
assert false;
}
@Test(groups = { "stub", "injection", "webbeansxml" })
- @SpecAssertion(section = "3.7.2")
+ @SpecAssertion(section = "3.8.2")
public void testInjectedFieldDeclaredInXmlAssumesCurrent()
{
assert false;
}
@Test(groups = { "stub", "injection", "webbeansxml" }, expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.7.2")
+ @SpecAssertion(section = "3.8.2")
public void testNonexistentFieldDefinedInXml()
{
assert false;
}
@Test(groups = { "stub", "injection", "webbeansxml" })
- @SpecAssertion(section = "3.7.2")
+ @SpecAssertion(section = "3.8.2")
public void testInjectFieldsDeclaredInXmlAndJava()
{
assert false;
}
- /*
- *
- * @Test(groups="injection") @SpecAssertion(section="4.2") public void test {
- * assert false; }
- */
-
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-01-28 08:29:38 UTC (rev 1258)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-01-28 09:00:59 UTC (rev 1259)
@@ -41,13 +41,13 @@
*
* @author David Allen
*
+ * Spec version: PRD2
*/
- at SpecVersion("20081222")
public class InjectionPointTest extends AbstractTest
{
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.11")
+ @SpecAssertion(section = "5.6")
public void testGetBean()
{
deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class);
@@ -71,7 +71,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.11")
+ @SpecAssertion(section = "5.6")
public void testGetType()
{
deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class);
@@ -92,7 +92,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.11")
+ @SpecAssertion(section = "5.6")
public void testGetBindingTypes()
{
deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class);
@@ -115,7 +115,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.11")
+ @SpecAssertion(section = "5.6")
public void testGetMemberField()
{
deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class);
@@ -136,7 +136,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.11")
+ @SpecAssertion(section = "5.6")
public void testGetMemberMethod()
{
deployBeans(MethodInjectionPointBean.class, BeanWithInjectionPointMetadata.class);
@@ -162,7 +162,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.11")
+ @SpecAssertion(section = "5.6")
public void testGetMemberConstructor()
{
deployBeans(ConstructorInjectionPointBean.class, BeanWithInjectionPointMetadata.class);
@@ -188,7 +188,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.11")
+ @SpecAssertion(section = "5.6")
public void testGetAnnotation()
{
deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class);
@@ -209,7 +209,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.11")
+ @SpecAssertion(section = "5.6")
public void testGetAnnotations()
{
deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class);
@@ -233,7 +233,7 @@
}
@Test(groups = { "injectionPoint", "broken" })
- @SpecAssertion(section = "5.11")
+ @SpecAssertion(section = "5.6")
public void testStandardDeployment()
{
deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class);
@@ -254,7 +254,7 @@
}
@Test(groups = { "injectionPoint", "broken" })
- @SpecAssertion(section = "5.11")
+ @SpecAssertion(section = "5.6")
public void testDependentScope()
{
deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class);
@@ -275,7 +275,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.11")
+ @SpecAssertion(section = "5.6")
public void testApiTypeInjectionPoint()
{
deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class);
@@ -296,7 +296,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.11")
+ @SpecAssertion(section = "5.6")
public void testCurrentBinding()
{
deployBeans(FieldInjectionPointBean.class, BeanWithInjectionPointMetadata.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/ManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/ManagerTest.java 2009-01-28 08:29:38 UTC (rev 1258)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/manager/ManagerTest.java 2009-01-28 09:00:59 UTC (rev 1259)
@@ -4,9 +4,15 @@
import org.jboss.webbeans.tck.impl.SpecAssertion;
import org.testng.annotations.Test;
+/**
+ *
+ * Spec version: PRD2
+ *
+ */
public class ManagerTest extends AbstractTest
{
- @Test(groups={"manager", "injection", "deployment"}) @SpecAssertion(section="5.8")
+ @Test(groups={"manager", "injection", "deployment"})
+ @SpecAssertion(section="5.7")
public void testInjectingManager() throws Exception
{
deployBeans(FishFarmOffice.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java 2009-01-28 08:29:38 UTC (rev 1258)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/InstantiationByTypeTest.java 2009-01-28 09:00:59 UTC (rev 1259)
@@ -13,11 +13,14 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.impl.SpecAssertion;
-import org.jboss.webbeans.tck.impl.SpecVersion;
import org.jboss.webbeans.tck.impl.literals.CurrentBinding;
import org.testng.annotations.Test;
- at SpecVersion("20081206")
+/**
+ *
+ * Spec version: PRD2
+ *
+ */
public class InstantiationByTypeTest extends AbstractTest
{
@@ -29,7 +32,8 @@
return deploymentTypes;
}
- @Test(groups={"resolution", "beanLifecycle"}) @SpecAssertion(section="5.9")
+ @Test(groups={"resolution", "beanLifecycle"})
+ @SpecAssertion(section="5.8")
public void testCurrentBindingTypeAssumed()
{
Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
@@ -37,32 +41,37 @@
assert manager.getInstanceByType(Tuna.class) != null;
}
- @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
+ @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class)
+ @SpecAssertion(section="5.8")
public void testParameterizedTypeWithWildcardParameter()
{
manager.getInstanceByType(new TypeLiteral<ParameterizedBean_Broken<?>>(){});
}
- @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
+ @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class)
+ @SpecAssertion(section="5.8")
public <T> void testParameterizedTypeWithTypeParameter()
{
manager.getInstanceByType(new TypeLiteral<ParameterizedBean_Broken<T>>(){});
}
- @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) @SpecAssertion(section="5.9")
+ @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class)
+ @SpecAssertion(section="5.8")
public void testDuplicateBindingTypesUsed()
{
manager.getInstanceByType(Tuna.class, new CurrentBinding(), new CurrentBinding());
}
- @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
+ @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class)
+ @SpecAssertion(section="5.8")
public void testNonBindingTypeUsed()
{
manager.getInstanceByType(Tuna.class, new AnotherDeploymentTypeLiteral());
}
- @Test(expectedExceptions=AmbiguousDependencyException.class) @SpecAssertion(section="5.9")
+ @Test(expectedExceptions=AmbiguousDependencyException.class)
+ @SpecAssertion(section="5.8")
public void testAmbiguousDependencies() throws Exception
{
Bean<Cod> codBean = createSimpleBean(Cod.class);
@@ -74,7 +83,8 @@
manager.getInstanceByType(ScottishFish.class, new AnnotationLiteral<Whitefish>(){});
}
- @Test(expectedExceptions=UnsatisfiedDependencyException.class) @SpecAssertion(section="5.9")
+ @Test(expectedExceptions=UnsatisfiedDependencyException.class)
+ @SpecAssertion(section="5.8")
public void testUnsatisfiedDependencies() throws Exception
{
Bean<Cod> codBean = createSimpleBean(Cod.class);
@@ -86,7 +96,8 @@
manager.getInstanceByType(Tuna.class, new CurrentBinding());
}
- @Test(expectedExceptions=UnproxyableDependencyException.class) @SpecAssertion(section="5.9")
+ @Test(expectedExceptions=UnproxyableDependencyException.class)
+ @SpecAssertion(section="5.8")
public void testUnproxyableDependencies() throws Exception
{
deployBeans(FinalTuna_Broken.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-01-28 08:29:38 UTC (rev 1258)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-01-28 09:00:59 UTC (rev 1259)
@@ -13,11 +13,14 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.impl.SpecAssertion;
-import org.jboss.webbeans.tck.impl.SpecVersion;
import org.jboss.webbeans.tck.impl.literals.CurrentBinding;
import org.testng.annotations.Test;
- at SpecVersion("20081206")
+/**
+ *
+ * Spec version: PRD2
+ *
+ */
public class ResolutionByTypeTest extends AbstractTest
{
@@ -29,7 +32,8 @@
return deploymentTypes;
}
- @Test(groups="resolution") @SpecAssertion(section="5.9.2")
+ @Test(groups="resolution")
+ @SpecAssertion(section="5.9")
public void testDefaultBindingTypeAssumed() throws Exception
{
Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
@@ -39,31 +43,36 @@
assert possibleTargets.contains(tunaBean);
}
- @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
+ @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class)
+ @SpecAssertion(section="5.9")
public void testParameterizedTypeWithWildcardParameter()
{
manager.resolveByType(new TypeLiteral<ParameterizedBean_Broken<?>>(){});
}
- @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9")
+ @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class)
+ @SpecAssertion(section="5.9")
public <T> void testParameterizedTypeWithTypeParameter()
{
manager.resolveByType(new TypeLiteral<ParameterizedBean_Broken<T>>(){});
}
- @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class) @SpecAssertion(section="5.9.2")
+ @Test(groups="resolution", expectedExceptions=DuplicateBindingTypeException.class)
+ @SpecAssertion(section="5.9")
public void testDuplicateBindingTypesUsed()
{
manager.resolveByType(Tuna.class, new CurrentBinding(), new CurrentBinding());
}
- @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class) @SpecAssertion(section="5.9.2")
+ @Test(groups="resolution", expectedExceptions=IllegalArgumentException.class)
+ @SpecAssertion(section="5.9")
public void testNonBindingTypeUsed()
{
manager.resolveByType(Tuna.class, new AnotherDeploymentTypeLiteral());
}
- @Test(groups="resolution") @SpecAssertion(section={"5.9.2"})
+ @Test(groups="resolution")
+ @SpecAssertion(section={"5.9"})
public void testResolveByType() throws Exception
{
Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
@@ -88,7 +97,8 @@
assert manager.resolveByType(Animal.class, new CurrentBinding()).contains(haddockBean);
}
- @Test(groups="injection") @SpecAssertion(section={"2.3.5","5.9.2.2"})
+ @Test(groups="injection")
+ @SpecAssertion(section={"2.3.5","5.9.2"})
public void testAllBindingTypesSpecifiedForResolutionMustAppearOnWebBean()
{
Bean<Cod> codBean = createSimpleBean(Cod.class);
@@ -121,7 +131,8 @@
assert manager.resolveByType(ScottishFish.class, new AnnotationLiteral<Whitefish>() {}).contains(soleBean);
}
- @Test(groups="resolution") @SpecAssertion(section="5.9.2")
+ @Test(groups="resolution")
+ @SpecAssertion(section="5.9")
public void testResolveByTypeWithTypeParameter() throws Exception
{
Bean<ScottishFishFarmer> scottishFishFarmerBean = createSimpleBean(ScottishFishFarmer.class);
@@ -134,7 +145,8 @@
assert manager.resolveByType(new TypeLiteral<Farmer<ScottishFish>>(){}).contains(scottishFishFarmerBean);
}
- @Test(groups={"resolution", "producerMethod"}) @SpecAssertion(section="5.9.2")
+ @Test(groups={"resolution", "producerMethod"})
+ @SpecAssertion(section="5.9")
public void testResolveByTypeWithArray() throws Exception
{
Bean<SpiderProducer> spiderProducerBean = createSimpleBean(SpiderProducer.class);
@@ -149,7 +161,7 @@
assert manager.resolveByType(Spider[].class).size() == 1;
}
- @Test @SpecAssertion(section="5.9.2")
+ @Test @SpecAssertion(section="5.9")
public void testOnlyHighestEnabledPrecedenceWebBeansResolved() throws Exception
{
Bean<Cod> codBean = createSimpleBean(Cod.class);
@@ -167,7 +179,7 @@
}
- @Test(groups="resolution") @SpecAssertion(section="5.9.2")
+ @Test(groups="resolution") @SpecAssertion(section="5.9")
public void testNoWebBeansFound() throws Exception
{
Bean<Salmon> salmonBean = createSimpleBean(Salmon.class);
@@ -180,7 +192,7 @@
assert manager.resolveByType(Tuna.class, new CurrentBinding()).size() == 0;
}
- @Test(groups="resolution") @SpecAssertion(section="5.9.2.1")
+ @Test(groups="resolution") @SpecAssertion(section="5.9.1")
public void testResolveByTypeWithNonBindingMembers() throws Exception
{
Bean<Halibut> halibutBean = createSimpleBean(Halibut.class);
@@ -209,7 +221,8 @@
assert beans.contains(roundWhiteFishBean);
}
- @Test(groups="resolution", expectedExceptions=DefinitionException.class) @SpecAssertion(section="5.9.2.1")
+ @Test(groups="resolution", expectedExceptions=DefinitionException.class)
+ @SpecAssertion(section="5.9.1")
public void testArrayValuedAnnotationMemberWithoutNonBinding()
{
manager.resolveByType(Animal.class, new BindingTypeWithBindingArrayTypeMemberLiteral_Broken() {
@@ -222,7 +235,8 @@
});
}
- @Test(groups="resolution", expectedExceptions=DefinitionException.class) @SpecAssertion(section="5.9.2.1")
+ @Test(groups="resolution", expectedExceptions=DefinitionException.class)
+ @SpecAssertion(section="5.9.1")
public void testAnnotationValuedAnnotationMemberWithoutNonBinding()
{
manager.resolveByType(Animal.class, new BindingTypeWithBindingAnnotationMemberLiteral_Broken()
More information about the weld-commits
mailing list