[webbeans-commits] Webbeans SVN: r2835 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: lookup/injection and 7 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Mon Jun 15 16:28:55 EDT 2009
Author: dallen6
Date: 2009-06-15 16:28:55 -0400 (Mon, 15 Jun 2009)
New Revision: 2835
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Barn.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Farm.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/FarmLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Hamlet.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/HamletLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Village.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/VillageLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/servlet/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/instantiation/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
Log:
Updates to TCK lookup tests
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-06-15 16:24:34 UTC (rev 2834)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/InjectionTest.java 2009-06-15 20:28:55 UTC (rev 2835)
@@ -19,7 +19,7 @@
{
@Test(groups = { "injection", "producerMethod" })
- @SpecAssertion(section = "5.2", id = "aa")
+ @SpecAssertion(section = "5.1.3", id = "aa")
public void testInjectionPerformsBoxingIfNecessary() throws Exception
{
assert getBeans(SpiderNest.class).size() == 1;
@@ -28,26 +28,6 @@
assert spiderNest.numberOfSpiders.equals(4);
}
- @Test(groups = { "injection", "clientProxy" }, expectedExceptions = ContextNotActiveException.class)
- @SpecAssertion(section = "5.3", id = "a")
- public void testInvokeNormalInjectedWebBeanWhenContextNotActive()
- {
- assert getBeans(TunaFarm.class).size() == 1;
- TunaFarm tunaFarm = getInstanceByType(TunaFarm.class);
- assert tunaFarm.tuna != null;
- getCurrentConfiguration().getContexts().setInactive(getCurrentConfiguration().getContexts().getRequestContext());
- tunaFarm.tuna.getName();
- }
-
- @Test(groups = "injection")
- @SpecAssertion(section = "5.3", id = "b")
- public void testInvokeDependentScopeWhenContextNotActive()
- {
- assert getBeans(FoxRun.class).size() == 1;
- FoxRun foxRun = getInstanceByType(FoxRun.class);
- assert foxRun.fox.getName().equals("gavin");
- }
-
@Test
@SpecAssertion(section="4.2", id = "aa")
public void testFieldDeclaredInSuperclassInjected() throws Exception
@@ -67,7 +47,7 @@
@Test
@SpecAssertion(section="4.2", id = "ac")
public void testFieldDeclaredInIndirectSuperclassInjected() throws Exception
- {
+ {
new RunInDependentContext()
{
@Override
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-06-15 16:24:34 UTC (rev 2834)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/nullableBean/NullableBeanTest.java 2009-06-15 20:28:55 UTC (rev 2835)
@@ -15,7 +15,7 @@
@Test(groups = { "injection", "producerMethod" })
- @SpecAssertion(section = "5.2", id = "a")
+ @SpecAssertion(section = "5.1.3", id = "aa")
public void testPrimitiveInjectionPointResolvesToNullableWebBean() throws Exception
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-06-15 16:24:34 UTC (rev 2834)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-06-15 20:28:55 UTC (rev 2835)
@@ -48,7 +48,7 @@
{
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6", id = "a")
+ @SpecAssertion(section = "5.4.9", id = "a")
public void testGetBean() throws Exception
{
@@ -71,7 +71,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6", id = "ba")
+ @SpecAssertion(section = "5.4.9", id = "ba")
public void testGetType() throws Exception
{
// Get an instance of the bean which has another bean injected into it
@@ -90,7 +90,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6", id = "bc")
+ @SpecAssertion(section = "5.4.9", id = "bc")
public void testGetBindingTypes() throws Exception
{
// Get an instance of the bean which has another bean injected into it
@@ -111,7 +111,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6", id = "ca")
+ @SpecAssertion(section = "5.4.9", id = "ca")
public void testGetMemberField() throws Exception
{
// Get an instance of the bean which has another bean injected into it
@@ -130,7 +130,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6", id = "cb")
+ @SpecAssertion(section = "5.4.9", id = "cb")
public void testGetMemberMethod() throws Exception
{
// Get an instance of the bean which has another bean injected into it
@@ -154,7 +154,7 @@
}
@Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6", id = "cc")
+ @SpecAssertion(section = "5.4.9", id = "cc")
public void testGetMemberConstructor() throws Exception
{
// Get an instance of the bean which has another bean injected into it
@@ -177,8 +177,8 @@
}.run();
}
- @Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6", id = "da")
+ @Test(groups = { "injectionPoint", "rewrite" })
+ @SpecAssertion(section = "5.4.9", id = "daa")
public void testGetAnnotation() throws Exception
{
// Get an instance of the bean which has another bean injected into it
@@ -195,105 +195,4 @@
}
}.run();
}
-
- @Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6", id = "dd")
- public void testGetAnnotations() throws Exception
- {
- // Get an instance of the bean which has another bean injected into it
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class,new CurrentLiteral());
- BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
- assert beanWithInjectionPoint.getInjectedMetadata() != null;
- Set<Annotation> annotations = new HashSet<Annotation>(beanWithInjectionPoint.getInjectedMetadata().getAnnotated().getAnnotations());
- assert annotations.size() > 0;
- assert annotations.contains(new CurrentLiteral());
- assert annotations.contains(new AnimalStereotypeAnnotationLiteral());
- }
- }.run();
- }
-
- @Test(groups = { "injectionPoint" })
- @SpecAssertions({
- @SpecAssertion(section = "5.6.1", id = "za"),
- @SpecAssertion(section = "2.5.1", id="a")
- })
- public void testStandardDeployment() throws Exception
- {
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- assert getBeans(InjectionPoint.class).size() == 1;
- assert getBeans(InjectionPoint.class).iterator().next().getDeploymentType().equals(Standard.class);
- }
-
- }.run();
- }
-
- @Test(groups = { "injectionPoint" })
- @SpecAssertion(section = "5.6.1", id = "zb")
- public void testDependentScope() throws Exception
- {
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- assert getBeans(InjectionPoint.class).size() == 1;
- assert getBeans(InjectionPoint.class).iterator().next().getScopeType().equals(Dependent.class);
- }
-
- }.run();
- }
-
- @Test(groups = { "injectionPoint" })
- @SpecAssertions({
- @SpecAssertion(section = "5.6.1", id = "zc")
- })
- public void testApiTypeInjectionPoint() throws Exception
- {
- // Get an instance of the bean which has another bean injected into it
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class,new CurrentLiteral());
- BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
- assert beanWithInjectionPoint.getInjectedMetadata() != null;
- assert InjectionPoint.class.isAssignableFrom(beanWithInjectionPoint.getInjectedMetadata().getClass());
- }
- }.run();
- }
-
- @Test(groups = { "injectionPoint" })
- @SpecAssertions({
- @SpecAssertion(section = "5.6.1", id = "zd"),
- @SpecAssertion(section = "5.6.1", id = "a")
- })
- public void testCurrentBinding() throws Exception
- {
- // Get an instance of the bean which has another bean injected into it
- new RunInDependentContext()
- {
- @Override
- protected void execute() throws Exception
- {
- FieldInjectionPointBean beanWithInjectedBean = getInstanceByType(FieldInjectionPointBean.class,new CurrentLiteral());
- BeanWithInjectionPointMetadata beanWithInjectionPoint = beanWithInjectedBean.getInjectedBean();
- assert beanWithInjectionPoint.getInjectedMetadata() != null;
- assert beanWithInjectionPoint.getInjectedMetadata().getBindings().contains(new CurrentLiteral());
- }
- }.run();
- }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-06-15 16:24:34 UTC (rev 2834)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/ManagerTest.java 2009-06-15 20:28:55 UTC (rev 2835)
@@ -22,7 +22,7 @@
public class ManagerTest extends AbstractJSR299Test
{
@Test(groups={"manager", "injection", "deployment"})
- @SpecAssertion(section="5.7.2", id = "a")
+ @SpecAssertion(section="11.2", id = "c")
public void testInjectingManager() throws Exception
{
new RunInDependentContext()
@@ -39,14 +39,14 @@
}
@Test
- @SpecAssertion(section = "5.7.2", id = "aa")
+ @SpecAssertion(section = "11.2", id = "a")
public void testContainerProvidesManagerBean()
{
assert getBeans(BeanManager.class).size() > 0;
}
@Test
- @SpecAssertion(section = "5.7.2", id = "ab")
+ @SpecAssertion(section = "11.2", id = "a")
public void testManagerBeanIsDependentScoped()
{
Bean<BeanManager> beanManager = getBeans(BeanManager.class).iterator().next();
@@ -54,7 +54,7 @@
}
@Test
- @SpecAssertion(section = "5.7.2", id = "ac")
+ @SpecAssertion(section = "11.2", id = "a")
public void testManagerBeanHasStandardDeployment()
{
Bean<BeanManager> beanManager = getBeans(BeanManager.class).iterator().next();
@@ -62,7 +62,7 @@
}
@Test
- @SpecAssertion(section = "5.7.2", id = "ad")
+ @SpecAssertion(section = "11.2", id = "a")
public void testManagerBeanHasCurrentBinding()
{
Bean<BeanManager> beanManager = getBeans(BeanManager.class).iterator().next();
@@ -71,10 +71,10 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "5.7.2", id = "c"),
- @SpecAssertion(section = "5.7.2", id = "d")
+ @SpecAssertion(section = "11.2.1", id = "a"),
+ @SpecAssertion(section = "11.2.1", id = "b")
})
- public void testGetInstanceReturnsContextualInstance()
+ public void testGetReferenceReturnsContextualInstance()
{
Bean<FishFarmOffice> bean = getBeans(FishFarmOffice.class).iterator().next();
assert getCurrentManager().getReference(bean,FishFarmOffice.class) instanceof FishFarmOffice;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-06-15 16:24:34 UTC (rev 2834)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/manager/jndi/ManagerTest.java 2009-06-15 20:28:55 UTC (rev 2835)
@@ -14,11 +14,11 @@
public class ManagerTest extends AbstractJSR299Test
{
@Test(groups = { "manager", "ejb3", "integration" })
- @SpecAssertion(section = "5.7.2", id = "b")
+ @SpecAssertion(section = "11.2", id = "d")
public void testManagerLookupInJndi() throws Exception
{
InitialContext ctx = new InitialContext();
- BeanManager beanManager = (BeanManager) ctx.lookup("java:app/Manager");
+ BeanManager beanManager = (BeanManager) ctx.lookup("java:app/BeanManager");
assert beanManager != null;
}
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Barn.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Barn.java 2009-06-15 16:24:34 UTC (rev 2834)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Barn.java 2009-06-15 20:28:55 UTC (rev 2835)
@@ -1,8 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.nonContextual;
-
-import java.io.Serializable;
-
-public class Barn implements Serializable
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Farm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Farm.java 2009-06-15 16:24:34 UTC (rev 2834)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Farm.java 2009-06-15 20:28:55 UTC (rev 2835)
@@ -1,26 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.nonContextual;
-
-import java.io.Serializable;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.enterprise.inject.Current;
-
- at Stateful
-public class Farm implements FarmLocal, Serializable
-{
-
- @Current Barn barn;
-
- @Remove
- public void remove()
- {
-
- }
-
- public Barn getBarn()
- {
- return barn;
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/FarmLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/FarmLocal.java 2009-06-15 16:24:34 UTC (rev 2834)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/FarmLocal.java 2009-06-15 20:28:55 UTC (rev 2835)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.nonContextual;
-
-import javax.ejb.Local;
-
- at Local
-public interface FarmLocal
-{
-
- public Barn getBarn();
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Hamlet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Hamlet.java 2009-06-15 16:24:34 UTC (rev 2834)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Hamlet.java 2009-06-15 20:28:55 UTC (rev 2835)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.nonContextual;
-
-import javax.annotation.Resource;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-
- at Stateful
-public class Hamlet implements HamletLocal
-{
-
- @Resource(mappedName="java:comp/env/servlet-test-runner/Farm/local") FarmLocal farm;
-
- @Remove
- public void remove() {}
-
- public FarmLocal getFarm()
- {
- return farm;
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/HamletLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/HamletLocal.java 2009-06-15 16:24:34 UTC (rev 2834)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/HamletLocal.java 2009-06-15 20:28:55 UTC (rev 2835)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.nonContextual;
-
-import javax.ejb.Local;
-
- at Local
-public interface HamletLocal
-{
-
- public FarmLocal getFarm();
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java 2009-06-15 16:24:34 UTC (rev 2834)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/NonContextualInjectionTest.java 2009-06-15 20:28:55 UTC (rev 2835)
@@ -1,55 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.nonContextual;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.testng.annotations.Test;
-
-/**
- *
- * Spec version: PRD2
- *
- */
- at Artifact
- at IntegrationTest
- at Packaging(PackagingType.EAR)
-public class NonContextualInjectionTest extends AbstractJSR299Test
-{
-
- @Test(groups = { "integration", "stub" })
- @SpecAssertion(section = "5.12.1", id = "a")
- public void testInjectionIntoSessionBeanLookedUpInJndi() throws Exception
- {
- // Quite tough as no universal names. Need to allow these to be specified or something...
- assert false;
- }
-
- @Test(groups = { "integration" })
- @SpecAssertion(section = "5.12.1", id = "a")
- public void testInjectionIntoSessionBeanInjectedViaEjb() throws Exception
- {
- assert getBeans(VillageLocal.class).size() == 1;
- assert getInstanceByType(VillageLocal.class).getFarm().getBarn() != null;
- }
-
- @Test(groups = { "integration", "broken" })
- @SpecAssertion(section = "5.12.1", id = "a")
- public void testInjectionIntoSessionBeanInjectedViaResource() throws Exception
- {
- // Quite tough as no universal names. Need to allow these to be specified or something...
- assert getBeans(HamletLocal.class).size() == 1;
- assert getInstanceByType(HamletLocal.class).getFarm().getBarn() != null;
- }
-
- @Test(groups = { "stub", "integration" })
- @SpecAssertion(section = "5.12.2", id = "a")
- public void testInjectionIntoMessageDrivenBean()
- {
- assert false;
- }
-
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Village.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Village.java 2009-06-15 16:24:34 UTC (rev 2834)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/Village.java 2009-06-15 20:28:55 UTC (rev 2835)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.nonContextual;
-
-import javax.ejb.EJB;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-
- at Stateful
-public class Village implements VillageLocal
-{
-
- @EJB FarmLocal farm;
-
- @Remove
- public void remove() {}
-
- public FarmLocal getFarm()
- {
- return farm;
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/VillageLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/VillageLocal.java 2009-06-15 16:24:34 UTC (rev 2834)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/nonContextual/VillageLocal.java 2009-06-15 20:28:55 UTC (rev 2835)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.tests.lookup.nonContextual;
-
-import javax.ejb.Local;
-
- at Local
-public interface VillageLocal
-{
-
- public FarmLocal getFarm();
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-06-15 16:24:34 UTC (rev 2834)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-06-15 20:28:55 UTC (rev 2835)
@@ -62,8 +62,7 @@
@Test(groups="resolution")
@SpecAssertions({
- @SpecAssertion(section="5.1", id = "a"),
- @SpecAssertion(section = "5.1", id ="fa")
+ @SpecAssertion(section = "5.1", id ="faa")
})
public void testResolveByType() throws Exception
{
@@ -98,7 +97,7 @@
@Test(groups="injection")
@SpecAssertions({
@SpecAssertion(section = "2.3.4", id = "b" ),
- @SpecAssertion(section = "5.1", id = "gb"),
+ @SpecAssertion(section = "5.1", id = "gba"),
@SpecAssertion(section = "2.3.3", id = "d" ),
@SpecAssertion(section = "5.1.5", id = "a" )
})
@@ -148,7 +147,6 @@
{
assert getBeans(Animal.class, new AnnotationLiteral<Whitefish>() {}).size() == 1;
assert getBeans(Animal.class, new AnnotationLiteral<Whitefish>() {}).iterator().next().getTypes().contains(Plaice.class);
-
}
@@ -161,7 +159,6 @@
@Test(groups="resolution")
@SpecAssertions({
- @SpecAssertion(section="5.1.4", id = "b"),
@SpecAssertion(section="5.1", id = "gca")
})
public void testResolveByTypeWithNonBindingMembers() throws Exception
More information about the weld-commits
mailing list