Author: pete.muir(a)jboss.org Date: 2009-08-27 19:07:26 -0400 (Thu, 27 Aug 2009) New Revision: 3612 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java tck/trunk/impl/src/main/resources/tck-audit-cdi.xml Log: Rename methods, mappings Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-08-27 23:05:37 UTC (rev 3611) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-08-27 23:07:26 UTC (rev 3612) @@ -46,12 +46,12 @@ @Test(groups="rewrite") @SpecAssertions({ @SpecAssertion(section = "11.5.2", id = "a"), - @SpecAssertion(section = "11.5.3", id = "a") + @SpecAssertion(section = "11.5.3", id = "a"), + @SpecAssertion(section = "12.2", id = "g") }) public void testDeployedManagerEvent() { - assert ManagerObserver.isManagerDeployed(); - + assert ManagerObserver.isAfterDeploymentValidationCalled(); // Make sure the manager does accept requests now getCurrentManager().fireEvent("event"); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-08-27 23:05:37 UTC (rev 3611) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-08-27 23:07:26 UTC (rev 3612) @@ -21,6 +21,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.IntegrationTest; @@ -41,7 +42,11 @@ { @Test - @SpecAssertion(section="11.5.1", id="a") + @SpecAssertions({ + @SpecAssertion(section="11.5.1", id="a"), + @SpecAssertion(section="12.2", id="b"), + @SpecAssertion(section="12.2", id="c") + }) public void testBeforeBeanDiscoveryEventIsCalled() { assert BeforeBeanDiscoveryObserver.isObserved(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java 2009-08-27 23:05:37 UTC (rev 3611) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ManagerObserver.java 2009-08-27 23:07:26 UTC (rev 3612) @@ -9,38 +9,34 @@ public class ManagerObserver implements Extension { - private static boolean managerInitialized = false; - private static boolean managerDeployed = false; + private static boolean afterBeanDiscoveryCalled = false; + private static boolean afterDeploymentValidationCalled = false; public void managerInitialized(@Observes AfterBeanDiscovery event, @Current BeanManager beanManager) { - managerInitialized = true; + afterBeanDiscoveryCalled = true; } public void managerDeployed(@Observes AfterDeploymentValidation event, @Current BeanManager beanManager) { - assert managerInitialized : "Manager should have been initialized before deployed"; - managerDeployed = true; + assert afterBeanDiscoveryCalled : "AfterBeanDiscovery should have been called before AfterDeploymentValidation"; + afterDeploymentValidationCalled = true; } - public static boolean isManagerInitialized() + public static boolean isAfterBeanDiscoveryCalled() { - return managerInitialized; + return afterBeanDiscoveryCalled; } - public static void setManagerInitialized(boolean managerInitialized) + public static void reset() { - ManagerObserver.managerInitialized = managerInitialized; + ManagerObserver.afterBeanDiscoveryCalled = false; + ManagerObserver.afterDeploymentValidationCalled = false; } - public static boolean isManagerDeployed() + public static boolean isAfterDeploymentValidationCalled() { - return managerDeployed; + return afterDeploymentValidationCalled; } - public static void setManagerDeployed(boolean managerDeployed) - { - ManagerObserver.managerDeployed = managerDeployed; - } - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-08-27 23:05:37 UTC (rev 3611) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/addDefinitionError/AddDefinitionErrorTest.java 2009-08-27 23:07:26 UTC (rev 3612) @@ -1,9 +1,10 @@ package org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDefinitionError; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DefinitionError; import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; -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.jboss.testharness.impl.packaging.IntegrationTest; @@ -28,9 +29,12 @@ @SpecVersion(spec="cdi", version="1.0.20090625") public class AddDefinitionErrorTest extends AbstractJSR299Test { - @Test(groups="jboss-as-broken") + @Test(groups={"jboss-as-broken", "rewrite"}) // WBRI-312 - @SpecAssertion(section = "11.5.2", id = "ca") + @SpecAssertions({ + @SpecAssertion(section = "11.5.2", id = "ca"), + @SpecAssertion(section = "12.2", id = "c") + }) public void testObserverDefinitionErrorTreatedAsDefinitionError() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-08-27 23:05:37 UTC (rev 3611) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-08-27 23:07:26 UTC (rev 3612) @@ -45,7 +45,8 @@ @SpecAssertion(section = "7.3.2", id = "aa"), @SpecAssertion(section = "7.3.2", id = "bb"), @SpecAssertion(section = "7.3.3", id = "b"), - @SpecAssertion(section = "6.5.3", id = "b") + @SpecAssertion(section = "6.5.3", id = "b"), + @SpecAssertion(section = "12.1", id="bba") }) public void testCreateSFSB() throws Exception { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-08-27 23:05:37 UTC (rev 3611) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-08-27 23:07:26 UTC (rev 3612) @@ -168,7 +168,8 @@ @SpecAssertion(section = "3.7.1", id = "a"), @SpecAssertion(section="2.3.4", id="a"), @SpecAssertion(section="3.7", id="aa"), - @SpecAssertion(section="3.7", id="ab") + @SpecAssertion(section="3.7", id="ab"), + @SpecAssertion(section="12.1", id="bca") }) public void testCreateInjectsFieldsDeclaredInJava() { Modified: tck/trunk/impl/src/main/resources/tck-audit-cdi.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-08-27 23:05:37 UTC (rev 3611) +++ tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-08-27 23:07:26 UTC (rev 3612) @@ -5230,12 +5230,12 @@ <assertion id="a" testable="false"> <text>A library jar, EJB jar or rar archive is a bean deployment archive if it has a file named |beans.xml| in the |META-INF| directory. The |WEB-INF/classes| directory of a war is a bean deployment archive if there is a file named |beans.xml| in the |WEBINF| directory of the war. A directory in the JVM classpath is a bean deployment archive if it has a file named |beans.xml| in the |META-INF| directory.</text> - <note>Covered by b* assertions</note> + <note>covered in bb*, bc*, bd*</note> </assertion> - <assertion id="ba"> + <assertion id="ba" testable="false"> <text>The container searches for beans in bean deployment archives in the application classpath.</text> - <note>Check for a jar installed as a library</note> + <note>covered in bb*, bc*, bd*</note> </assertion> <group> @@ -5244,16 +5244,19 @@ <text>Check an EJB jar in an EAR</text> </assertion> <assertion id="bbb"> - <text>Check a library in an EAR</text> + <text>Check a bundled library in an EAR</text> </assertion> <assertion id="bbc"> - <text>Check a library in a WAR</text> + <text>Check a bundled library in a WAR</text> </assertion> <assertion id="bbd"> <text>Check a rar</text> </assertion> <assertion id="bbe"> <text>Check a war in an ear</text> + </assertion> + <assertion id="bbf"> + <text>Check for a jar installed as a library</text> </assertion> </group> @@ -5262,8 +5265,11 @@ <assertion id="bca"> <text>Check classes in the war</text> </assertion> - <assertion id="bca"> - <text>Check libraries in the war</text> + <assertion id="bcb"> + <text>Check bundled libraries in the war</text> + </assertion> + <assertion id="bcc"> + <text>Check for a jar installed as a library</text> </assertion> </group> @@ -5283,8 +5289,9 @@ </assertion> </group> - <assertion id="be"> + <assertion id="be" testable="false"> <text>When searching for beans, the container considers any Java class in any bean deployment archive, and any |ejb-jar.xml| file in the metadata directory of any EJB bean deployment archive.</text> + <note>covered in bb*, bc*, bd*</note> </assertion> <assertion id="ca">