[webbeans-commits] Webbeans SVN: r3626 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/deployment and 16 other directories.

Author: pete.muir(a)jboss.org Date: 2009-08-31 18:12:53 -0400 (Mon, 31 Aug 2009) New Revision: 3626 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Bar.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Foo.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Bar.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Foo.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 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/interceptors/definition/InterceptorDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java tck/trunk/impl/src/main/resources/tck-audit-cdi.xml Log: start to fix up chapter 12 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-08-31 21:54:35 UTC (rev 3625) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -50,7 +50,8 @@ @SpecAssertion(section="8.1.1", id="a"), @SpecAssertion(section="8.1.3", id="c"), @SpecAssertion(section="8.3", id="aa"), - @SpecAssertion(section="11.1.1", id="a") + @SpecAssertion(section="11.1.1", id="a"), + @SpecAssertion(section = "12.3", id = "kc") }) public void testDecoratorIsManagedBean() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java 2009-08-31 21:54:35 UTC (rev 3625) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -38,9 +38,11 @@ @Test(groups = {"ri-broken", "rewrite"}) //Still not clear how the container should now allow this, but the RI is clearly not implementing this assertion // TODO Needs Extension stuff adding + // TODO This isn't what this assertion means, it really means external requests, very hard to test // WBRI-300 @SpecAssertions({ - @SpecAssertion(section = "11.5.3", id = "d") + @SpecAssertion(section = "11.5.3", id = "d"), + @SpecAssertion(section = "12.2", id = "h") }) public void testRequestBeforeValidationCompletes() { Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Bar.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Bar.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Bar.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -0,0 +1,26 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary; + +/** + * @author pmuir + * + */ +public class Bar +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Bar.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Foo.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Foo.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Foo.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -0,0 +1,26 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary; + +/** + * @author pmuir + * + */ +public class Foo +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Foo.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -0,0 +1,71 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary; + +import java.io.IOException; + +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.ArtifactDescriptor; +import org.jboss.testharness.impl.packaging.Classes; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; +import org.jboss.testharness.impl.packaging.ResourceDescriptorImpl; +import org.jboss.testharness.impl.packaging.TCKArtifact; +import org.jboss.testharness.impl.packaging.jsr299.JSR299ArtifactDescriptor; +import org.testng.annotations.Test; + +/** + * Tests related to the final deployment phase of the lifecycle. + * + * @author David Allen + */ +@Artifact(addCurrentPackage=false) +// We put Foo in the ejb jar, but Bar goes in the library +(a)Classes({LibraryInEarTest.class, Foo.class}) +@Test +@SpecVersion(spec="cdi", version="1.0.20090625") +@IntegrationTest +(a)Packaging(PackagingType.EAR) +public class LibraryInEarTest extends AbstractJSR299Test +{ + + @Override + protected TCKArtifact postCreate(TCKArtifact artifact) throws IOException + { + ArtifactDescriptor library = new ArtifactDescriptor(LibraryInEarTest.class); + library.getClasses().add(Bar.class); + library.getResources().add(new ResourceDescriptorImpl(JSR299ArtifactDescriptor.BEANS_XML_DESTINATION, JSR299ArtifactDescriptor.STANDARD_BEANS_XML_FILE_NAME)); + artifact.getLibraries().add(new ResourceDescriptorImpl("cdi-tck-beans.jar", library.getJarAsStream())); + return artifact; + } + + @Test(groups = {"jboss-as-broken"}) + @SpecAssertions({ + @SpecAssertion(section = "12.1", id="bbb") + }) + public void test() + { + assert getCurrentManager().getBeans(Foo.class).size() == 1; + assert getCurrentManager().getBeans(Bar.class).size() == 1; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -0,0 +1,68 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary; + +import java.io.IOException; + +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.ArtifactDescriptor; +import org.jboss.testharness.impl.packaging.Classes; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.ResourceDescriptorImpl; +import org.jboss.testharness.impl.packaging.TCKArtifact; +import org.jboss.testharness.impl.packaging.jsr299.JSR299ArtifactDescriptor; +import org.testng.annotations.Test; + +/** + * Tests related to the final deployment phase of the lifecycle. + * + * @author David Allen + */ +@Artifact(addCurrentPackage=false) +// We put Foo in the ejb jar, but Bar goes in the library +(a)Classes({LibraryInWarTest.class, Foo.class}) +@Test +@SpecVersion(spec="cdi", version="1.0.20090625") +@IntegrationTest +public class LibraryInWarTest extends AbstractJSR299Test +{ + + @Override + protected TCKArtifact postCreate(TCKArtifact artifact) throws IOException + { + ArtifactDescriptor library = new ArtifactDescriptor(LibraryInWarTest.class); + library.getClasses().add(Bar.class); + library.getResources().add(new ResourceDescriptorImpl(JSR299ArtifactDescriptor.BEANS_XML_DESTINATION, JSR299ArtifactDescriptor.STANDARD_BEANS_XML_FILE_NAME)); + artifact.getLibraries().add(new ResourceDescriptorImpl("cdi-tck-beans.jar", library.getJarAsStream())); + return artifact; + } + + @Test(groups = {}) + @SpecAssertions({ + @SpecAssertion(section = "12.1", id="bcb") + }) + public void test() + { + assert getCurrentManager().getBeans(Foo.class).size() == 1; + assert getCurrentManager().getBeans(Bar.class).size() == 1; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -0,0 +1,66 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary; + +import java.io.IOException; + +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.ArtifactDescriptor; +import org.jboss.testharness.impl.packaging.Classes; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.ResourceDescriptorImpl; +import org.jboss.testharness.impl.packaging.TCKArtifact; +import org.testng.annotations.Test; + +/** + * Tests related to the final deployment phase of the lifecycle. + * + * @author David Allen + */ +@Artifact(addCurrentPackage=false) +// We put Foo in the ejb jar, but Bar goes in the library +(a)Classes({LibraryMissingBeansXmlTest.class, Foo.class}) +@Test +@SpecVersion(spec="cdi", version="1.0.20090625") +@IntegrationTest +public class LibraryMissingBeansXmlTest extends AbstractJSR299Test +{ + + @Override + protected TCKArtifact postCreate(TCKArtifact artifact) throws IOException + { + ArtifactDescriptor library = new ArtifactDescriptor(LibraryMissingBeansXmlTest.class); + library.getClasses().add(Bar.class); + artifact.getLibraries().add(new ResourceDescriptorImpl("cdi-tck-beans.jar", library.getJarAsStream())); + return artifact; + } + + @Test(groups = {}) + @SpecAssertions({ + @SpecAssertion(section = "12.1", id="ca") + }) + public void test() + { + assert getCurrentManager().getBeans(Foo.class).size() == 1; + assert getCurrentManager().getBeans(Bar.class).isEmpty(); + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Bar.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Bar.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Bar.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -0,0 +1,26 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.jsr299.tck.tests.deployment.packaging.installedLibrary; + +/** + * @author pmuir + * + */ +public class Bar +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Bar.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -0,0 +1,87 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.jsr299.tck.tests.deployment.packaging.installedLibrary; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.logging.Logger; + +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.ArtifactDescriptor; +import org.jboss.testharness.impl.packaging.Classes; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; +import org.jboss.testharness.impl.packaging.ResourceDescriptorImpl; +import org.jboss.testharness.impl.packaging.TCKArtifact; +import org.jboss.testharness.impl.packaging.jsr299.JSR299ArtifactDescriptor; +import org.jboss.testharness.impl.util.Files; +import org.testng.annotations.Test; + +/** + * Tests related to the final deployment phase of the lifecycle. + * + * @author David Allen + */ +@Artifact(addCurrentPackage=false) +// We put Foo in the ejb jar, but Bar goes in the library +(a)Classes({EarInstalledLibraryTest.class, Foo.class}) +@Test +@SpecVersion(spec="cdi", version="1.0.20090625") +(a)Packaging(PackagingType.EAR) +@IntegrationTest +public class EarInstalledLibraryTest extends AbstractJSR299Test +{ + + private Logger log = Logger.getLogger(EarInstalledLibraryTest.class.getName()); + + private static final String LIBRARY_FILE_NAME = System.getProperty( "java.io.tmpdir" ) + "cdi-tck-beans.jar"; + + @Override + protected TCKArtifact postCreate(TCKArtifact artifact) throws IOException + { + ArtifactDescriptor library = new ArtifactDescriptor(EarInstalledLibraryTest.class); + library.getClasses().add(Bar.class); + library.getResources().add(new ResourceDescriptorImpl(JSR299ArtifactDescriptor.BEANS_XML_DESTINATION, JSR299ArtifactDescriptor.STANDARD_BEANS_XML_FILE_NAME)); + File file = new File(LIBRARY_FILE_NAME); + InputStream is = library.getJarAsStream(); + Files.copy(is, file); + is.close(); + return artifact; + } + + @Test(groups = {"jboss-as-broken", "rewrite"}) + // TODO Need a better way to add the library! + @SpecAssertions({ + @SpecAssertion(section = "12.1", id="bbf") + }) + public void test() + { + log.warning("********************************************************************************************************************"); + log.warning("You must make " + LIBRARY_FILE_NAME + " an installed"); + log.warning("library for your app server for this test to pass"); + log.warning("********************************************************************************************************************"); + assert getCurrentManager().getBeans(Foo.class).size() == 1; + assert getCurrentManager().getBeans(Bar.class).size() == 1; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Foo.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Foo.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Foo.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -0,0 +1,26 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.jsr299.tck.tests.deployment.packaging.installedLibrary; + +/** + * @author pmuir + * + */ +public class Foo +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Foo.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jboss.jsr299.tck.tests.deployment.packaging.installedLibrary; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.logging.Logger; + +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.ArtifactDescriptor; +import org.jboss.testharness.impl.packaging.Classes; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.ResourceDescriptorImpl; +import org.jboss.testharness.impl.packaging.TCKArtifact; +import org.jboss.testharness.impl.packaging.jsr299.JSR299ArtifactDescriptor; +import org.jboss.testharness.impl.util.Files; +import org.testng.annotations.Test; + +/** + * Tests related to the final deployment phase of the lifecycle. + * + * @author David Allen + */ +@Artifact(addCurrentPackage=false) +// We put Foo in the ejb jar, but Bar goes in the library +(a)Classes({WarInstalledLibraryTest.class, Foo.class}) +@Test +@SpecVersion(spec="cdi", version="1.0.20090625") +@IntegrationTest +public class WarInstalledLibraryTest extends AbstractJSR299Test +{ + + private Logger log = Logger.getLogger(WarInstalledLibraryTest.class.getName()); + + private static final String LIBRARY_FILE_NAME = System.getProperty( "java.io.tmpdir" ) + "cdi-tck-beans.jar"; + + @Override + protected TCKArtifact postCreate(TCKArtifact artifact) throws IOException + { + ArtifactDescriptor library = new ArtifactDescriptor(WarInstalledLibraryTest.class); + library.getClasses().add(Bar.class); + library.getResources().add(new ResourceDescriptorImpl(JSR299ArtifactDescriptor.BEANS_XML_DESTINATION, JSR299ArtifactDescriptor.STANDARD_BEANS_XML_FILE_NAME)); + File file = new File(LIBRARY_FILE_NAME); + InputStream is = library.getJarAsStream(); + Files.copy(is, file); + is.close(); + return artifact; + } + + @Test(groups = {"jboss-as-broken", "rewrite"}) + // TODO Need a better way to add the library! + @SpecAssertions({ + @SpecAssertion(section = "12.1", id="bcc") + }) + public void test() + { + log.warning("********************************************************************************************************************"); + log.warning("You must make " + LIBRARY_FILE_NAME + " an installed"); + log.warning("library for your app server for this test to pass"); + log.warning("********************************************************************************************************************"); + assert getCurrentManager().getBeans(Foo.class).size() == 1; + assert getCurrentManager().getBeans(Bar.class).size() == 1; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java 2009-08-31 21:54:35 UTC (rev 3625) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -93,14 +93,14 @@ } @Test(groups = { "events" }) - @SpecAssertion(section = "12.3", id = "oa") + @SpecAssertion(section = "12.3", id = "o") public void testObserverMethodAutomaticallyRegistered() { assert !getCurrentManager().resolveObserverMethods(new String(), new AnnotationLiteral<Secret>() {}).isEmpty(); } @Test(groups = { "events" }) - @SpecAssertion(section = "12.3", id = "oa") + @SpecAssertion(section = "12.3", id = "o") public void testObserverMethodNotAutomaticallyRegisteredForDisabledBeans() { Set<ObserverMethod<?, Ghost>> ghostObservers = getCurrentManager().resolveObserverMethods(new Ghost()); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java 2009-08-31 21:54:35 UTC (rev 3625) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -42,7 +42,10 @@ public class ProcessAnnotatedTypeTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "11.5.5", id = "a") + @SpecAssertions({ + @SpecAssertion(section = "11.5.5", id = "a"), + @SpecAssertion(section = "12.3", id = "ba") + }) public void testProcessAnnotatedTypeEventsSent() { // Randomly test some of the classes and interfaces that should have Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-08-31 21:54:35 UTC (rev 3625) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -126,7 +126,8 @@ @SpecAssertion(section = "11.5.7", id = "a"), @SpecAssertion(section = "11.5.7", id = "b"), @SpecAssertion(section = "11.5.7", id = "c"), - @SpecAssertion(section = "11.5.7", id = "d") + @SpecAssertion(section = "11.5.7", id = "d"), + @SpecAssertion(section = "12.3", id = "ha") }) public void testProduceCallsProducerMethod() { @@ -143,7 +144,8 @@ @SpecAssertion(section = "11.5.7", id = "a"), @SpecAssertion(section = "11.5.7", id = "b"), @SpecAssertion(section = "11.5.7", id = "c"), - @SpecAssertion(section = "11.5.7", id = "d") + @SpecAssertion(section = "11.5.7", id = "d"), + @SpecAssertion(section = "12.3", id = "hb") }) public void testProduceAccessesProducerField() { @@ -193,7 +195,8 @@ @Test(groups = "ri-broken") @SpecAssertions({ @SpecAssertion(section = "11.2", id = "i"), - @SpecAssertion(section = "11.5.6", id = "ba") + @SpecAssertion(section = "11.5.6", id = "ba"), + @SpecAssertion(section = "12.3", id = "ba") }) public void testInjectionTargetInject() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-08-31 21:54:35 UTC (rev 3625) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -4,6 +4,7 @@ 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.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; @@ -15,7 +16,11 @@ public class ConstructorHasDisposesParameterTest extends AbstractJSR299Test { @Test(groups = { "disposalMethod" }) - @SpecAssertion(section = "3.1.4.1", id = "da") + @SpecAssertions({ + @SpecAssertion(section = "3.1.4.1", id = "da"), + @SpecAssertion(section = "12.2", id="db"), + @SpecAssertion(section = "12.4", id= "a") + }) public void testConstructorHasDisposesParameter() throws Exception { assert false; 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-31 21:54:35 UTC (rev 3625) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -151,7 +151,8 @@ @SpecAssertions({ @SpecAssertion(section="2", id="g"), @SpecAssertion(section="2.2.1", id="b"), - @SpecAssertion(section="2.2.1", id="k") + @SpecAssertion(section="2.2.1", id="k"), + @SpecAssertion(section="12.2", id="da") }) public void testManagedBean() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-08-31 21:54:35 UTC (rev 3625) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -169,7 +169,8 @@ @Test(groups = "ri-broken") @SpecAssertions({ @SpecAssertion(section = "7.2", id = "a"), - @SpecAssertion(section = "9.2", id = "a") + @SpecAssertion(section = "9.2", id = "a"), + @SpecAssertion(section = "12.3", id = "kb") }) public void testManagedBeanIsIntercepted() { @@ -225,7 +226,8 @@ @Test(groups = "ri-broken") @SpecAssertions({ @SpecAssertion(section = "9.1.2", id = "a"), - @SpecAssertion(section = "9.1.2", id = "b") + @SpecAssertion(section = "9.1.2", id = "b"), + @SpecAssertion(section = "2.7.1.2", id = "b") }) public void testStereotypeInterceptorBindings() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-08-31 21:54:35 UTC (rev 3625) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -19,6 +19,7 @@ import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.DeploymentError; 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.ExpectedDeploymentException; @@ -33,7 +34,10 @@ public class ArrayTest extends AbstractJSR299Test { @Test - @SpecAssertion(section = "5.5.1", id = "da") + @SpecAssertions({ + @SpecAssertion(section = "5.5.1", id = "da"), + @SpecAssertion(section = "12.4", id = "b") + }) public void testInjectionPointWithArrayType() { assert false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-08-31 21:54:35 UTC (rev 3625) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -52,7 +52,7 @@ } @Test(groups = "jboss-as-broken") - @SpecAssertion(section = "5.6", id = "e") + @SpecAssertion(section = "5.6", id = "ed") //JBAS-7046 public void testInjectionOnEJBInterceptor() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2009-08-31 21:54:35 UTC (rev 3625) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -43,7 +43,7 @@ { @Test @SpecAssertions( { - @SpecAssertion(section = "5.6", id = "e"), + @SpecAssertion(section = "5.6", id = "ef"), @SpecAssertion(section = "5.6.4", id = "a") }) public void testInjectionIntoServlet() throws Exception { @@ -54,7 +54,7 @@ @Test @SpecAssertions( { - @SpecAssertion(section = "5.6", id = "e"), + @SpecAssertion(section = "5.6", id = "eg"), @SpecAssertion(section = "5.6.4", id = "a") }) public void testInjectionIntoFilter() throws Exception { @@ -64,7 +64,7 @@ } @Test - @SpecAssertion(section = "5.6", id = "e") + @SpecAssertion(section = "5.6", id = "ea") public void testInjectionIntoServletListener() throws Exception { WebClient webClient = new WebClient(); @@ -73,7 +73,7 @@ } @Test - @SpecAssertion(section = "5.6", id = "e") + @SpecAssertion(section = "5.6", id = "eb") public void testInjectionIntoTagHandler() throws Exception { WebClient webClient = new WebClient(); @@ -84,7 +84,7 @@ } @Test - @SpecAssertion(section = "5.6", id = "e") + @SpecAssertion(section = "5.6", id = "ec") public void testInjectionIntoTagLibraryListener() throws Exception { WebClient webClient = new WebClient(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2009-08-31 21:54:35 UTC (rev 3625) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -37,7 +37,7 @@ SheepWSEndPointService service; @Test(groups = "jboss-as-broken") - @SpecAssertion(section = "5.6", id = "e") + @SpecAssertion(section = "5.6", id = "ee") // JBAS-7046 public void testInjectionIntoWebServiceEndpoint() throws Exception { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-08-31 21:54:35 UTC (rev 3625) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-08-31 22:12:53 UTC (rev 3626) @@ -43,7 +43,8 @@ @SpecAssertion(section = "5.2", id = "c"), @SpecAssertion(section = "5.2", id = "ea"), @SpecAssertion(section = "2.6", id = "a"), - @SpecAssertion(section = "2.6.1", id = "a") + @SpecAssertion(section = "2.6.1", id = "a"), + @SpecAssertion(section = "12.3", id = "ka") }) public void testPolicyAvailability() throws Exception Modified: tck/trunk/impl/src/main/resources/tck-audit-cdi.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-08-31 21:54:35 UTC (rev 3625) +++ tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-08-31 22:12:53 UTC (rev 3626) @@ -2164,9 +2164,30 @@ <text>The container is required to perform dependency injection whenever it instantiates non-contextual instances of managed beans.</text> </assertion> - <assertion id="e"> + <group> <text>The container is required to perform dependency injection whenever it instantiates instances of any other Java EE component class supporting injection.</text> - </assertion> + <assertion id="ea"> + <text>Test injection into a servlet listener</text> + </assertion> + <assertion id="eb"> + <text>Test injection into a tag handler</text> + </assertion> + <assertion id="ec"> + <text>Test injection into a tag library listener</text> + </assertion> + <assertion id="ed"> + <text>Test injection into an EJB Interceptor</text> + </assertion> + <assertion id="ee"> + <text>Test injection into a WS endpoint</text> + </assertion> + <assertion id="ef"> + <text>Test injection into a servlet</text> + </assertion> + <assertion id="eg"> + <text>Test injection into a filter</text> + </assertion> + </group> <assertion id="f" testable="false"> <text>In a Java EE 5 environment, the container is not required to support injection for non-contextual objects.</text> @@ -5275,17 +5296,21 @@ <group> <text>An embeddable EJB container searches each bean deployment archive in the JVM classpath that is listed in the value of the embeddable container initialization property |javax.ejb.embeddable.modules|, or every bean deployment archive in the JVM classpath if the property is not specified. The bean deployment archives might be directories, library jars or EJB jars.</text> - <assertion id="bda"> - <text>Check modules specified by |javax.ejb.embeddable.modules|</text> + <assertion id="bda" testable="false"> + <text>Check modules specified by |javax.ejb.embeddable.modules|</text> + <note>1.0 release of the TCK does not cover embeddable EJB</note> </assertion> - <assertion id="bdb"> - <text>Check libraries</text> + <assertion id="bdb" testable="false"> + <text>Check libraries</text> + <note>1.0 release of the TCK does not cover embeddable EJB</note> </assertion> - <assertion id="bdc"> - <text>Check directories</text> + <assertion id="bdc" testable="false"> + <text>Check directories</text> + <note>1.0 release of the TCK does not cover embeddable EJB</note> </assertion> - <assertion id="bda"> - <text>Check ejb jars</text> + <assertion id="bda" testable="false"> + <text>Check ejb jars</text> + <note>1.0 release of the TCK does not cover embeddable EJB</note> </assertion> </group> @@ -5318,9 +5343,18 @@ <text>Next, the container must fire an event of type |BeforeBeanDiscovery|, as defined in Section 11.5.1, "BeforeBeanDiscovery event".</text> </assertion> - <assertion id="d"> + <group> <text>Next, the container must perform bean discovery, and abort initialization of the application if any definition errors exist, as defined in Section 12.4, "Problems detected automatically by the container".</text> - </assertion> + <assertion id="da"> + <text>Check beans are discovered</text> + </assertion> + <assertion id="db"> + <text> + Check definitions errors occur + </text> + </assertion> + </group> + <assertion id="e"> <text>Next, the container must fire an event of type |AfterBeanDiscovery|, as defined in Section 11.5.2, "AfterBeanDiscovery event", and abort initialization of the application if any observer registers a definition error.</text> @@ -5336,64 +5370,168 @@ <assertion id="h"> <text>Finally, the container begins directing requests to the application.</text> + <note>Can only check the inverse, that requests aren't directed to the application before</note> </assertion> </section> <section id="12.3" title="Bean discovery"> - <assertion id="a"> + <assertion id="a" testable="false"> <text>The container automatically discovers managed beans (according to the rules of Section 3.2.1, "Which Java classes are managed beans?") and session beans in bean deployment archives and searches the bean classes for producer methods, producer fields, disposal methods and observer methods.</text> + <note>Statement of intent</note> </assertion> - <assertion id="b"> + <group> <text>For each Java class in any bean deployment archive, the container must create an |AnnotatedType| representing the class and fire an event of type |ProcessAnnotatedType|, as defined in Section 11.5.5, "ProcessAnnotatedType event".</text> - </assertion> + <assertion id="ba"> + <text>Check managed bean</text> + </assertion> + <assertion id="bb"> + <text>Check session bean</text> + </assertion> + <assertion id="bc"> + <text>Check non-contextual session bean</text> + </assertion> + <assertion id="bd"> + <text>Check JSF managed beans</text> + </assertion> + <assertion id="be"> + <text>Check servlet listener</text> + </assertion> + <assertion id="bf"> + <text>Check tag handler</text> + </assertion> + <assertion id="bg"> + <text>Check tag library listener</text> + </assertion> + <assertion id="bh"> + <text>Check EJB Interceptor</text> + </assertion> + <assertion id="bi"> + <text>Check WS endpoint</text> + </assertion> + <assertion id="bj"> + <text>Check servlet</text> + </assertion> + <assertion id="bk"> + <text>Check filter</text> + </assertion> + </group> - <assertion id="c"> + <assertion id="c" testable="false"> <text>For each Java class in any bean deployment archive, the container must inspect the class metadata to determine if it is a bean or other Java EE component class supporting injection, or if it declares event mappings.</text> + <note>No consequence</note> </assertion> - <assertion id="d"> + <assertion id="d" testable="false"> <text>For each Java class in any bean deployment archive, the container must detect definition errors by validating the class and its metadata.</text> + <note>Tested elsewhere</note> </assertion> - <assertion id="e"> + <group> <text>For each Java class in any bean deployment archive, the container must, if the class is a managed bean, session bean, producer method or field, or other Java EE component class supporting injection, create an |InjectionTarget| for the class, as defined in Section 11.2, "The Producer and InjectionTarget interfaces", and fire an event of type |ProcessInjectionTarget|, as defined in Section 11.5.6, "ProcessInjectionTarget event"</text> - </assertion> + <assertion id="ba"> + <text>Check managed bean</text> + </assertion> + <assertion id="bb"> + <text>Check session bean</text> + </assertion> + <assertion id="bb"> + <text>Check producer field</text> + </assertion> + <assertion id="bb"> + <text>Check producer method</text> + </assertion> + <assertion id="bc"> + <text>Check non-contextual session bean</text> + </assertion> + <assertion id="bd"> + <text>Check JSF managed beans</text> + </assertion> + <assertion id="be"> + <text>Check servlet listener</text> + </assertion> + <assertion id="bf"> + <text>Check tag handler</text> + </assertion> + <assertion id="bg"> + <text>Check tag library listener</text> + </assertion> + <assertion id="bh"> + <text>Check EJB Interceptor</text> + </assertion> + <assertion id="bi"> + <text>Check WS endpoint</text> + </assertion> + <assertion id="bj"> + <text>Check servlet</text> + </assertion> + <assertion id="bk"> + <text>Check filter</text> + </assertion> + </group> - <assertion id="fa"> + <group> <text>For each Java class in any bean deployment archive, the container must, if the class is a bean, create a |Bean| object that implements the rules defined in Section 7.3.1, "Lifecycle of managed beans", Section 7.3.2, "Lifecycle of stateful session beans" or Section 7.3.3, "Lifecycle of stateless session and singleton beans", and fire an event which is a subtype of |ProcessBean|, as defined in Section 11.5.8, "ProcessBean event".</text> - </assertion> + <assertion id="fa"> + <text>Check a managed bean</text> + </assertion> + <assertion id="fb"> + <text>Check a session bean</text> + </assertion> + </group> - <assertion id="fb"> + <assertion id="g"> <text>For each session bean declared in |ejb-jar.xml| in each EJB bean deployment archive the container must create a |Bean| object that implements the rules defined in Section 7.3.2, "Lifecycle of stateful session beans" or Section 7.3.3, "Lifecycle of stateless session and singleton beans", and fire an event of type |ProcessSessionBean|, as defined in Section 11.5.8, "ProcessBean event".</text> </assertion> - <assertion id="fc"> - <text>For each bean, the container must search the clas for producer methods and fields, including resources, and for each producer method or field create a |Producer|, as defined in Section 11.2, "The Producer and InjectionTarget interfaces", and fire an event of type |ProcessProducer|, as defined in Section 11.5.7, "ProcessProducer event", and then -create a |Bean| object that implements the rules defined in Section 7.3.4, "Lifecycle of producer methods", Section 7.3.5, "Lifecycle of producer fields" or Section 7.3.6, "Lifecycle of resources", and fire an event which is a subtype of |ProcessBean|, as defined in Section 11.5.8, "ProcessBean event".</text> - </assertion> + <group> + <text>For each bean, the container must search the clas for producer methods and fields, including resources, and for each producer method or field create a |Producer|, as defined in Section 11.2, "The Producer and InjectionTarget interfaces", and fire an event of type |ProcessProducer|, as defined in Section 11.5.7, "ProcessProducer event", and then create a |Bean| object that implements the rules defined in Section 7.3.4, "Lifecycle of producer methods", Section 7.3.5, "Lifecycle of producer fields" or Section 7.3.6, "Lifecycle of resources", and fire an event which is a subtype of |ProcessBean|, as defined in Section 11.5.8, "ProcessBean event".</text> + <assertion id="ha"> + <text> + Check a producer method + </text> + </assertion> + <assertion id="hb"> + <text> + Check a producer field + </text> + </assertion> + </group> - <assertion id="fd"> + + <assertion id="i"> <text>For each bean, the container must search the class for observer methods, and for each observer method create an |ObserverMethod| object, as defined in Section 11.1.3, "The ObserverMethod interface" and fire an event of type |ProcessObserverMethod|, as defined in Section 11.5.9, "ProcessObserverMethod event".</text> </assertion> - <assertion id="ka"> + <group> <text>The container determines which policies, interceptors and decorators are enabled, according to the rules defined in Section 5.2, "Policy enablement", Section 9.4, "Interceptor enablement and ordering" and Section 8.2, "Decorator enablement and ordering", taking into account any |&lt;enable&gt;|, |&lt;interceptors&gt;| and |&lt;Decorators&gt;| declarations in the |beans.xml| files, and registers the |Bean| and |ObserverMethod| objects.</text> - </assertion> - - <assertion id="la"> + <assertion id="ka"> + <text>Check only beans for enabled policies registered</text> + </assertion> + <assertion id="kb"> + <text>Check only enabled interceptors registered</text> + </assertion> + <assertion id="kc"> + <text>Check only enabled decorators registered</text> + </assertion> + </group> + + <assertion id="l" testable="false"> <text>For each enabled bean that is not an interceptor or decorator, the container registers an instance of the |Bean| interface defined in Section 11.1, "The Bean interface".</text> + <note>Checked above</note> </assertion> - <assertion id="m"> + <assertion id="m" testable="false"> <text>For each enabled interceptor, the container registers an instance of the |Interceptor| interface as defined in Section 11.1.2, "The Interceptor interface".</text> + <note>Checked above</note> </assertion> - <assertion id="n"> + <assertion id="n" testable="false"> <text>For each enabled decorator, the container registers an instance of the |Decorator| interface defined in Section 11.1.1, "The Decorator interface".</text> + <note>Checked above</note> </assertion> - <assertion id="oa"> + <assertion id="o"> <text>For each observer method of an enabled bean, the container registers an instance of the |ObserverMethod| interface defined in Section 11.1.3, "The ObserverMethod interface".</text> </assertion> </section>