Author: dan.j.allen Date: 2009-06-23 16:42:32 -0400 (Tue, 23 Jun 2009) New Revision: 2871 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/FishStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/ResolvedStereotypeScopeConflictTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/Scallop.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java Log: seperate broken and non-broken tests into different packages Modified: 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-23 20:42:04 UTC (rev 2870) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/IncompatibleStereotypesTest.java 2009-06-23 20:42:32 UTC (rev 2871) @@ -1,24 +1,22 @@ 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.Classes; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.testng.annotations.Test; /** * Spec version: 20090519 */ -@Artifact(addCurrentPackage = false) -@Classes( { AnimalStereotype.class, FishStereotype.class, Scallop_Broken.class, IncompatibleStereotypesTest.class }) +@Artifact @ExpectedDeploymentException(DefinitionError.class) public class IncompatibleStereotypesTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "2.4.4", id = "da") + @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/ResolvedIncompatibleStereotypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java 2009-06-23 20:42:04 UTC (rev 2870) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/ResolvedIncompatibleStereotypesTest.java 2009-06-23 20:42:32 UTC (rev 2871) @@ -1,23 +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.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.Classes; -import org.testng.annotations.Test; - -/** - * Spec version: 20090519 - */ -@Artifact(addCurrentPackage = false) -@Classes( { AnimalStereotype.class, FishStereotype.class, Scallop.class, ResolvedIncompatibleStereotypesTest.class }) -public class ResolvedIncompatibleStereotypesTest extends AbstractJSR299Test -{ - @Test - @SpecAssertions( { @SpecAssertion(section = "2.4.4", id = "da"), @SpecAssertion(section = "2.4.4", id = "e") }) - public void testMutipleIncompatibleScopeStereotypesWithOverride() - { - assert true; - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop.java 2009-06-23 20:42:04 UTC (rev 2870) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/broken1/Scallop.java 2009-06-23 20:42:32 UTC (rev 2871) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.tests.definition.scope.broken1; - -import javax.enterprise.context.RequestScoped; - -/** - * This bean definition is valid because it declares two stereotypes that have - * different default scopes yet the bean explictly defines a scope to resolve - * the conflict. - */ -@AnimalStereotype -@FishStereotype -@RequestScoped -class Scallop -{ - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/AnimalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/AnimalStereotype.java 2009-06-23 20:42:32 UTC (rev 2871) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.resolvedScopeConflict; + +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 +{ +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/FishStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/FishStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/FishStereotype.java 2009-06-23 20:42:32 UTC (rev 2871) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.resolvedScopeConflict; + +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 +{ +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/ResolvedStereotypeScopeConflictTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/ResolvedStereotypeScopeConflictTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/ResolvedStereotypeScopeConflictTest.java 2009-06-23 20:42:32 UTC (rev 2871) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.resolvedScopeConflict; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.testng.annotations.Test; + +/** + * Spec version: 20090519 + */ +@Artifact +public class ResolvedStereotypeScopeConflictTest extends AbstractJSR299Test +{ + @Test + @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), @SpecAssertion(section = "2.4.4", id = "da"), @SpecAssertion(section = "2.4.4", id = "e") }) + public void testExplicitScopeOverridesMutipleStereotypesWithConflictingScopes() + { + assert true; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/Scallop.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/Scallop.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/resolvedScopeConflict/Scallop.java 2009-06-23 20:42:32 UTC (rev 2871) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.definition.stereotype.resolvedScopeConflict; + +import javax.enterprise.context.RequestScoped; + +/** + * This bean definition is valid because it declares two stereotypes that have + * different default scopes yet the bean explictly defines a scope to resolve + * the conflict. + */ +@AnimalStereotype +@FishStereotype +@RequestScoped +class Scallop +{ +}