February 2009 - weld-commits - Jboss List Archives

[webbeans-commits] Webbeans SVN: r1493 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck: integration/lookup/non/contextual and 2 other directories.

by webbeans-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-02-11 21:25:00 -0500 (Wed, 11 Feb 2009) New Revision: 1493 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/non/contextual/NonContextualInjectionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java Log: removed weird characters Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java 2009-02-12 00:59:38 UTC (rev 1492) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java 2009-02-12 02:25:00 UTC (rev 1493) @@ -24,7 +24,7 @@ /** * When the create() method of a Bean object that represents a stateful * session bean that is called, the container creates and returns a session - * bean proxy, as defined in Section 3.3.9, “Session bean proxies”. + * bean proxy, as defined in Section 3.3.9, "Session bean proxies". */ @Test(groups = { "enterpriseBeans", "lifecycle", "integration", "stub" }) @SpecAssertion(section = "6.5", id = "unknown") @@ -88,8 +88,8 @@ /** * Next, if the EJB instance is a contextual instance of a bean, the * container initializes the values of any fields with initial values - * specified in XML, as defined in Section 9.5.5, “Field initial value - * declarations”. + * specified in XML, as defined in Section 9.5.5, "Field initial value + * declarations". */ @Test(groups = { "enterpriseBeans", "lifecycle", "integration", "stub" }) @SpecAssertion(section = "6.11", id = "unknown") @@ -112,8 +112,8 @@ /** * Finally, the container builds the interceptor and decorator stacks for the - * instance as defined in Section A.3.10, “Interceptor stack creation” and - * Section A.5.8, “Decorator stack creation” and binds them to the instance. + * instance as defined in Section A.3.10, "Interceptor stack creation" and + * Section A.5.8, "Decorator stack creation" and binds them to the instance. */ @Test(groups = { "enterpriseBeans", "lifecycle", "interceptors", "stub" }) @SpecAssertion(section = "6.11", id = "unknown") @@ -124,8 +124,8 @@ /** * Finally, the container builds the interceptor and decorator stacks for the - * instance as defined in Section A.3.10, “Interceptor stack creation” and - * Section A.5.8, “Decorator stack creation” and binds them to the instance. + * instance as defined in Section A.3.10, "Interceptor stack creation" and + * Section A.5.8, "Decorator stack creation" and binds them to the instance. */ @Test(groups = { "enterpriseBeans", "lifecycle", "decorators", "stub" }) @SpecAssertion(section = "6.11", id = "unknown") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/non/contextual/NonContextualInjectionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/non/contextual/NonContextualInjectionTest.java 2009-02-12 00:59:38 UTC (rev 1492) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/non/contextual/NonContextualInjectionTest.java 2009-02-12 02:25:00 UTC (rev 1493) @@ -17,7 +17,7 @@ * creation, the container must treat non-contextual instances of session * beans as instances of the most specialized bean that specializes the bean * with binding @New and de- ployment type @Standard defined in Section - * 3.3.6, “Session beans with the @New binding”. + * 3.3.6, "Session beans with the @New binding". */ @Test(groups = { "stub", "integration" }) @SpecAssertion(section = "5.12.1", id = "unknown") Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-12 00:59:38 UTC (rev 1492) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-12 02:25:00 UTC (rev 1493) @@ -169,7 +169,7 @@ /** * An event binding type is just an ordinary binding type as specified in - * Section 2.3.2, “Defining new binding types” with the exception that it may + * Section 2.3.2, "Defining new binding types" with the exception that it may * be declared @Target({FIELD, PARAMETER}). More formally, an event binding * type is a Java annotation defined as @Target({FIELD, PARAMETER}) or * @@ -560,8 +560,8 @@ /** * In addition to the event parameter, observer methods may declare * additional parameters, which may declare bindings. The container calls the - * method Manager.getInstanceToInject() defined in Section 5.7.1, “Resolving - * dependencies” to determine a value for each parameter of an observer + * method Manager.getInstanceToInject() defined in Section 5.7.1, "Resolving + * dependencies" to determine a value for each parameter of an observer * method and calls the observer method with those parameter values. * * To invoke an observer method, the container must pass the event object to Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-12 00:59:38 UTC (rev 1492) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-12 02:25:00 UTC (rev 1493) @@ -60,11 +60,11 @@ * The following algorithm must be used by the container when resolving a * bean by name: * - * • The container identifies the set of matching enabled beans which have + * The container identifies the set of matching enabled beans which have * the given name. * - * • Next, the container examines the deployment types of the matching beans, - * as defined in Section 2.5.7, “Deployment type precedence”, and returns the + * Next, the container examines the deployment types of the matching beans, + * as defined in Section 2.5.7, "Deployment type precedence", and returns the * set of beans with the highest precedence deployment type that occurs in * the set. If there are no matching beans, an empty set is returned. * @throws Exception

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1492 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-11 19:59:38 -0500 (Wed, 11 Feb 2009) New Revision: 1492 Removed: ri/trunk/jboss-tck-runner/tck-unit-tests.xml Modified: ri/trunk/jboss-tck-runner/pom.xml tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java Log: some fixes to non-incontainer tests Modified: ri/trunk/jboss-tck-runner/pom.xml =================================================================== --- ri/trunk/jboss-tck-runner/pom.xml 2009-02-12 00:29:02 UTC (rev 1491) +++ ri/trunk/jboss-tck-runner/pom.xml 2009-02-12 00:59:38 UTC (rev 1492) @@ -43,7 +43,64 @@ </dependencies> <build> - <plugins> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>generate-test-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <stripVersion>true</stripVersion> + <artifactItems> + <artifactItem> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-impl</artifactId> + <type>xml</type> + <classifier>suite</classifier> + <overWrite>true</overWrite> + </artifactItem> + <artifactItem> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-porting-package</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-${jsr299.tck.version}-suite.xml</suiteXmlFile> + </suiteXmlFiles> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <executions> + <execution> + <id>generate-test-report</id> + <phase>test</phase> + <goals> + <goal>report-only</goal> + </goals> + </execution> + </executions> + <configuration> + <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> + <outputName>test-report</outputName> + </configuration> + </plugin> </plugins> </build> @@ -59,34 +116,10 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>generate-test-sources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <stripVersion>true</stripVersion> - <artifactItems> - <artifactItem> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-porting-package</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <suiteXmlFiles> - <suiteXmlFile>tck-unit-tests.xml</suiteXmlFile> + <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-${jsr299.tck.version}-suite.xml</suiteXmlFile> </suiteXmlFiles> <systemProperties> <property> @@ -107,70 +140,6 @@ </plugins> </build> </profile> - <profile> - <id>unit-tests</id> - <activation> - <property> - <name>unit</name> - <value>true</value> - </property> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>generate-test-sources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-impl</artifactId> - <type>xml</type> - <classifier>suite</classifier> - <overWrite>true</overWrite> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-${jsr299.tck.version}-suite.xml</suiteXmlFile> - </suiteXmlFiles> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <executions> - <execution> - <id>generate-test-report</id> - <phase>test</phase> - <goals> - <goal>report-only</goal> - </goals> - </execution> - </executions> - <configuration> - <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> - <outputName>test-report</outputName> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> Deleted: ri/trunk/jboss-tck-runner/tck-unit-tests.xml =================================================================== --- ri/trunk/jboss-tck-runner/tck-unit-tests.xml 2009-02-12 00:29:02 UTC (rev 1491) +++ ri/trunk/jboss-tck-runner/tck-unit-tests.xml 2009-02-12 00:59:38 UTC (rev 1492) @@ -1,45 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" > - -<suite name="JSR-299 TCK" verbose="2" > - - <test name="JSR-299 TCK" > - <groups > - <run> - - <exclude name="stub" /> - <exclude name="broken" /> - <exclude name="underInvestigation" /> - </run> - </groups> -  - <classes> - <class name="org.jboss.jsr299.tck.unit.definition.bean.BeanDefinitionTest" /> - </classes> - </test> - -</suite> \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-12 00:29:02 UTC (rev 1491) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-12 00:59:38 UTC (rev 1492) @@ -28,7 +28,6 @@ import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; import org.jboss.jsr299.tck.impl.util.MockCreationalContext; -import org.jboss.jsr299.tck.spi.StandaloneContainers; import org.testng.IHookCallBack; import org.testng.IHookable; import org.testng.ITestResult; @@ -88,7 +87,6 @@ } protected Manager manager; - private StandaloneContainers containers; private TCKArtifactDescriptor artifact; private Configuration configuration; @@ -119,7 +117,7 @@ { ArtifactGenerator generator = new ArtifactGenerator(configuration); artifact = generator.createArtifact(this.getClass()); - if (!(configuration.isStandalone() && artifact.isUnit())) + if (artifact != null && !(configuration.isStandalone() && artifact.isUnit())) { configuration.getContainers().deploy(artifact.getJar(), artifact.getDefaultName()); } @@ -131,22 +129,22 @@ { if (configuration.isStandalone() && !isInContainer()) { - containers = configuration.getStandaloneContainers(); if (artifact != null) { Set<Class<?>> classes = artifact.getClasses(); if (getEnabledDeploymentTypes().size() > 0) { - manager = containers.deploy(getEnabledDeploymentTypes(), classes.toArray(EMPTY_CLASS_ARRAY)); + manager = configuration.getStandaloneContainers().deploy(getEnabledDeploymentTypes(), classes.toArray(EMPTY_CLASS_ARRAY)); } else { - manager = containers.deploy(classes.toArray(EMPTY_CLASS_ARRAY)); + manager = configuration.getStandaloneContainers().deploy(classes.toArray(EMPTY_CLASS_ARRAY)); } } else { deployBeans(); + manager = ConfigurationImpl.get().getManagers().getManager(); } if (getEnabledDeploymentTypes().size() > 0) { @@ -168,7 +166,7 @@ @AfterClass public void afterClass() throws IOException { - if (!(configuration.isStandalone() && artifact.isUnit()) && !isInContainer()) + if (artifact != null&& !(configuration.isStandalone() && artifact.isUnit()) && !isInContainer()) { configuration.getContainers().undeploy(artifact.getDefaultName()); } @@ -211,11 +209,11 @@ { if (getEnabledDeploymentTypes().size() > 0) { - manager = containers.deploy(getEnabledDeploymentTypes(), classes); + manager = configuration.getStandaloneContainers().deploy(getEnabledDeploymentTypes(), classes); } else { - manager = containers.deploy(classes); + manager = configuration.getStandaloneContainers().deploy(classes); } }

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1491 - ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas and 9 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-11 19:29:02 -0500 (Wed, 11 Feb 2009) New Revision: 1491 Added: ri/trunk/jboss-tck-runner/tck-unit-tests.xml tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestResult.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestResultImpl.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/AnotherDeploymentType.java Modified: ri/trunk/jboss-tck-runner/pom.xml ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ContainersImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/helpers/ForwardingContainers.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/BufferedListener.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/DependentFinalTuna.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/SpiderProducer.java Log: Working version of incontainer test runner :-) Modified: ri/trunk/jboss-tck-runner/pom.xml =================================================================== --- ri/trunk/jboss-tck-runner/pom.xml 2009-02-11 20:50:30 UTC (rev 1490) +++ ri/trunk/jboss-tck-runner/pom.xml 2009-02-12 00:29:02 UTC (rev 1491) @@ -86,7 +86,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <suiteXmlFiles> - <suiteXmlFile>incontainer-tests.xml</suiteXmlFile> + <suiteXmlFile>tck-unit-tests.xml</suiteXmlFile> </suiteXmlFiles> <systemProperties> <property> @@ -101,38 +101,9 @@ <name>org.jboss.jsr299.tck.libraryDirectory</name> <value>${project.build.directory}/dependency/lib</value> </property> - <property> - <name>org.jboss.jsr299.tck.testClass</name> - <value>org.jboss.jsr299.tck.unit.definition.bean.BeanDefinitionTest</value> - </property> </systemProperties> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>test</id> - <phase>test</phase> - <configuration> - <tasks> -  - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> </profile> Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ContainersImpl.java =================================================================== --- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ContainersImpl.java 2009-02-11 20:50:30 UTC (rev 1490) +++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ContainersImpl.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -79,7 +79,7 @@ - public void deploy(InputStream archive, String name) throws Exception + public void deploy(InputStream archive, String name) throws IOException { if (!validated) { @@ -109,14 +109,22 @@ } } - public void undeploy(String name) throws Exception + public void undeploy(String name) throws IOException { File file = new File(deployDir, name); if (file.exists()) { file.delete(); } - Thread.sleep(1000); + try + { + // Give the app a chance to undeploy + Thread.sleep(1000); + } + catch (InterruptedException e) + { + Thread.currentThread().interrupt(); + } } } Added: ri/trunk/jboss-tck-runner/tck-unit-tests.xml =================================================================== --- ri/trunk/jboss-tck-runner/tck-unit-tests.xml (rev 0) +++ ri/trunk/jboss-tck-runner/tck-unit-tests.xml 2009-02-12 00:29:02 UTC (rev 1491) @@ -0,0 +1,45 @@ +<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" > + +<suite name="JSR-299 TCK" verbose="2" > + + <test name="JSR-299 TCK" > + <groups > + <run> + + <exclude name="stub" /> + <exclude name="broken" /> + <exclude name="underInvestigation" /> + </run> + </groups> +  + <classes> + <class name="org.jboss.jsr299.tck.unit.definition.bean.BeanDefinitionTest" /> + </classes> + </test> + +</suite> \ No newline at end of file Property changes on: ri/trunk/jboss-tck-runner/tck-unit-tests.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-02-11 20:50:30 UTC (rev 1490) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -84,10 +84,10 @@ { log.trace("Ending session " + session.getId()); SessionContext.INSTANCE.setBeanMap(new HttpSessionBeanMap(session)); + ConversationManager conversationManager = CurrentManager.rootManager().getInstanceByType(ConversationManager.class); + conversationManager.destroyAllConversations(); SessionContext.INSTANCE.destroy(); SessionContext.INSTANCE.setBeanMap(null); - ConversationManager conversationManager = CurrentManager.rootManager().getInstanceByType(ConversationManager.class); - conversationManager.destroyAllConversations(); } /** Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java 2009-02-11 20:50:30 UTC (rev 1490) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -1,12 +1,14 @@ package org.jboss.jsr299.tck.api; -import org.testng.ISuite; +import java.io.IOException; +import java.lang.reflect.Method; + public interface TestLauncher { public static final String PROPERTY_NAME = TestLauncher.class.getName(); - public ISuite launchTest(Configuration configuration, Class<?> testClass) throws Exception; + public TestResult launchTest(Configuration configuration, Method method) throws IOException; } Added: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestResult.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestResult.java (rev 0) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestResult.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.api; + + +public interface TestResult +{ + + public enum Status + { + PASSED, + FAILED, + SKIPPED; + } + + public Status getStatus(); + + public Throwable getThrowable(); + +} \ No newline at end of file Property changes on: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestResult.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java 2009-02-11 20:50:30 UTC (rev 1490) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -1,5 +1,6 @@ package org.jboss.jsr299.tck.spi; +import java.io.IOException; import java.io.InputStream; public interface Containers @@ -15,8 +16,8 @@ * @param archive * @return */ - public void deploy(InputStream archive, String name) throws Exception; + public void deploy(InputStream archive, String name) throws IOException; - public void undeploy(String name) throws Exception; + public void undeploy(String name) throws IOException; } \ No newline at end of file Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/helpers/ForwardingContainers.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/helpers/ForwardingContainers.java 2009-02-11 20:50:30 UTC (rev 1490) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/helpers/ForwardingContainers.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -1,5 +1,6 @@ package org.jboss.jsr299.tck.spi.helpers; +import java.io.IOException; import java.io.InputStream; import org.jboss.jsr299.tck.spi.Containers; @@ -9,9 +10,14 @@ protected abstract Containers delegate(); - public void deploy(InputStream archive, String name) throws Exception + public void deploy(InputStream archive, String name) throws IOException { delegate().deploy(archive, name); } + public void undeploy(String name) throws IOException + { + delegate().undeploy(name); + } + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-11 20:50:30 UTC (rev 1490) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -22,6 +22,8 @@ import javax.inject.manager.Manager; import org.jboss.jsr299.tck.api.Configuration; +import org.jboss.jsr299.tck.api.TestResult; +import org.jboss.jsr299.tck.api.TestResult.Status; import org.jboss.jsr299.tck.impl.ConfigurationImpl; import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; @@ -34,6 +36,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.BeforeSuite; @SuppressWarnings("unchecked") public class AbstractTest implements IHookable @@ -72,24 +75,61 @@ private static final List<Class<? extends Annotation>> STANDARD_DEPLOYMENT_TYPES = Collections.unmodifiableList(Arrays.asList(Standard.class, Production.class)); private static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0]; + private static boolean inContainer = false; + + public static boolean isInContainer() + { + return inContainer; + } + + public static void setInContainer(boolean inContainer) + { + AbstractTest.inContainer = inContainer; + } + protected Manager manager; private StandaloneContainers containers; private TCKArtifactDescriptor artifact; - private ArtifactGenerator generator; private Configuration configuration; + @BeforeSuite + public void beforeSuite() + { + // Check that assertions are enabled! + boolean assertionsEnabled = false; + try + { + assert false; + } + catch (AssertionError error) + { + assertionsEnabled = true; + } + if (!assertionsEnabled) + { + throw new IllegalArgumentException("Assertions must be enabled!"); + } + } + @BeforeClass - public final void beforeSuite() + public final void beforeClass() throws IOException { configuration = ConfigurationImpl.get(); - generator = new ArtifactGenerator(configuration); + if (!isInContainer()) + { + ArtifactGenerator generator = new ArtifactGenerator(configuration); + artifact = generator.createArtifact(this.getClass()); + if (!(configuration.isStandalone() && artifact.isUnit())) + { + configuration.getContainers().deploy(artifact.getJar(), artifact.getDefaultName()); + } + } } @BeforeMethod public final void beforeMethod(Method method) - { - artifact = generator.createArtifact(method.getDeclaringClass()); - if (configuration.isStandalone()) + { + if (configuration.isStandalone() && !isInContainer()) { containers = configuration.getStandaloneContainers(); if (artifact != null) @@ -123,13 +163,16 @@ public void afterMethod() { manager = null; - artifact = null; } @AfterClass - public void afterClass() + public void afterClass() throws IOException { - this.generator = null; + if (!(configuration.isStandalone() && artifact.isUnit()) && !isInContainer()) + { + configuration.getContainers().undeploy(artifact.getDefaultName()); + } + this.artifact = null; } @Deprecated @@ -250,13 +293,24 @@ public void run(IHookCallBack callback, ITestResult testResult) { - if (artifact== null || artifact.isUnit()) + if (artifact== null || isInContainer() || (artifact.isUnit() && configuration.isStandalone())) { callback.runTestMethod(testResult); } else { - // Run the test in the container + try + { + TestResult result = configuration.getInContainerTestLauncher().launchTest(configuration, testResult.getMethod().getMethod()); + if (result.getStatus().equals(Status.FAILED) || result.getStatus().equals(Status.SKIPPED)) + { + testResult.setThrowable(result.getThrowable()); + } + } + catch (IOException e) + { + throw new RuntimeException("Error connecting to the container", e); + } } } } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java 2009-02-11 20:50:30 UTC (rev 1490) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -11,7 +11,6 @@ import org.jboss.jsr299.tck.api.Configuration; import org.jboss.jsr299.tck.api.TCK; import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; -import org.jboss.jsr299.tck.impl.runner.TestSuiteLauncher; import org.testng.TestNG; import org.testng.xml.Parser; import org.testng.xml.XmlSuite; @@ -63,15 +62,7 @@ public void runInContainerTests() { - TestSuiteLauncher suiteLauncher = new TestSuiteLauncher(getConfiguration()); - try - { - suiteLauncher.run(); - } - catch (Exception e) - { - log.error("Error executing in container tests", e); - } + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/BufferedListener.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/BufferedListener.java 2009-02-11 20:50:30 UTC (rev 1490) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/BufferedListener.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -1,5 +1,8 @@ package org.jboss.jsr299.tck.impl.runner; +import java.util.ArrayList; +import java.util.List; + import org.testng.ITestContext; import org.testng.ITestListener; import org.testng.ITestResult; @@ -54,4 +57,22 @@ return context; } + public List<ITestResult> getTestResults() + { + List<ITestResult> results = new ArrayList<ITestResult>(); + results.addAll(context.getFailedTests().getAllResults()); + results.addAll(context.getPassedTests().getAllResults()); + results.addAll(context.getSkippedTests().getAllResults()); + return results; + } + + public List<ITestResult> getConfigurationResults() + { + List<ITestResult> results = new ArrayList<ITestResult>(); + results.addAll(context.getFailedConfigurations().getAllResults()); + results.addAll(context.getPassedConfigurations().getAllResults()); + results.addAll(context.getSkippedConfigurations().getAllResults()); + return results; + } + } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestResultImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestResultImpl.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestResultImpl.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -0,0 +1,55 @@ +package org.jboss.jsr299.tck.impl.runner; + +import java.io.Serializable; + +import org.jboss.jsr299.tck.api.TestResult; +import org.testng.ITestResult; + +public class TestResultImpl implements Serializable, TestResult +{ + + private static final long serialVersionUID = -6608901483105666644L; + + private Throwable throwable; + private Status status; + + + + public TestResultImpl(Status status, Throwable throwable) + { + super(); + this.throwable = throwable; + this.status = status; + } + + public Status getStatus() + { + return status; + } + + public Throwable getThrowable() + { + return throwable; + } + + public static TestResult of(ITestResult testNGResult) + { + if (testNGResult.getStatus() == 1) + { + return new TestResultImpl(Status.PASSED, null); + } + else if (testNGResult.getStatus() == 2) + { + return new TestResultImpl(Status.FAILED, testNGResult.getThrowable()); + } + else if (testNGResult.getStatus() == 3) + { + return new TestResultImpl(Status.SKIPPED, testNGResult.getThrowable()); + } + else + { + return null; + } + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestResultImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java 2009-02-11 20:50:30 UTC (rev 1490) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -1,16 +1,13 @@ package org.jboss.jsr299.tck.impl.runner; -import java.io.Serializable; -import java.lang.reflect.Field; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; +import org.jboss.jsr299.tck.AbstractTest; import org.jboss.jsr299.tck.impl.util.DeploymentProperties; -import org.testng.ISuite; import org.testng.ITestContext; +import org.testng.ITestResult; import org.testng.TestNG; -import org.testng.internal.InvokedMethod; import org.testng.xml.XmlClass; import org.testng.xml.XmlSuite; import org.testng.xml.XmlTest; @@ -19,33 +16,49 @@ { private List<String> classNames; - - public TestRunner(String className) - { - this.classNames = new ArrayList<String>(); - classNames.add(className); - } + private List<String> methodNames; + private ITestContext context; + private List<ITestResult> testResults; + private List<ITestResult> configurationResults; public TestRunner() { - DeploymentProperties deploymentProperties = new DeploymentProperties(); - this.classNames = deploymentProperties.getPropertyValues("className"); + methodNames = new ArrayList<String>(); + classNames = new ArrayList<String>(); + } - public ISuite run() + public List<String> getClassNames() { + return classNames; + } + + public List<String> getMethodNames() + { + return methodNames; + } + + public void run() + { + AbstractTest.setInContainer(true); + if (classNames.size() == 0) + { + DeploymentProperties deploymentProperties = new DeploymentProperties(); + this.classNames = deploymentProperties.getPropertyValues("className"); + } TestNG testNG = new TestNG(false); testNG.setVerbose(0); - testNG.run(); - //BufferedListener listener = new BufferedListener(); - //testNG.addListener(listener); + BufferedListener listener = new BufferedListener(); + testNG.addListener(listener); List<XmlSuite> xmlSuites = new ArrayList<XmlSuite>(); testNG.setXmlSuites(xmlSuites); xmlSuites.add(createSuite()); - List<ISuite> suites = testNG.runSuitesLocally(); - return suites.get(0); - //return makeITestContextSerializable(listener.getContext()); + testNG.run(); + this.context = listener.getContext(); + this.testResults = listener.getTestResults(); + this.configurationResults = listener.getConfigurationResults(); } + private XmlSuite createSuite() { @@ -56,57 +69,31 @@ { XmlTest test = new XmlTest(suite); test.setName("JSR-299 TCK" + className); - List<XmlClass> testClasses = Arrays.asList(new XmlClass(className)); + List<XmlClass> testClasses = new ArrayList<XmlClass>(); + XmlClass testClass = new XmlClass(className); + for (String methodName : getMethodNames()) + { + testClass.getIncludedMethods().add(methodName); + } + testClasses.add(testClass); test.setXmlClasses(testClasses); } return suite; } - /** - * Unfortunately ITestContext isn't really serializable... - * - */ - public static ITestContext makeITestContextSerializable(ITestContext context) + public ITestContext getContext() { - if (context instanceof org.testng.TestRunner) - { - - try - { - Field methodInterceptorField = org.testng.TestRunner.class.getDeclaredField("m_methodInterceptor"); - methodInterceptorField.setAccessible(true); - methodInterceptorField.set(context, null); - Field testPlanField = org.testng.TestRunner.class.getDeclaredField("m_testPlan"); - testPlanField.setAccessible(true); - testPlanField.set(context, null); - Field invokedMethodsField = org.testng.TestRunner.class.getDeclaredField("m_invokedMethods"); - invokedMethodsField.setAccessible(true); - List<InvokedMethod> methods = (List<InvokedMethod>) invokedMethodsField.get(context); - for (InvokedMethod method : methods) - { - Field parametersField = InvokedMethod.class.getDeclaredField("m_parameters"); - parametersField.setAccessible(true); - Object[] parameters = (Object[]) parametersField.get(method); - if (parameters != null) - { - for (int i = 0; i < parameters.length; i++) - { - if (!(parameters instanceof Serializable) || !parameters.getClass().isPrimitive()) - { - parameters[i] = null; - } - } - } - parametersField.set(method, parameters); - } - } - catch (Exception e) - { - throw new RuntimeException("Error preparing ITestContext for serialization " + context, e); - } - - } return context; } + public List<ITestResult> getTestResults() + { + return testResults; + } + + public List<ITestResult> getConfigurationResults() + { + return configurationResults; + } + } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java 2009-02-11 20:50:30 UTC (rev 1490) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -1,67 +0,0 @@ -package org.jboss.jsr299.tck.impl.runner; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - -import org.apache.log4j.Logger; -import org.jboss.jsr299.tck.api.Configuration; -import org.jboss.jsr299.tck.impl.packaging.ArtifactDescriptor; -import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; -import org.testng.ISuite; - - -public class TestSuiteLauncher -{ - - private static final Logger log = Logger.getLogger(TestSuiteLauncher.class); - - private final Configuration configuration; - private final List<ISuite> suites; - - public TestSuiteLauncher(Configuration configuration) - { - this.configuration = configuration; - this.suites = new ArrayList<ISuite>(); - } - - public void run() throws Exception - { - ArtifactGenerator generator = new ArtifactGenerator(configuration); - if (configuration.getTestClass() == null) - { - List<ArtifactDescriptor> artifacts = generator.createArtifacts(); - for (ArtifactDescriptor artifact : artifacts) - { - testArtifact(artifact); - } - } - else - { - testArtifact(generator.createArtifact(configuration.getTestClass())); - } - } - - protected void testArtifact(ArtifactDescriptor artifact) throws Exception - { - try - { - InputStream jar = artifact.getJar(); - configuration.getContainers().deploy(jar, artifact.getDefaultName()); - jar.close(); - ISuite context = configuration.getInContainerTestLauncher().launchTest(configuration, artifact.getDeclaringClass()); - log.debug("Executed tests for " + artifact.getDefaultName()); - suites.add(context); - } - finally - { - configuration.getContainers().undeploy(artifact.getDefaultName()); - } - - } - - public List<ISuite> getSuites() - { - return suites; - } - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java 2009-02-11 20:50:30 UTC (rev 1490) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -1,23 +1,26 @@ package org.jboss.jsr299.tck.impl.runner.servlet; +import java.io.IOException; import java.io.ObjectInputStream; +import java.lang.reflect.Method; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; import org.jboss.jsr299.tck.api.Configuration; import org.jboss.jsr299.tck.api.TestLauncher; -import org.testng.ISuite; +import org.jboss.jsr299.tck.api.TestResult; +import org.jboss.jsr299.tck.impl.runner.TestResultImpl; public class ServletTestLauncher implements TestLauncher { - public ISuite launchTest(Configuration configuration, Class<?> testClass) throws Exception + public TestResultImpl launchTest(Configuration configuration, Method method) throws IOException { - String url = "http://" + configuration.getHost() + "/" + testClass.getName() + "/?outputMode=serializedObject"; + Class<?> testClass = method.getDeclaringClass(); + String url = "http://" + configuration.getHost() + "/" + testClass.getName() + "/?outputMode=serializedObject&methodName=" + method.getName(); for (int i = 0; i < configuration.getConnectRetries(); i++) { - Thread.sleep(configuration.getConnectDelay()); URLConnection connection = new URL(url).openConnection(); if (!(connection instanceof HttpURLConnection)) { @@ -32,20 +35,36 @@ if (httpConnection.getResponseCode() == HttpURLConnection.HTTP_OK) { ObjectInputStream ois = new ObjectInputStream(httpConnection.getInputStream()); - Object o = ois.readObject(); + Object o; + try + { + o = ois.readObject(); + } + catch (ClassNotFoundException e) + { + throw new IOException(e); + } ois.close(); - if (!(o instanceof ISuite)) + if (!(o instanceof TestResult)) { - throw new IllegalStateException("Error reading test results - expected a ISuite but got " + o); + throw new IllegalStateException("Error reading test results - expected a TestResult but got " + o); } - ISuite context = (ISuite) o; + TestResultImpl result = (TestResultImpl) o; - return context; + return result; } else if (httpConnection.getResponseCode() != HttpURLConnection.HTTP_NOT_FOUND) { throw new IllegalStateException("Error launching test " + testClass.getName() + " at " + url + ". Got " + httpConnection.getResponseCode() + " ("+ httpConnection.getResponseMessage() + ")"); } + try + { + Thread.sleep(configuration.getConnectDelay()); + } + catch (InterruptedException e) + { + Thread.currentThread().interrupt(); + } } finally { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java 2009-02-11 20:50:30 UTC (rev 1490) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -9,30 +9,43 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.jboss.jsr299.tck.api.TestResult; import org.jboss.jsr299.tck.impl.ConfigurationImpl; +import org.jboss.jsr299.tck.impl.runner.TestResultImpl; import org.jboss.jsr299.tck.impl.runner.TestRunner; -import org.testng.ISuite; import org.testng.ITestResult; public class ServletTestRunner extends HttpServlet { + + @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { ConfigurationImpl.get().setStandalone(false); TestRunner runner = new TestRunner(); - ISuite suite = runner.run(); + String methodName = null; + if (req.getParameter("methodName") != null) + { + methodName = req.getParameter("methodName"); + runner.getMethodNames().add(methodName); + } String outputMode; if (req.getParameter("outputMode") != null) { outputMode = (String) req.getParameter("outputMode"); - System.out.println("Outputting as " + outputMode); } else { outputMode = "html"; } + if (outputMode.equals("serializedObject") && methodName == null) + { + resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "No method name specified"); + return; + } + runner.run(); if (outputMode.equals("html")) { resp.setContentType("text/html"); @@ -46,11 +59,11 @@ writer.write("<tr>\n"); writer.write("<td><b>Method</b></td><td><b>Status</b></td>\n"); writer.write("</tr>\n"); - for (ITestResult result : suite.getResults().get("JSR-299 TCK").getTestContext().getFailedConfigurations().getAllResults()) + for (ITestResult result : runner.getContext().getFailedConfigurations().getAllResults()) { writeResult(writer, result); } - for (ITestResult result : suite.getResults().get("JSR-299 TCK").getTestContext().getSkippedConfigurations().getAllResults()) + for (ITestResult result : runner.getContext().getSkippedConfigurations().getAllResults()) { writeResult(writer, result); } @@ -60,15 +73,15 @@ writer.write("<tr>\n"); writer.write("<td><b>Method</b></td><td><b>Status</b></td>\n"); writer.write("</tr>\n"); - for (ITestResult result : suite.getResults().get("JSR-299 TCK").getTestContext().getFailedTests().getAllResults()) + for (ITestResult result : runner.getContext().getFailedTests().getAllResults()) { writeResult(writer, result); } - for (ITestResult result : suite.getResults().get("JSR-299 TCK").getTestContext().getPassedTests().getAllResults()) + for (ITestResult result : runner.getContext().getPassedTests().getAllResults()) { writeResult(writer, result); } - for (ITestResult result : suite.getResults().get("JSR-299 TCK").getTestContext().getSkippedTests().getAllResults()) + for (ITestResult result : runner.getContext().getSkippedTests().getAllResults()) { writeResult(writer, result); } @@ -77,11 +90,31 @@ } else if (outputMode.equals("serializedObject")) { - resp.setStatus(HttpServletResponse.SC_OK); + ObjectOutputStream oos = new ObjectOutputStream(resp.getOutputStream()); - oos.writeObject(suite); - oos.flush(); - oos.close(); + if (runner.getTestResults().size() == 1) + { + TestResult result; + if (runner.getTestResults().get(0).getStatus() == 3) + { + // This is a skip, so there was a configuration problem + // send that instead + result = TestResultImpl.of(runner.getConfigurationResults().get(0)); + } + else + { + result = TestResultImpl.of(runner.getTestResults().get(0)); + } + oos.writeObject(result); + resp.setStatus(HttpServletResponse.SC_OK); + oos.flush(); + oos.close(); + } + else + { + resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ">1 result!"); + } + } else { Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/AnotherDeploymentType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/AnotherDeploymentType.java 2009-02-11 20:50:30 UTC (rev 1490) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/AnotherDeploymentType.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.definition.bean; - -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.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -import javax.inject.DeploymentType; - -@Target( { TYPE, METHOD }) -@Retention(RUNTIME) -@Documented -@DeploymentType -@interface AnotherDeploymentType -{ - -} \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-11 20:50:30 UTC (rev 1490) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -1,8 +1,6 @@ package org.jboss.jsr299.tck.unit.definition.bean; import java.lang.annotation.Annotation; -import java.util.ArrayList; -import java.util.List; import javax.context.RequestScoped; import javax.inject.AnnotationLiteral; @@ -28,15 +26,6 @@ private static Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {}; - @Override - protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() - { - List<Class<? extends Annotation>> deploymentTypes = new ArrayList<Class<? extends Annotation>>(); - deploymentTypes.addAll(super.getStandardDeploymentTypes()); - deploymentTypes.add(AnotherDeploymentType.class); - return deploymentTypes; - } - // TODO This should actually somehow test the reverse as well - that the container // throws a definition exception if any of these occur @@ -76,8 +65,8 @@ @SpecAssertion(section = "5.2", id = "b") public void testIsNullable() throws Exception { - assert manager.resolveByType(Integer.class).size() == 1; - Bean<Integer> bean = manager.resolveByType(Integer.class).iterator().next(); + assert manager.resolveByType(int.class).size() == 1; + Bean<Integer> bean = manager.resolveByType(int.class).iterator().next(); assert !bean.isNullable(); assert manager.resolveByType(Animal.class, TAME_LITERAL).size() == 1; Bean<Animal> animalBean = manager.resolveByType(Animal.class, TAME_LITERAL).iterator().next(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/DependentFinalTuna.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/DependentFinalTuna.java 2009-02-11 20:50:30 UTC (rev 1490) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/DependentFinalTuna.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -1,6 +1,5 @@ package org.jboss.jsr299.tck.unit.definition.bean; -@AnotherDeploymentType final class DependentFinalTuna { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/SpiderProducer.java 2009-02-11 20:50:30 UTC (rev 1490) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/SpiderProducer.java 2009-02-12 00:29:02 UTC (rev 1491) @@ -2,7 +2,6 @@ import javax.inject.Produces; -@AnotherDeploymentType class SpiderProducer {

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1490 - doc/trunk/reference/it-IT.

by webbeans-commits＠lists.jboss.org

Author: nico.ben Date: 2009-02-11 15:50:30 -0500 (Wed, 11 Feb 2009) New Revision: 1490 Modified: doc/trunk/reference/it-IT/decorators.po Log: Italian translation Modified: doc/trunk/reference/it-IT/decorators.po =================================================================== --- doc/trunk/reference/it-IT/decorators.po 2009-02-11 20:44:55 UTC (rev 1489) +++ doc/trunk/reference/it-IT/decorators.po 2009-02-11 20:50:30 UTC (rev 1490) @@ -6,7 +6,7 @@ "Project-Id-Version: master.xml\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2008-12-19 20:26+0000\n" -"PO-Revision-Date: 2008-12-20 13:48+0100\n" +"PO-Revision-Date: 2009-02-11 21:50+0100\n" "Last-Translator: Nicola Benaglia <nico.benaz(a)gmail.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -23,7 +23,7 @@ #: decorators.xml:6 #, no-c-format msgid "Interceptors are a powerful way to capture and separate concerns which are <emphasis>orthogonal</emphasis> to the type system. Any interceptor is able to intercept invocations of any Java type. This makes them perfect for solving technical concerns such as transaction management and security. However, by nature, interceptors are unaware of the actual semantics of the events they intercept. Thus, interceptors aren't an appropriate tool for separating business-related concerns." -msgstr "Gli interceptor sono un potente modo per catturare e separare i concern (N.d.T. un concern è un particulare concetto o area di interesse) che sono <emphasis>orthogonal</emphasis> al sistema tipo. Qualsiasi interceptor è capace di intercettare le invocazioni di qualsiasi tipo Java. Questo li rende perfetti per risolvere concern tecnici quali gestione delle transazioni e la sicurezza. Comunque, per natura, gli interceptor non sono consapevoli dell'attuale semantica degli eventi che intercettano. Quindi gli interceptor non sono il giusto strumento per separare i concern di tipo business." +msgstr "Gli interceptor sono un potente modo per catturare e separare i concern (N.d.T. un concern è un particolare concetto o area di interesse) che sono <emphasis>ortogonali</emphasis> al sistema tipo. Qualsiasi interceptor è capace di intercettare le invocazioni di qualsiasi tipo Java. Questo li rende perfetti per risolvere concern tecnici quali gestione delle transazioni e la sicurezza. Comunque, per natura, gli interceptor non sono consapevoli dell'attuale semantica degli eventi che intercettano. Quindi gli interceptor non sono il giusto strumento per separare i concern di tipo business." # ...concerns that cut across many disparate types = ? #. Tag: para

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1489 - ri/trunk/jboss-tck-runner/src/main/resources/META-INF and 8 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-11 15:44:55 -0500 (Wed, 11 Feb 2009) New Revision: 1489 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ForwardingITestNGMethod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ForwardingITestResult.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/SaneITestNGMethod.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Produced.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/DeclarativeArtifactProcessor.java Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ContainersImpl.java ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/SpiderProducer.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DeclarativeWarTest.java Log: Fix the TCK :-/ Modified: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ContainersImpl.java =================================================================== --- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ContainersImpl.java 2009-02-11 19:13:27 UTC (rev 1488) +++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ContainersImpl.java 2009-02-11 20:44:55 UTC (rev 1489) @@ -114,7 +114,7 @@ File file = new File(deployDir, name); if (file.exists()) { - //file.delete(); + file.delete(); } Thread.sleep(1000); } Modified: ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties =================================================================== --- ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties 2009-02-11 19:13:27 UTC (rev 1488) +++ ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties 2009-02-11 20:44:55 UTC (rev 1489) @@ -1,2 +1,4 @@ org.jboss.jsr299.tck.spi.Containers=org.jboss.webbeans.tck.integration.jbossas.ContainersImpl -org.jboss.jsr299.tck.api.TestLauncher=org.jboss.jsr299.tck.impl.runner.servlet.ServletTestLauncher \ No newline at end of file +org.jboss.jsr299.tck.api.TestLauncher=org.jboss.jsr299.tck.impl.runner.servlet.ServletTestLauncher +org.jboss.jsr299.tck.connectDelay=1500 +org.jboss.jsr299.tck.connectRetries=8 \ No newline at end of file Modified: ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml =================================================================== --- ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml 2009-02-11 19:13:27 UTC (rev 1488) +++ ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml 2009-02-11 20:44:55 UTC (rev 1489) @@ -47,6 +47,10 @@ <priority value="ERROR"/> </category> + <category name="org.jboss.jsr299"> + <priority value="INFO"/> + </category> + <root> <priority value="INFO"/> <appender-ref ref="CONSOLE"/> Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-11 19:13:27 UTC (rev 1488) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-11 20:44:55 UTC (rev 1489) @@ -21,17 +21,18 @@ import javax.inject.manager.Bean; import javax.inject.manager.Manager; +import org.jboss.jsr299.tck.api.Configuration; import org.jboss.jsr299.tck.impl.ConfigurationImpl; -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.ArtifactDescriptor; -import org.jboss.jsr299.tck.impl.packaging.DeclarativeArtifactProcessor; -import org.jboss.jsr299.tck.impl.packaging.EjbArtifact; +import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; +import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; import org.jboss.jsr299.tck.impl.util.MockCreationalContext; import org.jboss.jsr299.tck.spi.StandaloneContainers; import org.testng.IHookCallBack; import org.testng.IHookable; import org.testng.ITestResult; +import org.testng.annotations.AfterClass; import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @SuppressWarnings("unchecked") @@ -73,20 +74,26 @@ protected Manager manager; private StandaloneContainers containers; + private TCKArtifactDescriptor artifact; + private ArtifactGenerator generator; + private Configuration configuration; + + @BeforeClass + public final void beforeSuite() + { + configuration = ConfigurationImpl.get(); + generator = new ArtifactGenerator(configuration); + } - public static boolean visited = false; - @BeforeMethod - public final void before(Method method) + public final void beforeMethod(Method method) { - if (ConfigurationImpl.get().isStandalone()) + artifact = generator.createArtifact(method.getDeclaringClass()); + if (configuration.isStandalone()) { - containers = ConfigurationImpl.get().getStandaloneContainers(); - Class<?> declaringClass = method.getDeclaringClass(); - if (declaringClass.isAnnotationPresent(Artifact.class) || declaringClass.isAnnotationPresent(EjbArtifact.class)) + containers = configuration.getStandaloneContainers(); + if (artifact != null) { - DeclarativeArtifactProcessor processor = new DeclarativeArtifactProcessor(declaringClass, true, null); - ArtifactDescriptor artifact = processor.getArtifact(); Set<Class<?>> classes = artifact.getClasses(); if (getEnabledDeploymentTypes().size() > 0) { @@ -113,10 +120,17 @@ } @AfterMethod - public void after() + public void afterMethod() { manager = null; + artifact = null; } + + @AfterClass + public void afterClass() + { + this.generator = null; + } @Deprecated public <T> Bean<T> createSimpleBean(Class<T> beanClass) @@ -171,8 +185,11 @@ * This method should be overridden by test classes which need to enable * additional deployment types beyond the normal ones. * + * Deprecated, need to use beans.xml + * * @return the list of enabled deployment types */ + @Deprecated protected List<Class<? extends Annotation>> getEnabledDeploymentTypes() { return Collections.emptyList(); @@ -233,19 +250,13 @@ public void run(IHookCallBack callback, ITestResult testResult) { - if () - } - - private static boolean isInContainerTest() - { - if (!ConfigurationImpl.get().isStandalone()) + if (artifact== null || artifact.isUnit()) { - // We aren't in standalone mode, so everything runs in the container - return false; + callback.runTestMethod(testResult); } else { - + // Run the test in the container } } } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-11 19:13:27 UTC (rev 1488) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-11 20:44:55 UTC (rev 1489) @@ -1,5 +1,8 @@ package org.jboss.jsr299.tck.impl.packaging; +import static org.jboss.jsr299.tck.impl.packaging.PackagingType.EAR; +import static org.jboss.jsr299.tck.impl.packaging.PackagingType.UNSPECIFIED; +import static org.jboss.jsr299.tck.impl.packaging.PackagingType.WAR; import static org.jboss.jsr299.tck.impl.util.Reflections.loadClass; import static org.jboss.jsr299.tck.impl.util.Reflections.loadResourceAsStream; import static org.jboss.jsr299.tck.impl.util.Reflections.loadResources; @@ -10,15 +13,22 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.URL; import java.net.URLClassLoader; import java.net.URLDecoder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; import java.util.Enumeration; import java.util.HashSet; +import java.util.List; import java.util.Random; import java.util.Set; import java.util.zip.ZipEntry; @@ -27,6 +37,9 @@ import java.util.zip.ZipOutputStream; import org.apache.log4j.Logger; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; +import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor; import org.jboss.jsr299.tck.impl.util.Files; public class ArtifactDescriptor @@ -200,7 +213,198 @@ } + private static class DeclarativeArtifact + { + + private static final Logger log = Logger.getLogger(DeclarativeArtifact.class); + + private final boolean unit; + private final boolean ejbs; + private final boolean addDeclaringPackage; + private final String beansXml; + private final PackagingType packagingType; + private final Collection<ResourceDescriptor> resources; + private final Collection<Class<?>> classes; + private final Set<ResourceDescriptor> extraLibraries; + + private final Class<?> declaringClass; + private final boolean standalone; + + public DeclarativeArtifact(Class<?> declaringClass, boolean standalone, String extraLibrariesDirectory) + { + this.standalone = standalone; + this.declaringClass = declaringClass; + + if (declaringClass.isAnnotationPresent(Artifact.class)) + { + this.addDeclaringPackage = declaringClass.getAnnotation(Artifact.class).addCurrentPackage(); + this.ejbs = false; + } + else if (declaringClass.isAnnotationPresent(EjbArtifact.class)) + { + this.addDeclaringPackage = declaringClass.getAnnotation(EjbArtifact.class).addCurrentPackage(); + this.ejbs = true; + } + else + { + throw new IllegalStateException("Unable to find @Artifact on " + declaringClass); + } + + if (declaringClass.isAnnotationPresent(BeansXml.class)) + { + this.beansXml = asAbsolutePath(declaringClass.getAnnotation(BeansXml.class).value()); + } + else + { + this.beansXml = null; + } + + if (declaringClass.isAnnotationPresent(Packaging.class)) + { + this.packagingType = declaringClass.getAnnotation(Packaging.class).value(); + } + else + { + this.packagingType = UNSPECIFIED; + } + + if (declaringClass.isAnnotationPresent(IntegrationTest.class)) + { + this.unit = false; + } + else + { + this.unit = true; + } + + if (unit && (packagingType.equals(WAR) || packagingType.equals(EAR))) + { + throw new IllegalArgumentException("Cannot specify @Packaging(WAR) or @Packaging(EAR) if @Integration test is not present"); + } + + if (declaringClass.isAnnotationPresent(Resources.class)) + { + this.resources = asResourceDescriptors(declaringClass.getAnnotation(Resources.class).value()); + } + else + { + this.resources = Collections.emptyList(); + } + + if (declaringClass.isAnnotationPresent(Classes.class)) + { + this.classes = Arrays.asList(declaringClass.getAnnotation(Classes.class).value()); + } + else + { + this.classes = Collections.emptyList(); + } + if (extraLibrariesDirectory != null) + { + File directory = new File(extraLibrariesDirectory); + this.extraLibraries = new HashSet<ResourceDescriptor>(); + if (directory.isDirectory()) + { + for (File file : directory.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.endsWith(".jar"); + } + + })) + { + try + { + this.extraLibraries.add(new ResourceDescriptor(file.getName(), new FileInputStream(file))); + } + catch (FileNotFoundException e) + { + log.warn("Unable to load extra library", e); + } + } + } + } + else + { + this.extraLibraries = Collections.emptySet(); + } + } + + public TCKArtifactDescriptor createArtifact() + { + final TCKArtifactDescriptor artifact = newArtifact(packagingType, declaringClass, beansXml, standalone, ejbs, addDeclaringPackage); + artifact.setEjbs(ejbs); + artifact.setUnit(unit); + artifact.getClasses().addAll(classes); + artifact.getResources().addAll(resources); + artifact.getLibraries().addAll(extraLibraries); + return artifact; + } + + private Collection<ResourceDescriptor> asResourceDescriptors(Resource[] resources) + { + List<ResourceDescriptor> resourceDescriptors = new ArrayList<ResourceDescriptor>(); + for (Resource resource : resources) + { + resourceDescriptors.add(new ResourceDescriptor(resource.destination(), asAbsolutePath(resource.source()))); + } + return resourceDescriptors; + } + + private String asAbsolutePath(String path) + { + if (path.startsWith("/")) + { + return path.substring(1); + } + else + { + return declaringClass.getPackage().getName().replace(".", "/") + "/" + path; + } + } + + public static TCKArtifactDescriptor newArtifact(PackagingType packagingType, Class<?> declaringClass, String beansXml, boolean standalone, boolean ejbs, boolean addDeclaringPackage) + { + TCKArtifactDescriptor artifact; + if (packagingType.equals(WAR)) + { + artifact = new WarArtifactDescriptor(declaringClass, beansXml); + } + else if (packagingType.equals(EAR)) + { + throw new UnsupportedOperationException(); + } + else if (!standalone && ejbs) + { + throw new UnsupportedOperationException(); + } + else if (!standalone) + { + artifact = new WarArtifactDescriptor(declaringClass, beansXml); + } + else + { + artifact = new TCKArtifactDescriptor(declaringClass, beansXml); + } + + if (addDeclaringPackage) + { + artifact.addPackage(declaringClass.getPackage()); + } + return artifact; + } + + public boolean isUnit() + { + return unit; + }; + + } + + public static final Random random = new Random(System.currentTimeMillis()); private final Set<Class<?>> classes; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java 2009-02-11 19:13:27 UTC (rev 1488) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java 2009-02-11 20:44:55 UTC (rev 1489) @@ -1,18 +1,221 @@ package org.jboss.jsr299.tck.impl.packaging; +import static org.jboss.jsr299.tck.impl.packaging.PackagingType.EAR; +import static org.jboss.jsr299.tck.impl.packaging.PackagingType.UNSPECIFIED; +import static org.jboss.jsr299.tck.impl.packaging.PackagingType.WAR; + import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FilenameFilter; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; import org.apache.log4j.Logger; import org.jboss.jsr299.tck.api.Configuration; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; +import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; +import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor; public class ArtifactGenerator { + private static class ArtifactProcessor + { + + private static final Logger log = Logger.getLogger(ArtifactProcessor.class); + + private final boolean unit; + private final boolean ejbs; + private final boolean addDeclaringPackage; + private final String beansXml; + private final PackagingType packagingType; + private final Collection<ResourceDescriptor> resources; + private final Collection<Class<?>> classes; + private final Set<ResourceDescriptor> extraLibraries; + + private final Class<?> declaringClass; + private final boolean standalone; + + public ArtifactProcessor(Class<?> declaringClass, boolean standalone, String extraLibrariesDirectory) + { + this.standalone = standalone; + this.declaringClass = declaringClass; + + if (declaringClass.isAnnotationPresent(Artifact.class)) + { + this.addDeclaringPackage = declaringClass.getAnnotation(Artifact.class).addCurrentPackage(); + this.ejbs = false; + } + else if (declaringClass.isAnnotationPresent(EjbArtifact.class)) + { + this.addDeclaringPackage = declaringClass.getAnnotation(EjbArtifact.class).addCurrentPackage(); + this.ejbs = true; + } + else + { + throw new IllegalStateException("Unable to find @Artifact on " + declaringClass); + } + + if (declaringClass.isAnnotationPresent(BeansXml.class)) + { + this.beansXml = asAbsolutePath(declaringClass.getAnnotation(BeansXml.class).value()); + } + else + { + this.beansXml = null; + } + + if (declaringClass.isAnnotationPresent(Packaging.class)) + { + this.packagingType = declaringClass.getAnnotation(Packaging.class).value(); + } + else + { + this.packagingType = UNSPECIFIED; + } + + if (declaringClass.isAnnotationPresent(IntegrationTest.class)) + { + this.unit = false; + } + else + { + this.unit = true; + } + + if (unit && (packagingType.equals(WAR) || packagingType.equals(EAR))) + { + throw new IllegalArgumentException("Cannot specify @Packaging(WAR) or @Packaging(EAR) if @Integration test is not present"); + } + + if (declaringClass.isAnnotationPresent(Resources.class)) + { + this.resources = asResourceDescriptors(declaringClass.getAnnotation(Resources.class).value()); + } + else + { + this.resources = Collections.emptyList(); + } + + if (declaringClass.isAnnotationPresent(Classes.class)) + { + this.classes = Arrays.asList(declaringClass.getAnnotation(Classes.class).value()); + } + else + { + this.classes = Collections.emptyList(); + } + if (extraLibrariesDirectory != null) + { + File directory = new File(extraLibrariesDirectory); + this.extraLibraries = new HashSet<ResourceDescriptor>(); + if (directory.isDirectory()) + { + for (File file : directory.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.endsWith(".jar"); + } + + })) + { + try + { + this.extraLibraries.add(new ResourceDescriptor(file.getName(), new FileInputStream(file))); + } + catch (FileNotFoundException e) + { + log.warn("Unable to load extra library", e); + } + } + } + } + else + { + this.extraLibraries = Collections.emptySet(); + } + } + + public TCKArtifactDescriptor createArtifact() + { + final TCKArtifactDescriptor artifact = newArtifact(packagingType, declaringClass, beansXml, standalone, ejbs, addDeclaringPackage); + artifact.setEjbs(ejbs); + artifact.setUnit(unit); + artifact.getClasses().addAll(classes); + artifact.getResources().addAll(resources); + artifact.getLibraries().addAll(extraLibraries); + return artifact; + } + + private Collection<ResourceDescriptor> asResourceDescriptors(Resource[] resources) + { + List<ResourceDescriptor> resourceDescriptors = new ArrayList<ResourceDescriptor>(); + for (Resource resource : resources) + { + resourceDescriptors.add(new ResourceDescriptor(resource.destination(), asAbsolutePath(resource.source()))); + } + return resourceDescriptors; + } + + private String asAbsolutePath(String path) + { + if (path.startsWith("/")) + { + return path.substring(1); + } + else + { + return declaringClass.getPackage().getName().replace(".", "/") + "/" + path; + } + } + + private static TCKArtifactDescriptor newArtifact(PackagingType packagingType, Class<?> declaringClass, String beansXml, boolean standalone, boolean ejbs, boolean addDeclaringPackage) + { + TCKArtifactDescriptor artifact; + if (packagingType.equals(WAR)) + { + artifact = new WarArtifactDescriptor(declaringClass, beansXml); + } + else if (packagingType.equals(EAR)) + { + throw new UnsupportedOperationException(); + } + else if (!standalone && ejbs) + { + throw new UnsupportedOperationException(); + } + else if (!standalone) + { + artifact = new WarArtifactDescriptor(declaringClass, beansXml); + } + else + { + artifact = new TCKArtifactDescriptor(declaringClass, beansXml); + } + + if (addDeclaringPackage) + { + artifact.addPackage(declaringClass.getPackage()); + } + return artifact; + } + + public boolean isUnit() + { + return unit; + }; + + } + private static final Logger log = Logger.getLogger(ArtifactGenerator.class); private final Configuration configuration; @@ -21,7 +224,7 @@ { if (configuration == null) { - throw new IllegalArgumentException("packageNames must not be null"); + throw new IllegalArgumentException("configuration must not be null"); } this.configuration = configuration; } @@ -41,11 +244,6 @@ return artifacts; } - public ArtifactDescriptor createArtifact(Class<?> clazz) - { - return new DeclarativeArtifactProcessor(clazz, configuration.isStandalone(), configuration.getLibraryDirectory()).getArtifact(); - } - public void dumpArtifacts() { List<ArtifactDescriptor> artifacts = createArtifacts(); @@ -72,5 +270,17 @@ } } } + + public TCKArtifactDescriptor createArtifact(Class<?> declaringClass) + { + if (declaringClass.isAnnotationPresent(Artifact.class) || declaringClass.isAnnotationPresent(EjbArtifact.class)) + { + return new ArtifactProcessor(declaringClass, configuration.isStandalone(), configuration.getLibraryDirectory()).createArtifact(); + } + else + { + return null; + } + } } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/DeclarativeArtifactProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/DeclarativeArtifactProcessor.java 2009-02-11 19:13:27 UTC (rev 1488) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/DeclarativeArtifactProcessor.java 2009-02-11 20:44:55 UTC (rev 1489) @@ -1,175 +0,0 @@ -package org.jboss.jsr299.tck.impl.packaging; - -import static org.jboss.jsr299.tck.impl.packaging.PackagingType.EAR; -import static org.jboss.jsr299.tck.impl.packaging.PackagingType.UNSPECIFIED; -import static org.jboss.jsr299.tck.impl.packaging.PackagingType.WAR; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FilenameFilter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.apache.log4j.Logger; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; -import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; - -public class DeclarativeArtifactProcessor -{ - - private static final Logger log = Logger.getLogger(DeclarativeArtifactProcessor.class); - - private final boolean unit; - private final boolean ejbs; - private final boolean addDeclaringPackage; - private final String beansXml; - private final PackagingType packagingType; - private final Collection<ResourceDescriptor> resources; - private final Collection<Class<?>> classes; - private final Set<ResourceDescriptor> extraLibraries; - - private final Class<?> declaringClass; - private final boolean standalone; - - public DeclarativeArtifactProcessor(Class<?> declaringClass, boolean standalone, String extraLibrariesDirectory) - { - this.standalone = standalone; - this.declaringClass = declaringClass; - - if (declaringClass.isAnnotationPresent(Artifact.class)) - { - this.addDeclaringPackage = declaringClass.getAnnotation(Artifact.class).addCurrentPackage(); - this.ejbs = false; - } - else if (declaringClass.isAnnotationPresent(EjbArtifact.class)) - { - this.addDeclaringPackage = declaringClass.getAnnotation(EjbArtifact.class).addCurrentPackage(); - this.ejbs = true; - } - else - { - throw new IllegalStateException("Unable to find @Artifact on " + declaringClass); - } - - if (declaringClass.isAnnotationPresent(BeansXml.class)) - { - this.beansXml = asAbsolutePath(declaringClass.getAnnotation(BeansXml.class).value()); - } - else - { - this.beansXml = null; - } - - if (declaringClass.isAnnotationPresent(Packaging.class)) - { - this.packagingType = declaringClass.getAnnotation(Packaging.class).value(); - } - else - { - this.packagingType = UNSPECIFIED; - } - - if (declaringClass.isAnnotationPresent(IntegrationTest.class)) - { - this.unit = false; - } - else - { - this.unit = true; - } - - if (unit && (packagingType.equals(WAR) || packagingType.equals(EAR))) - { - throw new IllegalArgumentException("Cannot specify @Packaging(WAR) or @Packaging(EAR) if @Integration test is not present"); - } - - if (declaringClass.isAnnotationPresent(Resources.class)) - { - this.resources = asResourceDescriptors(declaringClass.getAnnotation(Resources.class).value()); - } - else - { - this.resources = Collections.emptyList(); - } - - if (declaringClass.isAnnotationPresent(Classes.class)) - { - this.classes = Arrays.asList(declaringClass.getAnnotation(Classes.class).value()); - } - else - { - this.classes = Collections.emptyList(); - } - if (extraLibrariesDirectory != null) - { - File directory = new File(extraLibrariesDirectory); - this.extraLibraries = new HashSet<ResourceDescriptor>(); - if (directory.isDirectory()) - { - for (File file : directory.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.endsWith(".jar"); - } - - })) - { - try - { - this.extraLibraries.add(new ResourceDescriptor(file.getName(), new FileInputStream(file))); - } - catch (FileNotFoundException e) - { - log.warn("Unable to load extra library", e); - } - } - } - } - else - { - this.extraLibraries = Collections.emptySet(); - } - } - - public TCKArtifactDescriptor getArtifact() - { - final TCKArtifactDescriptor artifact = ArtifactFactory.newArtifact(packagingType, declaringClass, beansXml, standalone, ejbs, addDeclaringPackage); - artifact.setEjbs(ejbs); - artifact.setUnit(unit); - artifact.getClasses().addAll(classes); - artifact.getResources().addAll(resources); - artifact.getLibraries().addAll(extraLibraries); - return artifact; - } - - private Collection<ResourceDescriptor> asResourceDescriptors(Resource[] resources) - { - List<ResourceDescriptor> resourceDescriptors = new ArrayList<ResourceDescriptor>(); - for (Resource resource : resources) - { - resourceDescriptors.add(new ResourceDescriptor(resource.destination(), asAbsolutePath(resource.source()))); - } - return resourceDescriptors; - } - - private String asAbsolutePath(String path) - { - if (path.startsWith("/")) - { - return path.substring(1); - } - else - { - return declaringClass.getPackage().getName().replace(".", "/") + "/" + path; - } - } - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ForwardingITestNGMethod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ForwardingITestNGMethod.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ForwardingITestNGMethod.java 2009-02-11 20:44:55 UTC (rev 1489) @@ -0,0 +1,277 @@ +package org.jboss.jsr299.tck.impl.testng; + +import java.lang.reflect.Method; + +import org.testng.IClass; +import org.testng.IRetryAnalyzer; +import org.testng.ITestClass; +import org.testng.ITestNGMethod; + +public abstract class ForwardingITestNGMethod implements ITestNGMethod +{ + + private static final long serialVersionUID = 2534386487509877598L; + + protected abstract ITestNGMethod delegate(); + + @Override + public ITestNGMethod clone() + { + return delegate().clone(); + } + + public void addMethodDependedUpon(String methodName) + { + delegate().addMethodDependedUpon(methodName); + } + + public boolean canRunFromClass(IClass testClass) + { + return delegate().canRunFromClass(testClass); + } + + public String[] getAfterGroups() + { + return delegate().getAfterGroups(); + } + + public String[] getBeforeGroups() + { + return delegate().getBeforeGroups(); + } + + public int getCurrentInvocationCount() + { + return delegate().getCurrentInvocationCount(); + } + + public long getDate() + { + return delegate().getDate(); + } + + public String getDescription() + { + return delegate().getDescription(); + } + + public String[] getGroups() + { + return delegate().getGroups(); + } + + public String[] getGroupsDependedUpon() + { + return delegate().getGroupsDependedUpon(); + } + + public String getId() + { + return delegate().getId(); + } + + public long[] getInstanceHashCodes() + { + return delegate().getInstanceHashCodes(); + } + + public Object[] getInstances() + { + return delegate().getInstances(); + } + + public int getInvocationCount() + { + return delegate().getInvocationCount(); + } + + public Method getMethod() + { + return delegate().getMethod(); + } + + public String getMethodName() + { + return delegate().getMethodName(); + } + + public String[] getMethodsDependedUpon() + { + return delegate().getMethodsDependedUpon(); + } + + public String getMissingGroup() + { + return delegate().getMissingGroup(); + } + + public int getParameterInvocationCount() + { + return delegate().getParameterInvocationCount(); + } + + @SuppressWarnings("unchecked") + public Class getRealClass() + { + return delegate().getRealClass(); + } + + public IRetryAnalyzer getRetryAnalyzer() + { + return delegate().getRetryAnalyzer(); + } + + public int getSuccessPercentage() + { + return delegate().getSuccessPercentage(); + } + + public ITestClass getTestClass() + { + return delegate().getTestClass(); + } + + public int getThreadPoolSize() + { + return delegate().getThreadPoolSize(); + } + + public long getTimeOut() + { + return delegate().getTimeOut(); + } + + public void incrementCurrentInvocationCount() + { + delegate().incrementCurrentInvocationCount(); + } + + public boolean isAfterClassConfiguration() + { + return delegate().isAfterClassConfiguration(); + } + + public boolean isAfterGroupsConfiguration() + { + return delegate().isAfterGroupsConfiguration(); + } + + public boolean isAfterMethodConfiguration() + { + return delegate().isAfterMethodConfiguration(); + } + + public boolean isAfterSuiteConfiguration() + { + return delegate().isAfterSuiteConfiguration(); + } + + public boolean isAfterTestConfiguration() + { + return delegate().isAfterTestConfiguration(); + } + + public boolean isAlwaysRun() + { + return delegate().isAlwaysRun(); + } + + public boolean isBeforeClassConfiguration() + { + return delegate().isBeforeClassConfiguration(); + } + + public boolean isBeforeGroupsConfiguration() + { + return delegate().isBeforeGroupsConfiguration(); + } + + public boolean isBeforeMethodConfiguration() + { + return delegate().isBeforeMethodConfiguration(); + } + + public boolean isBeforeSuiteConfiguration() + { + return delegate().isBeforeSuiteConfiguration(); + } + + public boolean isBeforeTestConfiguration() + { + return delegate().isBeforeTestConfiguration(); + } + + public boolean isTest() + { + return delegate().isTest(); + } + + public void setDate(long date) + { + delegate().setDate(date); + } + + public void setId(String id) + { + delegate().setId(id); + } + + public void setInvocationCount(int count) + { + delegate().setInvocationCount(count); + } + + public void setMissingGroup(String group) + { + delegate().setMissingGroup(group); + } + + public void setParameterInvocationCount(int n) + { + delegate().setParameterInvocationCount(n); + } + + public void setRetryAnalyzer(IRetryAnalyzer retryAnalyzer) + { + delegate().setRetryAnalyzer(retryAnalyzer); + } + + public void setSkipFailedInvocations(boolean skip) + { + delegate().setSkipFailedInvocations(skip); + } + + public void setTestClass(ITestClass cls) + { + delegate().setTestClass(cls); + } + + public void setThreadPoolSize(int threadPoolSize) + { + delegate().setThreadPoolSize(threadPoolSize); + } + + public boolean skipFailedInvocations() + { + return delegate().skipFailedInvocations(); + } + + @SuppressWarnings("unchecked") + public int compareTo(Object arg0) + { + return delegate().compareTo(arg0); + } + + @Override + public boolean equals(Object obj) + { + return delegate().equals(obj); + } + + @Override + public int hashCode() + { + return delegate().hashCode(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ForwardingITestNGMethod.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ForwardingITestResult.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ForwardingITestResult.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ForwardingITestResult.java 2009-02-11 20:44:55 UTC (rev 1489) @@ -0,0 +1,82 @@ +package org.jboss.jsr299.tck.impl.testng; + +import org.testng.IClass; +import org.testng.ITestNGMethod; +import org.testng.ITestResult; + +public abstract class ForwardingITestResult implements ITestResult +{ + + protected abstract ITestResult delegate(); + + public long getEndMillis() + { + return delegate().getEndMillis(); + } + + public String getHost() + { + return delegate().getHost(); + } + + public ITestNGMethod getMethod() + { + return new SaneITestNGMethod(delegate().getMethod()); + } + + public String getName() + { + return delegate().getName(); + } + + public Object[] getParameters() + { + return delegate().getParameters(); + } + + public long getStartMillis() + { + return delegate().getStartMillis(); + } + + public int getStatus() + { + return delegate().getStatus(); + } + + public IClass getTestClass() + { + return delegate().getTestClass(); + } + + public Throwable getThrowable() + { + return delegate().getThrowable(); + } + + public boolean isSuccess() + { + return delegate().isSuccess(); + } + + public void setEndMillis(long millis) + { + delegate().setEndMillis(millis); + } + + public void setParameters(Object[] parameters) + { + delegate().setParameters(parameters); + } + + public void setStatus(int status) + { + delegate().setStatus(status); + } + + public void setThrowable(Throwable throwable) + { + delegate().setThrowable(throwable); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ForwardingITestResult.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/SaneITestNGMethod.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/SaneITestNGMethod.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/SaneITestNGMethod.java 2009-02-11 20:44:55 UTC (rev 1489) @@ -0,0 +1,49 @@ +/** + * + */ +package org.jboss.jsr299.tck.impl.testng; + +import org.testng.ITestNGMethod; + +public class SaneITestNGMethod extends ForwardingITestNGMethod +{ + private final ITestNGMethod method; + + public SaneITestNGMethod(ITestNGMethod method) + { + this.method = method; + } + + @Override + protected ITestNGMethod delegate() + { + return method; + } + + @Override + public boolean equals(Object obj) + { + if (obj instanceof ITestNGMethod && method != null) + { + ITestNGMethod other = (ITestNGMethod) method; + return method.getMethodName().equals(other.getMethodName()) && method.getTestClass().equals(other.getTestClass()); + } + else + { + return false; + } + } + + @Override + public int hashCode() + { + if (method != null && method.getMethodName() != null) + { + return method.getMethodName().hashCode(); + } + else + { + return 0; + } + } +} \ No newline at end of file Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/SaneITestNGMethod.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-11 19:13:27 UTC (rev 1488) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-11 20:44:55 UTC (rev 1489) @@ -4,6 +4,7 @@ import java.util.List; import java.util.Set; +import javax.inject.AnnotationLiteral; import javax.inject.Current; import javax.inject.Production; import javax.inject.manager.Bean; @@ -174,9 +175,20 @@ @Test(groups = { "injection", "producerMethod" }) public void testMethodWithBindingAnnotationsOnParametersAreInjected() throws Exception { - Spider spider = manager.resolveByType(Spider.class).iterator().next().create(new MockCreationalContext<Spider>()); - assert spider != null; - assert spider instanceof DefangedTarantula; + new RunInDependentContext() + { + + @Override + protected void execute() throws Exception + { + Spider spider = manager.getInstanceByType(Spider.class, new AnnotationLiteral<Produced>() {}); + assert spider != null; + assert spider instanceof DefangedTarantula; + } + + }.run(); + + } @Test(groups = { "stub", "injection", "webbeansxml" }) Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Produced.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Produced.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Produced.java 2009-02-11 20:44:55 UTC (rev 1489) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.unit.definition.binding; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Produced +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/Produced.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/SpiderProducer.java 2009-02-11 19:13:27 UTC (rev 1488) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/SpiderProducer.java 2009-02-11 20:44:55 UTC (rev 1489) @@ -10,7 +10,7 @@ return new DefangedTarantula(); } - @Produces public Spider produceSpiderFromInjection(@Tame Tarantula tarantula) + @Produces @Produced public Spider produceSpiderFromInjection(@Tame Tarantula tarantula) { return tarantula; } Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java 2009-02-11 19:13:27 UTC (rev 1488) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java 2009-02-11 20:44:55 UTC (rev 1489) @@ -3,19 +3,30 @@ import java.io.File; import java.io.FilenameFilter; -import org.jboss.jsr299.tck.impl.packaging.DeclarativeArtifactProcessor; +import org.jboss.jsr299.tck.api.Configuration; +import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; +import org.jboss.jsr299.tck.test.impl.mock.MockConfiguration; import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; public class DeclarativeStandaloneTest extends AbstractArtifactTest { + private Configuration configuration; + + @BeforeClass + public void beforeClass() + { + configuration = new MockConfiguration(); + configuration.setStandalone(true); + } + @Test public void testDefaultDeclartiveArtifact() throws Exception { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyTest.class, true, null); - TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact(); + TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyTest.class); assert !artifact.isEjbs(); assert artifact.isUnit(); File root = artifact.getExplodedJar(); @@ -66,8 +77,7 @@ @Test public void testClassesSpecifiedArtifact() throws Exception { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyClassesSpecifiedTest.class, true, null); - TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact(); + TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyClassesSpecifiedTest.class); File root = artifact.getExplodedJar(); File currentPackage = getCurrentPackageAsFile(root); assert currentPackage.listFiles().length == 1; @@ -89,12 +99,10 @@ @Test public void testResourcesSpecifiedArtifact() throws Exception { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyResourcesSpecifiedTest.class, false, null); - TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact(); + TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyResourcesSpecifiedTest.class); File root = artifact.getExplodedJar(); assert root.listFiles(META_INF_FILTER).length == 1; File metaInf = root.listFiles(META_INF_FILTER)[0]; - assert metaInf.listFiles().length == 1; assert metaInf.listFiles(new FilenameFilter() { @@ -109,34 +117,33 @@ @Test public void testIntegrationTestDeclartiveArtifact() throws Exception { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyIntegrationTest.class, false, null); - assert !declarativeArtifactProcessor.getArtifact().isUnit(); + TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyIntegrationTest.class); + assert !artifact.isUnit(); } @Test public void testCustomBeansXml() throws Exception { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyCustomBeansXmlTest.class, false, null); - TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact(); + TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyCustomBeansXmlTest.class); File root = artifact.getExplodedJar(); - File webInf = root.listFiles(WEB_INF_FILTER)[0]; - assert webInf.listFiles(BEANS_XML_FILTER).length == 1; - assert webInf.listFiles(BEANS_XML_FILTER)[0].length() != 0; - String beans = readFile(webInf.listFiles(BEANS_XML_FILTER)[0]); + File metaInf = root.listFiles(META_INF_FILTER)[0]; + assert metaInf.listFiles(BEANS_XML_FILTER).length == 1; + assert metaInf.listFiles(BEANS_XML_FILTER)[0].length() != 0; + String beans = readFile(metaInf.listFiles(BEANS_XML_FILTER)[0]); assert beans.startsWith("<my></my>"); } //@Test public void testEjbTestDeclartiveArtifact() throws Exception { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyEjbTest.class, false, null); - assert declarativeArtifactProcessor.getArtifact().isEjbs(); + TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyEjbTest.class); + assert artifact.isEjbs(); } @Test(expectedExceptions=IllegalArgumentException.class) public void testWrongPackaging() { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyWarUnitTest_Broken.class, false, null); + TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyWarUnitTest_Broken.class); } } Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DeclarativeWarTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DeclarativeWarTest.java 2009-02-11 19:13:27 UTC (rev 1488) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DeclarativeWarTest.java 2009-02-11 20:44:55 UTC (rev 1489) @@ -2,19 +2,30 @@ import java.io.File; -import org.jboss.jsr299.tck.impl.packaging.DeclarativeArtifactProcessor; +import org.jboss.jsr299.tck.api.Configuration; +import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; +import org.jboss.jsr299.tck.test.impl.mock.MockConfiguration; import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; public class DeclarativeWarTest extends AbstractArtifactTest { + private Configuration configuration; + + @BeforeClass + public void beforeClass() + { + configuration = new MockConfiguration(); + configuration.setStandalone(true); + } + @Test public void testDefaultWebXml() throws Exception { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyTest.class, false, null); - TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact(); + TCKArtifactDescriptor artifact = new ArtifactGenerator(configuration).createArtifact(DummyTest.class); File root = artifact.getExplodedJar(); assert root.listFiles(WEB_INF_FILTER).length == 1; File webInf = root.listFiles(WEB_INF_FILTER)[0];

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1488 - in tck/trunk: api/src/main/java/org/jboss/jsr299/tck/api and 7 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-11 14:13:27 -0500 (Wed, 11 Feb 2009) New Revision: 1488 Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/DeclarativeArtifactProcessor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/SpiderProducer.java tck/trunk/pom.xml Log: fix build Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -17,24 +17,29 @@ public static final String OUTPUT_DIRECTORY_PROPERTY_NAME = "org.jboss.jsr299.tck.outputDirectory"; public static final String STANDALONE_PROPERTY_NAME = "org.jboss.jsr299.tck.standalone"; public static final String RUN_INTEGRATION_TESTS_PROPERTY_NAME = "org.jboss.jsr299.tck.runIntegrationTests"; - public static final String DEPLOYMENT_DELAY_PROPERTY_NAME = "org.jboss.jsr299.tck.deploymentDelay"; + public static final String CONNECT_DELAY_PROPERTY_NAME = "org.jboss.jsr299.tck.connectDelay"; public static final String LIBRARY_DIRECTORY_PROPERTY_NAME = "org.jboss.jsr299.tck.libraryDirectory"; public static final String HOST_PROPERTY_NAME = "org.jboss.jsr299.tck.host"; + public static final String CONNECT_RETRIES_PROPERTY_NAME = "org.jboss.jsr299.tck.connectRetries"; + public static final String TEST_CLASS_PROPERTY_NAME = "org.jboss.jsr299.tck.testClass"; public static final String DEFAULT_OUTPUT_DIRECTORY = System.getProperty("java.io.tmpdir") + "/jsr-299-tck/"; public static final boolean DEFAULT_STANDALONE = true; public static final boolean DEFAULT_RUN_INTEGRATION_TESTS = false; - public static final int DEFAULT_DEPLOYMENT_DELAY = 5000; + public static final int DEFAULT_CONNECT_DELAY = 5000; public static final boolean DEFAULT_WRITE_DEPLOYED_ARCHIVES_TO_DISK = false; public static final String DEFAULT_LIBRARY_DIRECTORY = null; public static final String DEFAULT_HOST = "localhost:8080"; + public static final int DEFAULT_CONNECT_RETRIES = 2; public String getOutputDirectory(); public boolean isStandalone(); - public int getDeploymentDelay(); + public int getConnectDelay(); + public int getConnectRetries(); + public String getLibraryDirectory(); public TestLauncher getInContainerTestLauncher(); @@ -53,9 +58,10 @@ public void setStandalone(boolean standalone); - public void setDeploymentDelay(int deploymentDelay); + public void setConnectDelay(int connectDelay); + + public void setConnectRetries(int connectRetries); - public void setLibraryDirectory(String libraryDir); public void setInContainerTestLauncher(TestLauncher testLauncher); @@ -86,4 +92,8 @@ public void setHost(String host); + public Class<?> getTestClass(); + + public void setTestClass(Class<?> clazz); + } \ No newline at end of file Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -1,12 +1,12 @@ package org.jboss.jsr299.tck.api; -import org.testng.ITestContext; +import org.testng.ISuite; public interface TestLauncher { public static final String PROPERTY_NAME = TestLauncher.class.getName(); - public ITestContext launchTest(Configuration configuration, Class<?> testClass) throws Exception; + public ISuite launchTest(Configuration configuration, Class<?> testClass) throws Exception; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -28,11 +28,14 @@ import org.jboss.jsr299.tck.impl.packaging.EjbArtifact; import org.jboss.jsr299.tck.impl.util.MockCreationalContext; import org.jboss.jsr299.tck.spi.StandaloneContainers; +import org.testng.IHookCallBack; +import org.testng.IHookable; +import org.testng.ITestResult; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @SuppressWarnings("unchecked") -public class AbstractTest +public class AbstractTest implements IHookable { protected abstract static class RunInDependentContext @@ -227,4 +230,22 @@ { return new MockCreationalContext<T>(); } + + public void run(IHookCallBack callback, ITestResult testResult) + { + if () + } + + private static boolean isInContainerTest() + { + if (!ConfigurationImpl.get().isStandalone()) + { + // We aren't in standalone mode, so everything runs in the container + return false; + } + else + { + + } + } } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -34,7 +34,8 @@ private String outputDirectory; private boolean standalone; private boolean runIntegrationTests; - private int deploymentDelay; + private int connectDelay; + private int connectRetries; private String libraryDirectory; private TestLauncher testLauncher; private Beans beans; @@ -46,6 +47,7 @@ private List<String> inContainerPackageNames; private List<String> unitTestPackageNames; private String host; + private Class<?> testClass; protected ConfigurationImpl() { @@ -57,7 +59,7 @@ this.outputDirectory = configuration.getOutputDirectory(); this.standalone = configuration.isStandalone(); this.runIntegrationTests = configuration.isRunIntegrationTests(); - this.deploymentDelay = configuration.getDeploymentDelay(); + this.connectDelay = configuration.getConnectDelay(); this.libraryDirectory = configuration.getLibraryDirectory(); this.testLauncher = configuration.getInContainerTestLauncher(); this.beans = configuration.getBeans(); @@ -67,6 +69,8 @@ this.el = configuration.getEl(); this.standaloneContainers = configuration.getStandaloneContainers(); this.host = configuration.getHost(); + this.connectRetries = configuration.getConnectRetries(); + this.testClass = configuration.getTestClass(); } public String getOutputDirectory() @@ -91,14 +95,14 @@ this.unitTestPackageNames = null; } - public int getDeploymentDelay() + public int getConnectDelay() { - return deploymentDelay; + return connectDelay; } - public void setDeploymentDelay(int deploymentDelay) + public void setConnectDelay(int deploymentDelay) { - this.deploymentDelay = deploymentDelay; + this.connectDelay = deploymentDelay; } public String getLibraryDirectory() @@ -239,6 +243,18 @@ this.testLauncher = testLauncher; } + public int getConnectRetries() + { + return connectRetries; + } + + public void setConnectRetries(int connectRetries) + { + this.connectRetries = connectRetries; + } + + + @Override public String toString() { @@ -248,7 +264,8 @@ configuration.append("\tBeans: ").append(getBeans()).append("\n"); configuration.append("\tContainers: ").append(getContainers()).append("\n"); configuration.append("\tContexts: ").append(getContexts()).append("\n"); - configuration.append("\tDeployment Delay: ").append(getDeploymentDelay()).append("\n"); + configuration.append("\tConnect Delay: ").append(getConnectDelay()).append("\n"); + configuration.append("\tConnect Retries: ").append(getConnectRetries()).append("\n"); configuration.append("\tEL: ").append(getEl()).append("\n"); configuration.append("\tHost: ").append(getHost()).append("\n"); configuration.append("\tIn Container Tests Package Names: ").append(getInContainerTestPackageNames()).append("\n"); @@ -258,9 +275,20 @@ configuration.append("\tRun Integration Tests: ").append(isRunIntegrationTests()).append("\n"); configuration.append("\tStandalone: ").append(isStandalone()).append("\n"); configuration.append("\tTest Launcher: ").append(getTestLauncher()).append("\n"); + configuration.append("\tTest Class: ").append(getTestClass()).append("\n"); configuration.append("\tStandalone Tests Pacakge Names: ").append(getStandaloneTestPackageNames()).append("\n"); return configuration.toString(); } + + public Class<?> getTestClass() + { + return testClass; + } + + public void setTestClass(Class<?> testClass) + { + this.testClass = testClass; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -24,9 +24,11 @@ setOutputDirectory(deploymentProperties.getStringValue(OUTPUT_DIRECTORY_PROPERTY_NAME, DEFAULT_OUTPUT_DIRECTORY, false)); setStandalone(deploymentProperties.getBooleanValue(STANDALONE_PROPERTY_NAME, DEFAULT_STANDALONE, false)); setRunIntegrationTests(deploymentProperties.getBooleanValue(RUN_INTEGRATION_TESTS_PROPERTY_NAME, DEFAULT_RUN_INTEGRATION_TESTS, false)); - setDeploymentDelay(deploymentProperties.getIntValue(DEPLOYMENT_DELAY_PROPERTY_NAME, DEFAULT_DEPLOYMENT_DELAY, false)); + setConnectDelay(deploymentProperties.getIntValue(CONNECT_DELAY_PROPERTY_NAME, DEFAULT_CONNECT_DELAY, false)); + setConnectRetries(deploymentProperties.getIntValue(CONNECT_RETRIES_PROPERTY_NAME, DEFAULT_CONNECT_RETRIES, false)); setLibraryDirectory(deploymentProperties.getStringValue(LIBRARY_DIRECTORY_PROPERTY_NAME, DEFAULT_LIBRARY_DIRECTORY, false)); setHost(deploymentProperties.getStringValue(HOST_PROPERTY_NAME, DEFAULT_HOST, false)); + setTestClass(deploymentProperties.getClassValue(TEST_CLASS_PROPERTY_NAME, null, false)); } public PropertiesBasedConfigurationImpl loadSPIImplementation() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -12,7 +12,6 @@ import org.jboss.jsr299.tck.api.TCK; import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; import org.jboss.jsr299.tck.impl.runner.TestSuiteLauncher; -import org.testng.ITestContext; import org.testng.TestNG; import org.testng.xml.Parser; import org.testng.xml.XmlSuite; @@ -73,10 +72,6 @@ { log.error("Error executing in container tests", e); } - for (ITestContext result : suiteLauncher.getTestContet()) - { - log.info(result); - } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -36,11 +36,16 @@ List<ArtifactDescriptor> artifacts = new ArrayList<ArtifactDescriptor>(); for (Class<?> clazz : classes) { - artifacts.add(new DeclarativeArtifactProcessor(clazz, configuration.isStandalone(), configuration.getLibraryDirectory()).getArtifact()); + artifacts.add(createArtifact(clazz)); } return artifacts; } + public ArtifactDescriptor createArtifact(Class<?> clazz) + { + return new DeclarativeArtifactProcessor(clazz, configuration.isStandalone(), configuration.getLibraryDirectory()).getArtifact(); + } + public void dumpArtifacts() { List<ArtifactDescriptor> artifacts = createArtifacts(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/DeclarativeArtifactProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/DeclarativeArtifactProcessor.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/DeclarativeArtifactProcessor.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -19,7 +19,6 @@ import org.apache.log4j.Logger; import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; -import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor; public class DeclarativeArtifactProcessor { @@ -142,32 +141,7 @@ public TCKArtifactDescriptor getArtifact() { - final TCKArtifactDescriptor artifact; - if (packagingType.equals(WAR)) - { - artifact = new WarArtifactDescriptor(declaringClass, beansXml); - } - else if (packagingType.equals(EAR)) - { - throw new UnsupportedOperationException(); - } - else if (!standalone && ejbs) - { - throw new UnsupportedOperationException(); - } - else if (!standalone) - { - artifact = new WarArtifactDescriptor(declaringClass, beansXml); - } - else - { - artifact = new TCKArtifactDescriptor(declaringClass, beansXml); - } - - if (addDeclaringPackage) - { - artifact.addPackage(declaringClass.getPackage()); - } + final TCKArtifactDescriptor artifact = ArtifactFactory.newArtifact(packagingType, declaringClass, beansXml, standalone, ejbs, addDeclaringPackage); artifact.setEjbs(ejbs); artifact.setUnit(unit); artifact.getClasses().addAll(classes); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/PackagingType.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -3,6 +3,6 @@ public enum PackagingType { - UNSPECIFIED, EAR, WAR; + UNSPECIFIED, EAR, WAR } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -7,6 +7,7 @@ import java.util.List; import org.jboss.jsr299.tck.impl.util.DeploymentProperties; +import org.testng.ISuite; import org.testng.ITestContext; import org.testng.TestNG; import org.testng.internal.InvokedMethod; @@ -31,29 +32,30 @@ this.classNames = deploymentProperties.getPropertyValues("className"); } - public ITestContext run() + public ISuite run() { TestNG testNG = new TestNG(false); testNG.setVerbose(0); - BufferedListener listener = new BufferedListener(); - testNG.addListener(listener); - List<XmlSuite> suites = new ArrayList<XmlSuite>(); - testNG.setXmlSuites(suites); - suites.add(createSuite()); testNG.run(); - - return makeITestContextSerializable(listener.getContext()); + //BufferedListener listener = new BufferedListener(); + //testNG.addListener(listener); + List<XmlSuite> xmlSuites = new ArrayList<XmlSuite>(); + testNG.setXmlSuites(xmlSuites); + xmlSuites.add(createSuite()); + List<ISuite> suites = testNG.runSuitesLocally(); + return suites.get(0); + //return makeITestContextSerializable(listener.getContext()); } private XmlSuite createSuite() { XmlSuite suite = new XmlSuite(); suite.setName("JSR-299 TCK"); - + suite.setAnnotations("JDK5_ANNOTATION_TYPE"); for (String className : classNames) { XmlTest test = new XmlTest(suite); - test.setName("JSR-299 TCK " + className); + test.setName("JSR-299 TCK" + className); List<XmlClass> testClasses = Arrays.asList(new XmlClass(className)); test.setXmlClasses(testClasses); } @@ -71,10 +73,19 @@ try { - List<InvokedMethod> methods = (List<InvokedMethod>) org.testng.TestRunner.class.getField("m_invokedMethods").get(context); + Field methodInterceptorField = org.testng.TestRunner.class.getDeclaredField("m_methodInterceptor"); + methodInterceptorField.setAccessible(true); + methodInterceptorField.set(context, null); + Field testPlanField = org.testng.TestRunner.class.getDeclaredField("m_testPlan"); + testPlanField.setAccessible(true); + testPlanField.set(context, null); + Field invokedMethodsField = org.testng.TestRunner.class.getDeclaredField("m_invokedMethods"); + invokedMethodsField.setAccessible(true); + List<InvokedMethod> methods = (List<InvokedMethod>) invokedMethodsField.get(context); for (InvokedMethod method : methods) { - Field parametersField = method.getClass().getField("m_parameters"); + Field parametersField = InvokedMethod.class.getDeclaredField("m_parameters"); + parametersField.setAccessible(true); Object[] parameters = (Object[]) parametersField.get(method); if (parameters != null) { @@ -93,6 +104,7 @@ { throw new RuntimeException("Error preparing ITestContext for serialization " + context, e); } + } return context; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -3,52 +3,65 @@ import java.util.ArrayList; import java.util.List; +import org.apache.log4j.Logger; import org.jboss.jsr299.tck.api.Configuration; import org.jboss.jsr299.tck.impl.packaging.ArtifactDescriptor; import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; -import org.testng.ITestContext; +import org.testng.ISuite; public class TestSuiteLauncher { + private static final Logger log = Logger.getLogger(TestSuiteLauncher.class); + private final Configuration configuration; - private final List<ITestContext> contexts; + private final List<ISuite> suites; public TestSuiteLauncher(Configuration configuration) { this.configuration = configuration; - this.contexts = new ArrayList<ITestContext>(); + this.suites = new ArrayList<ISuite>(); } public void run() throws Exception { - List<ArtifactDescriptor> artifacts = new ArtifactGenerator(configuration).createArtifacts(); - for (ArtifactDescriptor artifact : artifacts) + ArtifactGenerator generator = new ArtifactGenerator(configuration); + if (configuration.getTestClass() == null) { - try + List<ArtifactDescriptor> artifacts = generator.createArtifacts(); + for (ArtifactDescriptor artifact : artifacts) { - deployArtifact(artifact); - Thread.sleep(configuration.getDeploymentDelay()); - contexts.add(configuration.getInContainerTestLauncher().launchTest(configuration, artifact.getDeclaringClass())); + testArtifact(artifact); } - finally - { - configuration.getContainers().undeploy(artifact.getDefaultName()); - } } + else + { + testArtifact(generator.createArtifact(configuration.getTestClass())); + } } - protected void deployArtifact(ArtifactDescriptor artifact) throws Exception + protected void testArtifact(ArtifactDescriptor artifact) throws Exception { - InputStream jar = artifact.getJar(); - configuration.getContainers().deploy(jar, artifact.getDefaultName()); - jar.close(); + try + { + InputStream jar = artifact.getJar(); + configuration.getContainers().deploy(jar, artifact.getDefaultName()); + jar.close(); + ISuite context = configuration.getInContainerTestLauncher().launchTest(configuration, artifact.getDeclaringClass()); + log.debug("Executed tests for " + artifact.getDefaultName()); + suites.add(context); + } + finally + { + configuration.getContainers().undeploy(artifact.getDefaultName()); + } + } - public List<ITestContext> getTestContet() + public List<ISuite> getSuites() { - return contexts; + return suites; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -7,40 +7,52 @@ import org.jboss.jsr299.tck.api.Configuration; import org.jboss.jsr299.tck.api.TestLauncher; -import org.testng.ITestContext; +import org.testng.ISuite; public class ServletTestLauncher implements TestLauncher { - public ITestContext launchTest(Configuration configuration, Class<?> testClass) throws Exception + public ISuite launchTest(Configuration configuration, Class<?> testClass) throws Exception { String url = "http://" + configuration.getHost() + "/" + testClass.getName() + "/?outputMode=serializedObject"; - URLConnection connection = new URL(url).openConnection(); - if (!(connection instanceof HttpURLConnection)) + for (int i = 0; i < configuration.getConnectRetries(); i++) { - throw new IllegalStateException("Not an http connection! " + connection); - } - HttpURLConnection httpConnection = (HttpURLConnection) connection; - httpConnection.setUseCaches(false); - httpConnection.setDefaultUseCaches(false); - httpConnection.connect(); - if (httpConnection.getResponseCode() == HttpURLConnection.HTTP_OK) - { - ObjectInputStream ois = new ObjectInputStream(httpConnection.getInputStream()); - Object o = ois.readObject(); - ois.close(); - if (o instanceof ITestContext) + Thread.sleep(configuration.getConnectDelay()); + URLConnection connection = new URL(url).openConnection(); + if (!(connection instanceof HttpURLConnection)) { - throw new IllegalStateException("Error reading test results - expected a ITestContext but got " + o); + throw new IllegalStateException("Not an http connection! " + connection); } - ITestContext context = (ITestContext) o; - httpConnection.disconnect(); - return context; + HttpURLConnection httpConnection = (HttpURLConnection) connection; + httpConnection.setUseCaches(false); + httpConnection.setDefaultUseCaches(false); + try + { + httpConnection.connect(); + if (httpConnection.getResponseCode() == HttpURLConnection.HTTP_OK) + { + ObjectInputStream ois = new ObjectInputStream(httpConnection.getInputStream()); + Object o = ois.readObject(); + ois.close(); + if (!(o instanceof ISuite)) + { + throw new IllegalStateException("Error reading test results - expected a ISuite but got " + o); + } + ISuite context = (ISuite) o; + + return context; + } + else if (httpConnection.getResponseCode() != HttpURLConnection.HTTP_NOT_FOUND) + { + throw new IllegalStateException("Error launching test " + testClass.getName() + " at " + url + ". Got " + httpConnection.getResponseCode() + " ("+ httpConnection.getResponseMessage() + ")"); + } + } + finally + { + httpConnection.disconnect(); + } } - else - { - throw new IllegalStateException("Error launching test " + testClass.getName() + " at " + url + ". Got " + httpConnection.getResponseCode() + " ("+ httpConnection.getResponseMessage() + ")"); - } + throw new IllegalStateException("Error launching test " + testClass.getName() + " at " + url + ". Kept on getting 404s."); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -11,7 +11,7 @@ import org.jboss.jsr299.tck.impl.ConfigurationImpl; import org.jboss.jsr299.tck.impl.runner.TestRunner; -import org.testng.ITestContext; +import org.testng.ISuite; import org.testng.ITestResult; public class ServletTestRunner extends HttpServlet @@ -22,7 +22,7 @@ { ConfigurationImpl.get().setStandalone(false); TestRunner runner = new TestRunner(); - ITestContext context = runner.run(); + ISuite suite = runner.run(); String outputMode; if (req.getParameter("outputMode") != null) { @@ -46,11 +46,11 @@ writer.write("<tr>\n"); writer.write("<td><b>Method</b></td><td><b>Status</b></td>\n"); writer.write("</tr>\n"); - for (ITestResult result : context.getFailedConfigurations().getAllResults()) + for (ITestResult result : suite.getResults().get("JSR-299 TCK").getTestContext().getFailedConfigurations().getAllResults()) { writeResult(writer, result); } - for (ITestResult result : context.getSkippedConfigurations().getAllResults()) + for (ITestResult result : suite.getResults().get("JSR-299 TCK").getTestContext().getSkippedConfigurations().getAllResults()) { writeResult(writer, result); } @@ -60,15 +60,15 @@ writer.write("<tr>\n"); writer.write("<td><b>Method</b></td><td><b>Status</b></td>\n"); writer.write("</tr>\n"); - for (ITestResult result : context.getFailedTests().getAllResults()) + for (ITestResult result : suite.getResults().get("JSR-299 TCK").getTestContext().getFailedTests().getAllResults()) { writeResult(writer, result); } - for (ITestResult result : context.getPassedTests().getAllResults()) + for (ITestResult result : suite.getResults().get("JSR-299 TCK").getTestContext().getPassedTests().getAllResults()) { writeResult(writer, result); } - for (ITestResult result : context.getSkippedTests().getAllResults()) + for (ITestResult result : suite.getResults().get("JSR-299 TCK").getTestContext().getSkippedTests().getAllResults()) { writeResult(writer, result); } @@ -79,7 +79,7 @@ { resp.setStatus(HttpServletResponse.SC_OK); ObjectOutputStream oos = new ObjectOutputStream(resp.getOutputStream()); - oos.writeObject(context); + oos.writeObject(suite); oos.flush(); oos.close(); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/bean/BeanDefinitionTest.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -9,9 +9,9 @@ import javax.inject.Production; import javax.inject.manager.Bean; +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractTest; -import org.jboss.jsr299.tck.SpecAssertion; -import org.jboss.jsr299.tck.SpecAssertions; import org.jboss.jsr299.tck.impl.packaging.Artifact; import org.testng.annotations.Test; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/SpiderProducer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/SpiderProducer.java 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/SpiderProducer.java 2009-02-11 19:13:27 UTC (rev 1488) @@ -2,9 +2,6 @@ import javax.inject.Produces; - - -@AnotherDeploymentType class SpiderProducer { Modified: tck/trunk/pom.xml =================================================================== --- tck/trunk/pom.xml 2009-02-11 18:10:17 UTC (rev 1487) +++ tck/trunk/pom.xml 2009-02-11 19:13:27 UTC (rev 1488) @@ -108,10 +108,15 @@ </dependency> <dependency> <groupId>org.hibernate</groupId> - <artifactId>tck-utils</artifactId> + <artifactId>tck-utils-api</artifactId> <version>0.9-SNAPSHOT</version> - </dependency> + </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>tck-utils-impl</artifactId> + <version>0.9-SNAPSHOT</version> + </dependency> + <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-api</artifactId> <version>3.1.0-Alpha1</version>

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1487 - in tck/trunk: impl and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-11 13:10:17 -0500 (Wed, 11 Feb 2009) New Revision: 1487 Modified: tck/trunk/api/pom.xml tck/trunk/impl/pom.xml Log: tidy up POMs, enable tcd reporter Modified: tck/trunk/api/pom.xml =================================================================== --- tck/trunk/api/pom.xml 2009-02-11 18:08:57 UTC (rev 1486) +++ tck/trunk/api/pom.xml 2009-02-11 18:10:17 UTC (rev 1487) @@ -42,6 +42,13 @@ <groupId>org.testng</groupId> <artifactId>testng</artifactId> <classifier>jdk15</classifier> + <optional>true</optional> + <exclusions> + <exclusion> + <artifactId>jnuit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> </dependency> </dependencies> Modified: tck/trunk/impl/pom.xml =================================================================== --- tck/trunk/impl/pom.xml 2009-02-11 18:08:57 UTC (rev 1486) +++ tck/trunk/impl/pom.xml 2009-02-11 18:10:17 UTC (rev 1487) @@ -37,6 +37,11 @@ <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>tck-utils-api</artifactId> + </dependency> <dependency> <groupId>org.jboss.ejb3</groupId> @@ -151,10 +156,10 @@ </property> </activation> <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>tck-utils</artifactId> - </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>tck-utils-impl</artifactId> + </dependency> </dependencies> <build> <plugins> @@ -162,9 +167,9 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <compileArguments> - <processor>org.hibernate.tck.report.CoverageProcessor</processor> - </compileArguments> + <source>1.6</source> + <target>1.6</target> + <compilerArgument>-AauditXml=${basedir}/tck-audit.xml</compilerArgument> </configuration> </plugin> <plugin>

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1486 - in ri/trunk: webbeans-ri and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-11 13:08:57 -0500 (Wed, 11 Feb 2009) New Revision: 1486 Modified: ri/trunk/jboss-tck-runner/pom.xml ri/trunk/webbeans-ri-spi/pom.xml ri/trunk/webbeans-ri/pom.xml Log: tidy up poms Modified: ri/trunk/jboss-tck-runner/pom.xml =================================================================== --- ri/trunk/jboss-tck-runner/pom.xml 2009-02-11 13:23:24 UTC (rev 1485) +++ ri/trunk/jboss-tck-runner/pom.xml 2009-02-11 18:08:57 UTC (rev 1486) @@ -82,6 +82,33 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>incontainer-tests.xml</suiteXmlFile> + </suiteXmlFiles> + <systemProperties> + <property> + <name>org.jboss.jsr299.tck.standalone</name> + <value>false</value> + </property> + <property> + <name>jbossHome</name> + <value>/Applications/jboss-5.0.0.GA</value> + </property> + <property> + <name>org.jboss.jsr299.tck.libraryDirectory</name> + <value>${project.build.directory}/dependency/lib</value> + </property> + <property> + <name>org.jboss.jsr299.tck.testClass</name> + <value>org.jboss.jsr299.tck.unit.definition.bean.BeanDefinitionTest</value> + </property> + </systemProperties> + </configuration> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <executions> @@ -90,14 +117,14 @@ <phase>test</phase> <configuration> <tasks> - <java classname="org.jboss.jsr299.tck.api.TCK" classpathref="maven.test.classpath" failonerror="true" fork="true"> +  </tasks> </configuration> <goals> Modified: ri/trunk/webbeans-ri/pom.xml =================================================================== --- ri/trunk/webbeans-ri/pom.xml 2009-02-11 13:23:24 UTC (rev 1485) +++ ri/trunk/webbeans-ri/pom.xml 2009-02-11 18:08:57 UTC (rev 1486) @@ -25,6 +25,12 @@ <artifactId>testng</artifactId> <scope>test</scope> <classifier>jdk15</classifier> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> </dependency> <dependency> Modified: ri/trunk/webbeans-ri-spi/pom.xml =================================================================== --- ri/trunk/webbeans-ri-spi/pom.xml 2009-02-11 13:23:24 UTC (rev 1485) +++ ri/trunk/webbeans-ri-spi/pom.xml 2009-02-11 18:08:57 UTC (rev 1486) @@ -26,6 +26,12 @@ <artifactId>testng</artifactId> <scope>test</scope> <classifier>jdk15</classifier> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1485 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-11 08:23:24 -0500 (Wed, 11 Feb 2009) New Revision: 1485 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Packaging.java Log: minor Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Packaging.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Packaging.java 2009-02-11 12:29:48 UTC (rev 1484) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/Packaging.java 2009-02-11 13:23:24 UTC (rev 1485) @@ -2,6 +2,7 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static org.jboss.jsr299.tck.impl.packaging.PackagingType.UNSPECIFIED; import java.lang.annotation.Documented; import java.lang.annotation.Retention; @@ -24,6 +25,6 @@ public @interface Packaging { - PackagingType value() default PackagingType.UNSPECIFIED; + PackagingType value() default UNSPECIFIED; }

17 years, 2 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1484 - in tck/trunk/impl: src/main/java/org/jboss/jsr299/tck/unit/definition/name and 1 other directory.

by webbeans-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-02-11 07:29:48 -0500 (Wed, 11 Feb 2009) New Revision: 1484 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java tck/trunk/impl/tck-audit.xml Log: map assertions for naming tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java 2009-02-11 11:54:02 UTC (rev 1483) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java 2009-02-11 12:29:48 UTC (rev 1484) @@ -28,13 +28,13 @@ } @Test(groups="stub", expectedExceptions=DefinitionException.class) - @SpecAssertion(section="2.6", id = "unknown") + @SpecAssertion(section="2.6", id = "a") public void testInvalidElIdentifierUsedAsWebBeanName() { assert false; } - @Test @SpecAssertion(section="2.6.1", id = "unknown") + @Test @SpecAssertion(section="2.6.1", id = "a") public void testNonDefaultNamed() { Bean<Moose> moose = createSimpleBean(Moose.class); @@ -42,7 +42,7 @@ } @Test(groups={"stub", "webbeansxml"}) - @SpecAssertion(section="2.6.2", id = "unknown") + @SpecAssertion(section="2.6.2", id = "a") public void testNonDefaultXmlNamed() { /*Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); @@ -83,8 +83,8 @@ @Test(groups={"stub", "webbeansxml"}) @SpecAssertions({ - @SpecAssertion(section="2.6.2", id = "unknown"), - @SpecAssertion(section = "2.6.3",id = "unknown") + @SpecAssertion(section="2.6.2", id = "b"), + @SpecAssertion(section = "2.6.3",id = "b") }) public void testJavaNamedUsedWhenNoXmlSpecified() { @@ -98,7 +98,7 @@ @Test @SpecAssertions({ - @SpecAssertion(section= "2.6.3", id = "unknown"), + @SpecAssertion(section= "2.6.3", id = "a"), @SpecAssertion(section = "3.2.7", id = "unknown") }) public void testDefaultNamed() @@ -109,7 +109,7 @@ } @Test(groups={"stub", "webbeansxml"}) - @SpecAssertion(section="2.6.3", id = "unknown") + @SpecAssertion(section="2.6.3", id = "b") public void testDefaultXmlNamed() { /*Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); @@ -131,8 +131,8 @@ @Test @SpecAssertions({ - @SpecAssertion(section = "2.6.3", id = "unknown"), - @SpecAssertion(section = "2.7", id = "unknown") + @SpecAssertion(section = "2.6.3", id = "c"), + @SpecAssertion(section = "2.7", id = "a") }) public void testSterotypeDefaultsName() { @@ -140,21 +140,21 @@ assert model.getName().equals("redSnapper"); } - @Test @SpecAssertion(section="2.6.4", id = "unknown") + @Test @SpecAssertion(section="2.6.4", id = "a") public void testNotNamedInJava() { Bean<SeaBass> model = createSimpleBean(SeaBass.class); assert model.getName() == null; } - @Test @SpecAssertion(section="2.6.4", id = "unknown") + @Test @SpecAssertion(section="2.6.4", id = "a") public void testNotNamedInXml() { Bean<SeaBass> model = createSimpleBean(SeaBass.class); assert model.getName() == null; } - @Test @SpecAssertion(section="2.6.4", id = "unknown") + @Test @SpecAssertion(section="2.6.4", id = "a") public void testNotNamedInStereotype() { Bean<Minnow> model = createSimpleBean(Minnow.class); Modified: tck/trunk/impl/tck-audit.xml =================================================================== --- tck/trunk/impl/tck-audit.xml 2009-02-11 11:54:02 UTC (rev 1483) +++ tck/trunk/impl/tck-audit.xml 2009-02-11 12:29:48 UTC (rev 1484) @@ -276,6 +276,69 @@ </assertion> </section> + + <section id="2.6" title="Bean names"> + + <assertion id="a"> + <text>A valid bean name is a period-separated list of valid EL identifiers</text> + </assertion> + </section> + + <section id="2.6.1" title="Declaring the bean name using annotations"> + + <assertion id="a"> + <text>To specify the name of a bean, the @javax.annotation.Named annotation is applied to the bean class or producer method or field.</text> + </assertion> + + <assertion id="b"> + <text>If the @Named annotation does not specify the value member, the default name is assumed</text> + </assertion> + </section> + + <section id="2.6.2" title="Declaring the bean name using XML"> + + <assertion id="a"> + <text>If the bean is declared in beans.xml, the name may be specified using <Named></text> + </assertion> + + <assertion id="b"> + <text>If the <Named> element is empty, the default name is assumed</text> + </assertion> + </section> + + <section id="2.6.3" title="Default bean names"> + + <assertion id="a"> + <text>A default name must be assigned by the container when a bean class or producer method or field of a bean defined using annotations declares a @Named annotation and no name is explicitly specified by the value member</text> + </assertion> + + <assertion id="b"> + <text>A default name must be assigned by the container when an empty <Named> element is specified by a bean defined in XML</text> + </assertion> + + <assertion id="c"> + <text>A default name must be assigned by the container when a bean declares a stereotype that declares an empty @Named annotation, and the bean does not explicitly specify a name.</text> + </assertion> + </section> + + <section id="2.6.4" title="Beans with no name"> + + <assertion id="a"> + <text>If neither <Named> nor @Named is specified, by the bean or its stereotypes, a bean has no name</text> + </assertion> + </section> + + <section id="2.7" title="Stereotypes"> + + <assertion id="a"> + <text>A stereotype may also specify that all beans with the stereotype have defaulted bean names</text> + </assertion> + + <assertion id="b"> + <text>A bean may declare zero, one or multiple stereotypes</text> + </assertion> + + </section> <section id="3" title="Bean Implementation">

17 years, 2 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits February 2009