[webbeans-commits] Webbeans SVN: r1629 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Sat Feb 21 19:45:48 EST 2009
Author: pete.muir at jboss.org
Date: 2009-02-21 19:45:48 -0500 (Sat, 21 Feb 2009)
New Revision: 1629
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/MammalStereotype.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/Minnow.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/Moose.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/RiverFishStereotype.java
Log:
@Artifactify
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/AnotherDeploymentType.java 2009-02-21 23:53:20 UTC (rev 1628)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/AnotherDeploymentType.java 2009-02-22 00:45:48 UTC (rev 1629)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.name;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.DeploymentType;
-
- at Target( { TYPE, METHOD })
- at Retention(RUNTIME)
- at Documented
- at DeploymentType
- at interface AnotherDeploymentType
-{
-
-}
\ No newline at end of file
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/MammalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/MammalStereotype.java 2009-02-21 23:53:20 UTC (rev 1628)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/MammalStereotype.java 2009-02-22 00:45:48 UTC (rev 1629)
@@ -1,18 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.name;
-
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.annotation.Stereotype;
-
- at Stereotype(requiredTypes=Animal.class)
- at Target( { TYPE })
- at Retention(RUNTIME)
- at AnotherDeploymentType
- at interface MammalStereotype
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/Minnow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/Minnow.java 2009-02-21 23:53:20 UTC (rev 1628)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/Minnow.java 2009-02-22 00:45:48 UTC (rev 1629)
@@ -1,9 +1,7 @@
package org.jboss.jsr299.tck.unit.definition.name;
-import javax.context.RequestScoped;
@RiverFishStereotype
- at RequestScoped
class Minnow implements Animal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/Moose.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/Moose.java 2009-02-21 23:53:20 UTC (rev 1628)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/Moose.java 2009-02-22 00:45:48 UTC (rev 1629)
@@ -2,7 +2,6 @@
import javax.annotation.Named;
- at MammalStereotype
@Named("aMoose")
class Moose implements Animal
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java 2009-02-21 23:53:20 UTC (rev 1628)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java 2009-02-22 00:45:48 UTC (rev 1629)
@@ -1,14 +1,12 @@
package org.jboss.jsr299.tck.unit.definition.name;
-import java.lang.annotation.Annotation;
-import java.util.List;
-
import javax.inject.DefinitionException;
import javax.inject.manager.Bean;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
import org.testng.annotations.Test;
/**
@@ -16,16 +14,9 @@
* Spec version: PRD2
*
*/
+ at Artifact
public class NameDefinitionTest extends AbstractDeclarativeTest
{
-
- @Override
- protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
- {
- List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes();
- deploymentTypes.add(AnotherDeploymentType.class);
- return deploymentTypes;
- }
@Test(groups="stub", expectedExceptions=DefinitionException.class)
@SpecAssertion(section="2.6", id = "a")
@@ -42,7 +33,8 @@
})
public void testNonDefaultNamed()
{
- Bean<Moose> moose = createSimpleBean(Moose.class);
+ assert getCurrentManager().resolveByType(Moose.class).size() == 1;
+ Bean<Moose> moose =getCurrentManager().resolveByType(Moose.class).iterator().next();
assert moose.getName().equals("aMoose");
}
@@ -50,19 +42,6 @@
@SpecAssertion(section="2.6.2", id = "a")
public void testNonDefaultXmlNamed()
{
- /*Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(Named.class, new NamedAnnotationLiteral(){
-
- public String value()
- {
- return "aTrout";
- }
-
- });
- AnnotatedClass<SeaBass> annotatedItem = new SimpleAnnotatedClass<SeaBass>(SeaBass.class, annotations);*/
- //SimpleBean<SeaBass> trout = createSimpleBean(SeaBass.class, annotatedItem, manager);
-
- //assert trout.getName().equals("aTrout");
assert false;
}
@@ -73,11 +52,6 @@
})
public void testJavaNamedUsedWhenNoXmlSpecified()
{
- //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- //AnnotatedClass<Cod> annotatedItem = new SimpleAnnotatedClass<Cod>(Cod.class, annotations);
- //SimpleBean<Cod> cod = createSimpleBean(Cod.class, annotatedItem, manager);
-
- //assert cod.getName().equals("whitefish");
assert false;
}
@@ -89,7 +63,8 @@
})
public void testDefaultNamed()
{
- Bean<Haddock> haddock = createSimpleBean(Haddock.class);
+ assert getCurrentManager().resolveByType(Haddock.class).size() == 1;
+ Bean<Haddock> haddock = getCurrentManager().resolveByType(Haddock.class).iterator().next();
assert haddock.getName() != null;
assert haddock.getName().equals("haddock");
}
@@ -98,20 +73,6 @@
@SpecAssertion(section="2.6.3", id = "b")
public void testDefaultXmlNamed()
{
- /*Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- annotations.put(Named.class, new NamedAnnotationLiteral() {
-
- public String value()
- {
- return "";
- }
-
- });
- AnnotatedClass<SeaBass> annotatedItem = new SimpleAnnotatedClass<SeaBass>(SeaBass.class, annotations);*/
- //SimpleBean<SeaBass> trout = createSimpleBean(SeaBass.class, annotatedItem, manager);
-
- //assert trout.getName() != null;
- //assert trout.getName().equals("seaBass");
assert false;
}
@@ -123,8 +84,9 @@
})
public void testSterotypeDefaultsName()
{
- Bean<RedSnapper> model = createSimpleBean(RedSnapper.class);
- assert model.getName().equals("redSnapper");
+ assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1;
+ Bean<RedSnapper> bean = getCurrentManager().resolveByType(RedSnapper.class).iterator().next();
+ assert bean.getName().equals("redSnapper");
}
@Test
@@ -134,22 +96,23 @@
})
public void testNotNamedInJava()
{
- Bean<SeaBass> model = createSimpleBean(SeaBass.class);
- assert model.getName() == null;
+ assert getCurrentManager().resolveByType(SeaBass.class).size() == 1;
+ Bean<SeaBass> bean = getCurrentManager().resolveByType(SeaBass.class).iterator().next();
+ assert bean.getName() == null;
}
- @Test @SpecAssertion(section="2.6.4", id = "a")
+ @Test(groups="stub") @SpecAssertion(section="2.6.4", id = "a")
public void testNotNamedInXml()
{
- Bean<SeaBass> model = createSimpleBean(SeaBass.class);
- assert model.getName() == null;
+ assert false;
}
@Test @SpecAssertion(section="2.6.4", id = "a")
public void testNotNamedInStereotype()
{
- Bean<Minnow> model = createSimpleBean(Minnow.class);
- assert model.getName() == null;
+ assert getCurrentManager().resolveByType(Minnow.class).size() == 1;
+ Bean<Minnow> bean = getCurrentManager().resolveByType(Minnow.class).iterator().next();
+ assert bean.getName() == null;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/RiverFishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/RiverFishStereotype.java 2009-02-21 23:53:20 UTC (rev 1628)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/RiverFishStereotype.java 2009-02-22 00:45:48 UTC (rev 1629)
@@ -7,12 +7,10 @@
import java.lang.annotation.Target;
import javax.annotation.Stereotype;
-import javax.context.ApplicationScoped;
- at Stereotype(requiredTypes=Animal.class)
+ at Stereotype
@Target( { TYPE })
@Retention(RUNTIME)
- at ApplicationScoped
@interface RiverFishStereotype
{
More information about the weld-commits
mailing list