[webbeans-commits] Webbeans SVN: r1630 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition: scope/incompatibleStereotypes and 2 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Sat Feb 21 20:03:51 EST 2009
Author: pete.muir at jboss.org
Date: 2009-02-21 20:03:51 -0500 (Sat, 21 Feb 2009)
New Revision: 1630
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/FishStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/Scallop_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/tooMany/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/tooMany/TooManyScopesTest.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/BeanWithTooManyScopeTypes.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Scallop_Broken.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java
Log:
@Artifactify
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnimalStereotype.java 2009-02-22 00:45:48 UTC (rev 1629)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnimalStereotype.java 2009-02-22 01:03:51 UTC (rev 1630)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.scope;
-
-import static java.lang.annotation.ElementType.FIELD;
-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.Retention;
-import java.lang.annotation.Target;
-
-import javax.annotation.Stereotype;
-import javax.context.RequestScoped;
-
- at Stereotype(requiredTypes=Animal.class)
- at Target( { TYPE, METHOD, FIELD })
- at Retention(RUNTIME)
- at RequestScoped
- at interface AnimalStereotype
-{
-
-}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnimalStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnimalStereotype.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnimalStereotype.java 2009-02-22 01:03:51 UTC (rev 1630)
@@ -0,0 +1,23 @@
+package org.jboss.jsr299.tck.unit.definition.scope;
+
+import static java.lang.annotation.ElementType.FIELD;
+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.Retention;
+import java.lang.annotation.Target;
+
+import javax.annotation.Stereotype;
+import javax.context.RequestScoped;
+
+import org.jboss.jsr299.tck.unit.definition.scope.Animal;
+
+ at Stereotype(requiredTypes=Animal.class)
+ at Target( { TYPE, METHOD, FIELD })
+ at Retention(RUNTIME)
+ at RequestScoped
+ at interface AnimalStereotype
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnimalStereotype.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/BeanWithTooManyScopeTypes.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/BeanWithTooManyScopeTypes.java 2009-02-22 00:45:48 UTC (rev 1629)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/BeanWithTooManyScopeTypes.java 2009-02-22 01:03:51 UTC (rev 1630)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.scope;
-
-import javax.context.ConversationScoped;
-import javax.context.RequestScoped;
-
- at RequestScoped
- at ConversationScoped
-class BeanWithTooManyScopeTypes
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Scallop_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Scallop_Broken.java 2009-02-22 00:45:48 UTC (rev 1629)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Scallop_Broken.java 2009-02-22 01:03:51 UTC (rev 1630)
@@ -1,8 +0,0 @@
-package org.jboss.jsr299.tck.unit.definition.scope;
-
- at AnimalStereotype
- at FishStereotype
-class Scallop_Broken
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-22 00:45:48 UTC (rev 1629)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-22 01:03:51 UTC (rev 1630)
@@ -3,12 +3,12 @@
import javax.context.ApplicationScoped;
import javax.context.Dependent;
import javax.context.RequestScoped;
-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,27 +16,26 @@
* Spec version: PRD2
*
*/
+ at Artifact
public class ScopeDefinitionTest extends AbstractDeclarativeTest
{
@Test @SpecAssertion(section="2.4", id = "c")
public void testScopeTypesAreExtensible()
{
- Bean<Mullet> mullet = createSimpleBean(Mullet.class);
- assert mullet.getScopeType().equals(AnotherScopeType.class);
+ assert getCurrentManager().resolveByType(Mullet.class).size() == 1;
+ Bean<Mullet> bean = getCurrentManager().resolveByType(Mullet.class).iterator().next();
+ assert bean.getScopeType().equals(AnotherScopeType.class);
}
- @Test(groups={"underInvestigation", "annotationDefinition"})
+ @Test(groups={"stub", "annotationDefinition"})
@SpecAssertion(section="2.4.2", id = "aa")
public void testScopeTypeHasCorrectTarget()
{
assert false;
}
- /**
- * TODO If a scope has no scope type annotation, then it is not a scope and cannot be tested
- */
- @Test(groups={"underInvestigation", "annotationDefinition"})
+ @Test(groups={"stub", "annotationDefinition"})
@SpecAssertion(section="2.4.2", id = "b")
public void testScopeTypeDeclaresScopeTypeAnnotation()
{
@@ -46,46 +45,24 @@
@Test @SpecAssertion(section="2.4.3", id = "a")
public void testScopeDeclaredInJava()
{
- Bean<SeaBass> trout = createSimpleBean(SeaBass.class);
- assert trout.getScopeType().equals(RequestScoped.class);
+ assert getCurrentManager().resolveByType(SeaBass.class).size() == 1;
+ Bean<SeaBass> bean = getCurrentManager().resolveByType(SeaBass.class).iterator().next();
+ assert bean.getScopeType().equals(RequestScoped.class);
}
- @Test(expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="2.4.3", id = "b")
- public void testTooManyScopesSpecifiedInJava()
- {
- createSimpleBean(BeanWithTooManyScopeTypes.class);
- }
-
- @Test(expectedExceptions=DefinitionException.class, groups={"stub", "webbeansxml"})
- @SpecAssertion(section = "2.4.4", id = "b")
- public void testTooManyScopesSpecifiedInXml()
- {
- //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- //annotations.put(RequestScoped.class, new RequestScopedAnnotationLiteral());
- //annotations.put(ConversationScoped.class, new ConversationScopedAnnotationLiteral());
- //AnnotatedClass<Antelope> antelopeAnnotatedItem = new SimpleAnnotatedClass<Antelope>(Antelope.class, annotations);
- //createSimpleBean(null, antelopeAnnotatedItem, manager);
- }
-
@Test(groups={"stub", "webbeansxml"})
@SpecAssertion(section="2.4.4", id = "a")
public void testScopeDeclaredInXml()
{
- //Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>();
- //annotations.put(RequestScoped.class, new RequestScopedAnnotationLiteral());
- //AnnotatedClass<Order> annotatedItem = new SimpleAnnotatedClass<Order>(Order.class, annotations);
-
- //SimpleBean<Order> order = createSimpleBean(Order.class, annotatedItem, manager);
- //assert order.getScopeType().equals(RequestScoped.class);
assert false;
}
@Test @SpecAssertion(section="2.4.5", id = "a")
public void testDefaultScope()
{
- Bean<Order> order = createSimpleBean(Order.class);
- assert order.getScopeType().equals(Dependent.class);
+ assert getCurrentManager().resolveByType(Order.class).size() == 1;
+ Bean<Order> bean = getCurrentManager().resolveByType(Order.class).iterator().next();
+ assert bean.getScopeType().equals(Dependent.class);
}
@Test
@@ -95,29 +72,25 @@
})
public void testScopeSpecifiedAndStereotyped()
{
- Bean<Minnow> minnow = createSimpleBean(Minnow.class);
- assert minnow.getScopeType().equals(RequestScoped.class);
+ assert getCurrentManager().resolveByType(Minnow.class).size() == 1;
+ Bean<Minnow> bean = getCurrentManager().resolveByType(Minnow.class).iterator().next();
+ assert bean.getScopeType().equals(RequestScoped.class);
}
- @Test(expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="2.4.5", id = "d")
- public void testMutipleIncompatibleScopeStereotypes()
- {
- createSimpleBean(Scallop_Broken.class);
- }
-
@Test @SpecAssertion(section="2.4.5", id = "d")
public void testMutipleIncompatibleScopeStereotypesWithScopeSpecified()
{
- Bean<Pollock> pollock = createSimpleBean(Pollock.class);
- assert pollock.getScopeType().equals(Dependent.class);
+ assert getCurrentManager().resolveByType(Pollock.class).size() == 1;
+ Bean<Pollock> bean = getCurrentManager().resolveByType(Pollock.class).iterator().next();
+ assert bean.getScopeType().equals(Dependent.class);
}
@Test @SpecAssertion(section="2.4.5", id = "c")
public void testMutipleCompatibleScopeStereotypes()
{
- Bean<Grayling> grayling = createSimpleBean(Grayling.class);
- assert grayling.getScopeType().equals(ApplicationScoped.class);
+ assert getCurrentManager().resolveByType(Grayling.class).size() == 1;
+ Bean<Grayling> bean = getCurrentManager().resolveByType(Grayling.class).iterator().next();
+ assert bean.getScopeType().equals(ApplicationScoped.class);
}
@Test
@@ -127,32 +100,36 @@
})
public void testWebBeanScopeTypeOverridesStereotype()
{
- Bean<RedSnapper> bean = createSimpleBean(RedSnapper.class);
+ assert getCurrentManager().resolveByType(RedSnapper.class).size() == 1;
+ Bean<RedSnapper> bean = getCurrentManager().resolveByType(RedSnapper.class).iterator().next();
assert bean.getScopeType().equals(RequestScoped.class);
}
@Test @SpecAssertion(section="4.1", id = "b")
public void testScopeTypeDeclaredInheritedIsInherited() throws Exception
{
- assert createSimpleBean(BorderCollie.class).getScopeType().equals(RequestScoped.class);
+ assert getCurrentManager().resolveByType(BorderCollie.class).size() == 1;
+ assert getCurrentManager().resolveByType(BorderCollie.class).iterator().next().getScopeType().equals(RequestScoped.class);
}
@Test @SpecAssertion(section="4.1", id = "b")
public void testScopeTypeNotDeclaredInheritedIsNotInherited()
{
- assert createSimpleBean(ShetlandPony.class).getScopeType().equals(Dependent.class);
+ assert getCurrentManager().resolveByType(ShetlandPony.class).size() == 1;
+ assert getCurrentManager().resolveByType(ShetlandPony.class).iterator().next().getScopeType().equals(Dependent.class);
}
@Test @SpecAssertion(section="4.1", id = "b")
public void testScopeTypeDeclaredInheritedIsBlockedByIntermediateScopeTypeMarkedInherited()
{
- assert createSimpleBean(GoldenRetriever.class).getScopeType().equals(ApplicationScoped.class);
+ assert getCurrentManager().resolveByType(GoldenRetriever.class).size() == 1;
}
@Test @SpecAssertion(section="4.1", id = "b")
public void testScopeTypeDeclaredInheritedIsBlockedByIntermediateScopeTypeNotMarkedInherited()
{
- assert createSimpleBean(GoldenLabrador.class).getScopeType().equals(Dependent.class);
+ assert getCurrentManager().resolveByType(GoldenLabrador.class).size() == 1;
+ assert getCurrentManager().resolveByType(GoldenLabrador.class).iterator().next().getScopeType().equals(Dependent.class);
}
}
\ No newline at end of file
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/AnimalStereotype.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/AnimalStereotype.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/AnimalStereotype.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/AnimalStereotype.java 2009-02-22 01:03:51 UTC (rev 1630)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.unit.definition.scope.incompatibleStereotypes;
+
+import static java.lang.annotation.ElementType.FIELD;
+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.Retention;
+import java.lang.annotation.Target;
+
+import javax.annotation.Stereotype;
+import javax.context.RequestScoped;
+
+ at Stereotype
+ at Target( { TYPE, METHOD, FIELD })
+ at Retention(RUNTIME)
+ at RequestScoped
+ at interface AnimalStereotype
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/FishStereotype.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/FishStereotype.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/FishStereotype.java 2009-02-22 01:03:51 UTC (rev 1630)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.unit.definition.scope.incompatibleStereotypes;
+
+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;
+import javax.context.ApplicationScoped;
+
+ at Stereotype
+ at Target( { TYPE })
+ at Retention(RUNTIME)
+ at ApplicationScoped
+ at interface FishStereotype
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/FishStereotype.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java 2009-02-22 01:03:51 UTC (rev 1630)
@@ -0,0 +1,24 @@
+package org.jboss.jsr299.tck.unit.definition.scope.incompatibleStereotypes;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at ExpectedDeploymentException(DefinitionException.class)
+public class IncompatibleStereotypesTest extends AbstractDeclarativeTest
+{
+
+
+ @Test
+ @SpecAssertion(section="2.4.5", id = "d")
+ public void testMutipleIncompatibleScopeStereotypes()
+ {
+ assert false;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/IncompatibleStereotypesTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/Scallop_Broken.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/Scallop_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/Scallop_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/incompatibleStereotypes/Scallop_Broken.java 2009-02-22 01:03:51 UTC (rev 1630)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.definition.scope.incompatibleStereotypes;
+
+
+ at AnimalStereotype
+ at FishStereotype
+class Scallop_Broken
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java (from rev 1628, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/BeanWithTooManyScopeTypes.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/tooMany/BeanWithTooManyScopeTypes_Broken.java 2009-02-22 01:03:51 UTC (rev 1630)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.unit.definition.scope.tooMany;
+
+import javax.context.ConversationScoped;
+import javax.context.RequestScoped;
+
+ at RequestScoped
+ at ConversationScoped
+class BeanWithTooManyScopeTypes_Broken
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/tooMany/TooManyScopesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/tooMany/TooManyScopesTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/tooMany/TooManyScopesTest.java 2009-02-22 01:03:51 UTC (rev 1630)
@@ -0,0 +1,23 @@
+package org.jboss.jsr299.tck.unit.definition.scope.tooMany;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+ at Artifact
+ at ExpectedDeploymentException(DefinitionException.class)
+public class TooManyScopesTest extends AbstractDeclarativeTest
+{
+
+ @Test
+ @SpecAssertion(section="2.4.3", id = "b")
+ public void testTooManyScopesSpecifiedInJava()
+ {
+ assert false;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/tooMany/TooManyScopesTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-22 00:45:48 UTC (rev 1629)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-22 01:03:51 UTC (rev 1630)
@@ -13,6 +13,7 @@
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;
/**
@@ -20,6 +21,7 @@
* Spec version: PRD2
*
*/
+ at Artifact
public class StereotypeDefinitionTest extends AbstractDeclarativeTest
{
More information about the weld-commits
mailing list