[webbeans-commits] Webbeans SVN: r2878 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition: scope/broken and 6 other directories.

Author: dan.j.allen Date: 2009-06-24 00:06:05 -0400 (Wed, 24 Jun 2009) New Revision: 2878 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/FallowDeer_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/Scallop_Broken.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/BeanWithTooManyScopeTypes_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java Log: repackage broken tests under broken package w/ descriptive name Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes (from rev 2868, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/BeanWithTooManyScopeTypes_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/BeanWithTooManyScopeTypes_Broken.java 2009-06-23 16:13:10 UTC (rev 2868) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/BeanWithTooManyScopeTypes_Broken.java 2009-06-24 04:06:05 UTC (rev 2878) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.scope.broken2; +package org.jboss.jsr299.tck.tests.definition.scope.broken.tooManyScopes; import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.RequestScoped; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken2/TooManyScopesTest.java 2009-06-23 16:13:10 UTC (rev 2868) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken/tooManyScopes/TooManyScopesTest.java 2009-06-24 04:06:05 UTC (rev 2878) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.definition.scope.broken2; +package org.jboss.jsr299.tck.tests.definition.scope.broken.tooManyScopes; import org.hibernate.tck.annotations.SpecAssertion; Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/AnimalStereotype.java 2009-06-24 04:04:45 UTC (rev 2877) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/AnimalStereotype.java 2009-06-24 04:06:05 UTC (rev 2878) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.tests.definition.scope.broken1; - -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.enterprise.context.RequestScoped; -import javax.enterprise.inject.Stereotype; - -@Stereotype -@Target( { TYPE, METHOD, FIELD }) -@Retention(RUNTIME) -@RequestScoped -@interface AnimalStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/FishStereotype.java 2009-06-24 04:04:45 UTC (rev 2877) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/FishStereotype.java 2009-06-24 04:06:05 UTC (rev 2878) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.tests.definition.scope.broken1; - -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.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Stereotype; - -@Stereotype -@Target( { TYPE }) -@Retention(RUNTIME) -@ApplicationScoped -@interface FishStereotype -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java 2009-06-24 04:04:45 UTC (rev 2877) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java 2009-06-24 04:06:05 UTC (rev 2878) @@ -1,24 +0,0 @@ -package org.jboss.jsr299.tck.tests.definition.scope.broken1; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.DefinitionError; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; -import org.testng.annotations.Test; - -/** - * Spec version: 20090519 - */ -@Artifact -(a)ExpectedDeploymentException(DefinitionError.class) -public class IncompatibleStereotypesTest extends AbstractJSR299Test -{ - @Test - @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), @SpecAssertion(section = "2.4.4", id = "da") }) - public void testMutipleIncompatibleScopeStereotypes() - { - assert false; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop_Broken.java 2009-06-24 04:04:45 UTC (rev 2877) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop_Broken.java 2009-06-24 04:06:05 UTC (rev 2878) @@ -1,13 +0,0 @@ -package org.jboss.jsr299.tck.tests.definition.scope.broken1; - -/** - * This bean definition is invalid because it declares two stereotypes - * that have different default scopes and the bean does not explictly - * define a scope to resolve the conflict. - */ -@AnimalStereotype -@FishStereotype -class Scallop_Broken -{ - -} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/FallowDeer_Broken.java (from rev 2868, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/FallowDeer_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/FallowDeer_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/FallowDeer_Broken.java 2009-06-24 04:06:05 UTC (rev 2878) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.broken.nonEmptyNamed; + +@StereotypeWithNonEmptyNamed_Broken +class FallowDeer_Broken +{ +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java (from rev 2868, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/NonEmptyNamedTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/NonEmptyNamedTest.java 2009-06-24 04:06:05 UTC (rev 2878) @@ -0,0 +1,30 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.broken.nonEmptyNamed; + + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +/** + * Spec version: 20090519 + */ +@Artifact +(a)ExpectedDeploymentException(DefinitionError.class) +public class NonEmptyNamedTest extends AbstractJSR299Test +{ + + @Test + @SpecAssertions({ + @SpecAssertion(section = "2.7.1.3", id = "aa"), + @SpecAssertion(section = "2.6.2", id = "e") + }) + public void testStereotypeWithNonEmptyNamed() + { + assert false; + } + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java (from rev 2868, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken3/StereotypeWithNonEmptyNamed_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Broken.java 2009-06-24 04:06:05 UTC (rev 2878) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.broken.nonEmptyNamed; + +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.enterprise.inject.Named; +import javax.enterprise.inject.Stereotype; + +@Stereotype +@Target( { TYPE }) +@Retention(RUNTIME) +@Named("foo") +@interface StereotypeWithNonEmptyNamed_Broken +{ +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/AnimalStereotype.java (from rev 2868, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/AnimalStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/AnimalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/AnimalStereotype.java 2009-06-24 04:06:05 UTC (rev 2878) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.broken.scopeConflict; + +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.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; + +@Stereotype +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +@interface AnimalStereotype +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/FishStereotype.java (from rev 2868, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/FishStereotype.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/FishStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/FishStereotype.java 2009-06-24 04:06:05 UTC (rev 2878) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.broken.scopeConflict; + +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.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Stereotype; + +@Stereotype +@Target( { TYPE }) +@Retention(RUNTIME) +@ApplicationScoped +@interface FishStereotype +{ + +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java (from rev 2871, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java 2009-06-24 04:06:05 UTC (rev 2878) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.broken.scopeConflict; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +/** + * Spec version: 20090519 + */ +@Artifact +(a)ExpectedDeploymentException(DefinitionError.class) +public class IncompatibleStereotypesTest extends AbstractJSR299Test +{ + @Test + @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), @SpecAssertion(section = "2.4.4", id = "da") }) + public void testMutipleIncompatibleScopeStereotypes() + { + assert false; + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/Scallop_Broken.java (from rev 2868, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/Scallop_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/Scallop_Broken.java 2009-06-24 04:06:05 UTC (rev 2878) @@ -0,0 +1,13 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.broken.scopeConflict; + +/** + * This bean definition is invalid because it declares two stereotypes + * that have different default scopes and the bean does not explictly + * define a scope to resolve the conflict. + */ +@AnimalStereotype +@FishStereotype +class Scallop_Broken +{ + +}