[webbeans-commits] Webbeans SVN: r1462 - ri/trunk/jboss-tck-runner/src/main/java and 43 other directories.

Author: pete.muir(a)jboss.org Date: 2009-02-08 17:44:55 -0500 (Sun, 08 Feb 2009) New Revision: 1462 Added: ri/trunk/jboss-tck-runner/src/main/java/org/ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jboss/ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jboss/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/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/helpers/ 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/ 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/TestSuiteLauncher.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/mock/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/mock/MockConfiguration.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Cow.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/standalone/DummyClassesSpecifiedTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyCustomBeansXmlTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyIntegrationTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyResourcesSpecifiedTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest_Broken.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Fox.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/subpackage/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/ 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/descriptors/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/packages/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/Cow.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/SubpackagesArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/subpackge/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/Cow.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/DummyTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/TCKArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/ArtifactScannerTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/DummyArtifact.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/subpackage/ tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/ tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/ tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/foo/ tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/my-web-beans.xml tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/ Removed: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/InContainerTestLauncher.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/InContainerTestRunner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ServletInContainerTestLauncher.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebBeansTCKImpl.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/runner/BufferedListener.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/runner/TestRunner.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/runner/servlet/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/Cow.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/DummyTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/all/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/artifactScanner/ArtifactScannerTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/artifactScanner/DummyArtifact.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/artifactScanner/subpackage/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/Cow.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyEjbTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/Fox.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/war/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/subpackages/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/subpackages/Cow.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/subpackages/pests/ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/war/ tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/foo/ tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/my-web-beans.xml tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/war/ Modified: ri/trunk/jboss-tck-runner/pom.xml tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TCK.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/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/packaging/ArtifactDescriptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.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/context/dependent/DependentContextTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/subpackage/Rat.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/Cow.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DummyTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/Fox.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/packages/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/packages/Cow.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/packages/Fox.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/subpackge/Fox.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/Cow.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/DummyTest.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/subpackage/AnotherDummyArtifact.java tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/subpackage/NotAnArtifact.java Log: Repackage TCK tests, work on in container tests Modified: ri/trunk/jboss-tck-runner/pom.xml =================================================================== --- ri/trunk/jboss-tck-runner/pom.xml 2009-02-08 18:51:29 UTC (rev 1461) +++ ri/trunk/jboss-tck-runner/pom.xml 2009-02-08 22:44:55 UTC (rev 1462) @@ -44,58 +44,107 @@ </dependencies> <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> + <plugins> + </plugins> + </build> + + <profiles> + <profile> + <id>integration-tests</id> + <activation> + <property> + <name>integration</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>test</id> + <phase>test</phase> + <configuration> + <tasks> + <java classname="org.jboss.jsr299.tck.api.TCK" classpathref="maven.test.classpath" failonerror="true" fork="true"> + <jvmarg line="-DrunSuite=true"/> + </java> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </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> - <artifactItems> - <artifactItem> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-impl</artifactId> - <type>xml</type> - <classifier>suite</classifier> - <overWrite>true</overWrite> - </artifactItem> - </artifactItems> + <suiteXmlFiles> + <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-${jsr299.tck.version}-suite.xml</suiteXmlFile> + </suiteXmlFiles> </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> + </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> Added: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jboss/ContainersImpl.java =================================================================== --- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jboss/ContainersImpl.java (rev 0) +++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jboss/ContainersImpl.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,52 @@ +package org.jboss.webbeans.tck.integration.jboss; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.jboss.jsr299.tck.spi.Containers; + + +public class ContainersImpl implements Containers +{ + + public static final String JBOSS_HOME = "/Applications/jboss-5.0.0.GA"; + + private final File deployDir; + + public ContainersImpl() + { + deployDir = new File(JBOSS_HOME, "server/default/deploy"); + if (!deployDir.isDirectory()) + { + throw new IllegalArgumentException(deployDir.getPath() + " is not a directory"); + } + } + + public void deploy(InputStream archive, String name) throws Exception + { + File file = new File(deployDir, name); + file.createNewFile(); + copy(archive, file); + } + + private static void copy(InputStream inputStream, File file) throws IOException + { + OutputStream os = new FileOutputStream(file); + try + { + byte[] buf = new byte[1024]; + int i = 0; + while ((i = inputStream.read(buf)) != -1) + { + os.write(buf, 0, i); + } + } + finally + { + os.close(); + } + } + +} Property changes on: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jboss/ContainersImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: 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 (rev 0) +++ ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1 @@ +org.jboss.jsr299.tck.spi.Containers=org.jboss.webbeans.tck.integration.ContainersImpl \ No newline at end of file Property changes on: ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml =================================================================== --- ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml (rev 0) +++ ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%-5p [%c{6}] %m%n"/> + </layout> + </appender> + + <!-- ############### Embedded EJB3 ################# --> + <category name="org.jboss"> + <priority value="INFO"/> + </category> + <category name="com.arjuna"> + <priority value="ERROR"/> + </category> + + <!-- ############### Hibernate logging ################# --> + + <category name="org.hibernate"> + <priority value="ERROR"/> + </category> + + <!-- + <category name="org.hibernate.SQL"> + <priority value="TRACE"/> + </category> + + <category name="org.hibernate.type"> + <priority value="TRACE"/> + </category> + + <category name="org.hibernate.loader"> + <priority value="TRACE"/> + </category> + <category name="org.hibernate.cache"> + <priority value="TRACE"/> + </category> + --> + + <!-- ############### Web Beans logging ################### --> + + <category name="org.jboss.webbeans"> + <priority value="INFO"/> + </category> + + <root> + <priority value="INFO"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Property changes on: ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml ___________________________________________________________________ Name: svn:mime-type + text/plain 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-08 18:51:29 UTC (rev 1461) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -20,12 +20,15 @@ public static final String DEPLOYMENT_DELAY_PROPERTY_NAME = "org.jboss.webbeans.tck.deploymentDelay"; public static final String WRITE_DEPLOYED_ARCHIVES_TO_DISK_PROPERTY_NAME = "org.jboss.webbeans.tck.writeDeployedArchivesToDisk"; public static final String LIBRARY_DIRECTORY_PROPERTY_NAME = "org.jboss.webbeans.tck.outputDirectory"; + public static final String HOST_PROPERTY_NAME = "org.jboss.webbeans.tck.host"; + 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 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 String getOutputDirectory(); @@ -37,7 +40,7 @@ public String getLibraryDirectory(); - public InContainerTestLauncher getInContainerTestLauncher(); + public TestLauncher getInContainerTestLauncher(); public Beans getBeans(); @@ -59,7 +62,7 @@ public void setLibraryDirectory(String libraryDir); - public void setInContainerTestLauncher(InContainerTestLauncher inContainerTestLauncher); + public void setInContainerTestLauncher(TestLauncher testLauncher); public void setBeans(Beans beans); @@ -79,8 +82,12 @@ public List<String> getStandaloneTestPackageNames(); - public void setEL(EL el); + public void setEl(EL el); - public EL getEL(); + public EL getEl(); + public String getHost(); + + public void setHost(String host); + } \ No newline at end of file Deleted: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/InContainerTestLauncher.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/InContainerTestLauncher.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/InContainerTestLauncher.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,22 +0,0 @@ -package org.jboss.jsr299.tck.api; - -import org.testng.ITestNGMethod; -import org.testng.ITestResult; - -public interface InContainerTestLauncher -{ - - public static final String PROPERTY_NAME = InContainerTestLauncher.class.getName(); - - public interface TestResult - { - - public ITestResult getResult(); - - public ITestNGMethod getMethod(); - - } - - public Iterable<TestResult> launchTest(Class<?> testClass) throws Exception; - -} Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TCK.java =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TCK.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TCK.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -13,6 +13,8 @@ public static final String DUMP_ARTIFACTS_PROPERTY_NAME = "dumpArtifacts"; + public static final String RUN_SUITE_PROPERTY_NAME = "runSuite"; + /** * Obtain an instance of the TCK * @@ -27,7 +29,7 @@ TCK tCK; try { - tCK = (TCK) Class.forName("org.jboss.webbeans.tck.impl.WebBeansTCKImpl").newInstance(); + tCK = (TCK) Class.forName("org.jboss.jsr299.tck.impl.TCKImpl").newInstance(); } catch (InstantiationException e) { @@ -46,11 +48,16 @@ public static void main(String[] args) { - if (System.getProperty(DUMP_ARTIFACTS_PROPERTY_NAME) != null && Boolean.valueOf(System.getProperty(DUMP_ARTIFACTS_PROPERTY_NAME)) != null && Boolean.valueOf(System.getProperty(DUMP_ARTIFACTS_PROPERTY_NAME))) + if (isSystemPropertyTrue(DUMP_ARTIFACTS_PROPERTY_NAME)) { TCK tck = newInstance(); tck.dumpArtifacts(); } + if (isSystemPropertyTrue(RUN_SUITE_PROPERTY_NAME)) + { + TCK tck = newInstance(); + tck.runInContainerTests(); + } } protected TCK() @@ -58,8 +65,16 @@ } public abstract void dumpArtifacts(); + + public abstract void runInContainerTests(); public abstract Configuration getConfiguration(); + private static boolean isSystemPropertyTrue(String propertyName) + { + String value = System.getProperty(propertyName); + return value != null && Boolean.valueOf(value); + } + } Copied: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java (from rev 1459, tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/InContainerTestLauncher.java) =================================================================== --- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java (rev 0) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.api; + +import java.util.Collection; + +import org.testng.ITestResult; + +public interface TestLauncher +{ + + public static final String PROPERTY_NAME = TestLauncher.class.getName(); + + public Collection<ITestResult> launchTest(Configuration configuration, Class<?> testClass) throws Exception; + +} Property changes on: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/TestLauncher.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-08 18:51:29 UTC (rev 1461) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,18 +1,12 @@ package org.jboss.jsr299.tck.spi; import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.util.List; -import javax.inject.manager.Manager; - public interface Containers { public static final String PROPERTY_NAME = Containers.class.getName(); - public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, InputStream archive); - /** * The compressed archive, represented as an stream of bytes * @@ -21,6 +15,6 @@ * @param archive * @return */ - public Manager deploy(InputStream archive); + public void deploy(InputStream archive, String name) throws Exception; } \ 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-08 18:51:29 UTC (rev 1461) +++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/helpers/ForwardingContainers.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,12 +1,7 @@ package org.jboss.jsr299.tck.spi.helpers; import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.util.List; -import java.util.jar.JarInputStream; -import javax.inject.manager.Manager; - import org.jboss.jsr299.tck.spi.Containers; public abstract class ForwardingContainers implements Containers @@ -14,14 +9,9 @@ protected abstract Containers delegate(); - public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, JarInputStream archive) + public void deploy(InputStream archive, String name) throws Exception { - return delegate().deploy(enabledDeploymentTypes, archive); + delegate().deploy(archive, name); } - public Manager deploy(InputStream archive) - { - return delegate().deploy(archive); - } - } 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-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -7,7 +7,7 @@ import javax.context.Context; import org.jboss.jsr299.tck.api.Configuration; -import org.jboss.jsr299.tck.api.InContainerTestLauncher; +import org.jboss.jsr299.tck.api.TestLauncher; import org.jboss.jsr299.tck.spi.Beans; import org.jboss.jsr299.tck.spi.Containers; import org.jboss.jsr299.tck.spi.Contexts; @@ -18,8 +18,8 @@ public class ConfigurationImpl implements Configuration { - public static final String INTEGRATION_TEST_PACKAGE_NAME = "org.jboss.webbeans.tck.integration"; - public static final String UNIT_TEST_PACKAGE_NAME = "org.jboss.webbeans.tck.unit"; + public static final String INTEGRATION_TEST_PACKAGE_NAME = "org.jboss.jsr299.tck.integration"; + public static final String UNIT_TEST_PACKAGE_NAME = "org.jboss.jsr299.tck.unit"; private static Configuration current; public static Configuration get() @@ -37,7 +37,7 @@ private int deploymentDelay; private boolean writeDeployedArchivesToDisk; private String libraryDirectory; - private InContainerTestLauncher inContainerTestLauncher; + private TestLauncher testLauncher; private Beans beans; private Contexts<? extends Context> contexts; private Managers managers; @@ -46,6 +46,7 @@ private EL el; private List<String> integrationTestPackageNames; private List<String> unitTestPackageNames; + private String host; protected ConfigurationImpl() { @@ -60,13 +61,14 @@ this.deploymentDelay = configuration.getDeploymentDelay(); this.writeDeployedArchivesToDisk = configuration.isWriteDeployedArchivesToDisk(); this.libraryDirectory = configuration.getLibraryDirectory(); - this.inContainerTestLauncher = configuration.getInContainerTestLauncher(); + this.testLauncher = configuration.getInContainerTestLauncher(); this.beans = configuration.getBeans(); this.contexts = configuration.getContexts(); this.managers = configuration.getManagers(); this.containers = configuration.getContainers(); - this.el = configuration.getEL(); + this.el = configuration.getEl(); this.standaloneContainers = configuration.getStandaloneContainers(); + this.host = configuration.getHost(); } public String getOutputDirectory() @@ -119,14 +121,14 @@ this.libraryDirectory = libraryDir; } - public InContainerTestLauncher getInContainerTestLauncher() + public TestLauncher getInContainerTestLauncher() { - return inContainerTestLauncher; + return testLauncher; } - public void setInContainerTestLauncher(InContainerTestLauncher inContainerTestLauncher) + public void setInContainerTestLauncher(TestLauncher testLauncher) { - this.inContainerTestLauncher = inContainerTestLauncher; + this.testLauncher = testLauncher; } public Beans getBeans() @@ -207,12 +209,12 @@ return Collections.unmodifiableList(unitTestPackageNames); } - public EL getEL() + public EL getEl() { return el; } - public void setEL(EL el) + public void setEl(EL el) { this.el = el; } @@ -226,5 +228,27 @@ { this.standaloneContainers = standaloneContainers; } + + public String getHost() + { + return host; + } + + public void setHost(String host) + { + this.host = host; + } + + public TestLauncher getTestLauncher() + { + return testLauncher; + } + + public void setTestLauncher(TestLauncher testLauncher) + { + this.testLauncher = testLauncher; + } + + } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/InContainerTestRunner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/InContainerTestRunner.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/InContainerTestRunner.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,56 +0,0 @@ -package org.jboss.jsr299.tck.impl; -import java.io.IOException; -import java.io.InputStream; -import java.util.List; - -import org.apache.log4j.Logger; -import org.jboss.jsr299.tck.api.Configuration; -import org.jboss.jsr299.tck.impl.packaging.ArtifactDescriptor; - - -public class InContainerTestRunner -{ - - private static final Logger log = Logger.getLogger(InContainerTestRunner.class); - - private final Configuration configuration; - - public InContainerTestRunner() - { - configuration = new ConfigurationImpl(ConfigurationImpl.get()); - } - - protected InContainerTestRunner(Configuration configuration) - { - super(); - this.configuration = configuration; - } - - protected void deployArtifacts(List<ArtifactDescriptor> artifacts) - { - for (ArtifactDescriptor artifact : artifacts) - { - try - { - InputStream jar = artifact.getJar(); - - configuration.getContainers().deploy(jar); - jar.close(); - try - { - Thread.sleep(configuration.getDeploymentDelay()); - } - catch (InterruptedException e) - { - Thread.interrupted(); - } - - } - catch (IOException e) - { - log.error("Error deploying artifact " + artifact, e); - } - } - } - -} 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-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/PropertiesBasedConfigurationImpl.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -2,7 +2,7 @@ import javax.context.Context; -import org.jboss.jsr299.tck.api.InContainerTestLauncher; +import org.jboss.jsr299.tck.api.TestLauncher; import org.jboss.jsr299.tck.impl.util.DeploymentProperties; import org.jboss.jsr299.tck.spi.Beans; import org.jboss.jsr299.tck.spi.Containers; @@ -31,12 +31,12 @@ public PropertiesBasedConfigurationImpl loadSPIImplementation() { - setInContainerTestLauncher(deploymentProperties.getInstanceValue(InContainerTestLauncher.PROPERTY_NAME, InContainerTestLauncher.class, isRunIntegrationTests() || !isStandalone())); + setInContainerTestLauncher(deploymentProperties.getInstanceValue(TestLauncher.PROPERTY_NAME, TestLauncher.class, isRunIntegrationTests() || !isStandalone())); setManagers(deploymentProperties.getInstanceValue(Managers.PROPERTY_NAME, Managers.class, true)); setContainers(deploymentProperties.getInstanceValue(Containers.PROPERTY_NAME, Containers.class, !isStandalone() || isRunIntegrationTests())); setStandaloneContainers(deploymentProperties.getInstanceValue(StandaloneContainers.PROPERTY_NAME, StandaloneContainers.class, isStandalone())); setBeans(deploymentProperties.getInstanceValue(Beans.PROPERTY_NAME, Beans.class, true)); - setEL(deploymentProperties.getInstanceValue(EL.PROPERTY_NAME, EL.class, true)); + setEl(deploymentProperties.getInstanceValue(EL.PROPERTY_NAME, EL.class, true)); @SuppressWarnings("unchecked") Contexts<? extends Context> instanceValue = deploymentProperties.getInstanceValue(Contexts.PROPERTY_NAME, Contexts.class, true); Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ServletInContainerTestLauncher.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ServletInContainerTestLauncher.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ServletInContainerTestLauncher.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,59 +0,0 @@ -package org.jboss.jsr299.tck.impl; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.net.HttpURLConnection; -import java.net.URL; -import java.net.URLConnection; -import java.util.List; - -import org.apache.log4j.Logger; -import org.jboss.jsr299.tck.api.InContainerTestLauncher; - -public class ServletInContainerTestLauncher implements InContainerTestLauncher -{ - - private static final Logger log = Logger.getLogger(ServletInContainerTestLauncher.class); - - private final String host; - - public ServletInContainerTestLauncher(String host) - { - this.host = host; - } - - public Iterable<TestResult> launchTest(Class<?> testClass) throws Exception - { - String url = "http://" + host + "/" + testClass.getName() + "/?outputMode=serializedObject"; - log.info("Running tests located at " + url); - URLConnection connection = new URL(url).openConnection(); - if (!(connection instanceof HttpURLConnection)) - { - throw new IllegalStateException("Not an http connection! " + connection); - } - HttpURLConnection httpConnection = (HttpURLConnection) connection; - httpConnection.connect(); - if (httpConnection.getResponseCode() == HttpURLConnection.HTTP_OK) - { - Object o = new ObjectInputStream(httpConnection.getInputStream()).readObject(); - if (!(o instanceof List)) - { - throw new IllegalStateException("Error reading test results - expected a List<TestResult> but got " + o); - } - List<TestResult> results = (List<TestResult>) o; - return results; - } - else - { - throw new IllegalStateException("Error launching test " + httpConnection.getResponseMessage()); - } - } - - private Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException - { - ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes)); - return in.readObject(); - } - -} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java (from rev 1459, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebBeansTCKImpl.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,98 @@ +package org.jboss.jsr299.tck.impl; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.parsers.ParserConfigurationException; + +import org.apache.log4j.Logger; +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.ITestResult; +import org.testng.TestNG; +import org.testng.xml.Parser; +import org.testng.xml.XmlSuite; +import org.xml.sax.SAXException; + +public class TCKImpl extends TCK +{ + + private static Logger log = Logger.getLogger(TCKImpl.class); + + protected void runUnitTests() + { + TestNG testNG = new TestNG(); + addUnitTests(testNG); + if (getConfiguration().getOutputDirectory() != null) + { + testNG.setOutputDirectory(getConfiguration().getOutputDirectory()); + } + testNG.run(); + } + + private static void addUnitTests(TestNG testNG) + { + InputStream is = TCKImpl.class.getResourceAsStream("/tck-unit-tests.xml"); + if (is == null) + { + throw new IllegalStateException("Unable to load testng.xml"); + } + List<XmlSuite> suites = new ArrayList<XmlSuite>(); + try + { + suites.addAll(new Parser(is).parse()); + + } + catch (ParserConfigurationException e) + { + throw new IllegalStateException("Unable to load testng.xml", e); + } + catch (SAXException e) + { + throw new IllegalStateException("Unable to load testng.xml", e); + } + catch (IOException e) + { + throw new IllegalStateException("Unable to load testng.xml", e); + } + testNG.setXmlSuites(suites); + } + + public void runInContainerTests() + { + TestSuiteLauncher suiteLauncher = new TestSuiteLauncher(getConfiguration()); + try + { + suiteLauncher.run(); + } + catch (Exception e) + { + log.error("Error executing in container tests", e); + } + for (ITestResult result : suiteLauncher.getResults()) + { + log.error(result); + } + } + + + @Override + public void dumpArtifacts() + { + Configuration configuration = new PropertiesBasedConfigurationImpl(); + configuration.setStandalone(false); + configuration.setWriteDeployedArchivesToDisk(true); + new ArtifactGenerator(configuration).dumpArtifacts(); + } + + @Override + public Configuration getConfiguration() + { + return ConfigurationImpl.get(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/TCKImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebBeansTCKImpl.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebBeansTCKImpl.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/WebBeansTCKImpl.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,75 +0,0 @@ -package org.jboss.jsr299.tck.impl; - -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.parsers.ParserConfigurationException; - -import org.jboss.jsr299.tck.api.Configuration; -import org.jboss.jsr299.tck.api.TCK; -import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; -import org.testng.TestNG; -import org.testng.xml.Parser; -import org.testng.xml.XmlSuite; -import org.xml.sax.SAXException; - -public class WebBeansTCKImpl extends TCK -{ - - protected void runUnitTests() - { - TestNG testNG = new TestNG(); - addUnitTests(testNG); - if (getConfiguration().getOutputDirectory() != null) - { - testNG.setOutputDirectory(getConfiguration().getOutputDirectory()); - } - testNG.run(); - } - - private static void addUnitTests(TestNG testNG) - { - InputStream is = WebBeansTCKImpl.class.getResourceAsStream("/tck-unit-tests.xml"); - if (is == null) - { - throw new IllegalStateException("Unable to load testng.xml"); - } - List<XmlSuite> suites = new ArrayList<XmlSuite>(); - try - { - suites.addAll(new Parser(is).parse()); - - } - catch (ParserConfigurationException e) - { - throw new IllegalStateException("Unable to load testng.xml", e); - } - catch (SAXException e) - { - throw new IllegalStateException("Unable to load testng.xml", e); - } - catch (IOException e) - { - throw new IllegalStateException("Unable to load testng.xml", e); - } - testNG.setXmlSuites(suites); - } - - @Override - public void dumpArtifacts() - { - Configuration configuration = new PropertiesBasedConfigurationImpl(); - configuration.setStandalone(false); - configuration.setWriteDeployedArchivesToDisk(true); - new ArtifactGenerator(configuration).dumpArtifacts(); - } - - @Override - public Configuration getConfiguration() - { - return ConfigurationImpl.get(); - } - -} 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-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -182,7 +182,7 @@ File[] children = directory.listFiles(); //loop through dirList, and zip the files for (File child : children) - { + { if (child.isDirectory()) { zip(child, zipOutputStream); @@ -318,7 +318,7 @@ public void writeArtifactToDisk(String outputDirectory) throws IOException { - writeArtifactToDisk(outputDirectory, declaringClass.getName()); + writeArtifactToDisk(outputDirectory, getDefaultName()); } public void writeArtifactToDisk(String outputDirectory, String fileName) throws IOException @@ -326,10 +326,17 @@ File file = new File(outputDirectory, fileName + getExtension()); file.createNewFile(); OutputStream os = new BufferedOutputStream(new FileOutputStream(file)); - Files.copy(getJar(), os); + InputStream jar = getJar(); + Files.copy(jar, os); + jar.close(); os.close(); } + public String getDefaultName() + { + return declaringClass.getName() + getExtension(); + } + private static String getClassFileName(String className) { return className.replace('.', '/') + ".class"; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -2,8 +2,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; @@ -18,28 +16,25 @@ public class TCKArtifactDescriptor extends JSR299ArtifactDescriptor { - private static ResourceDescriptor TCK_SUPPORT_JAR; - - static + private static ResourceDescriptor getTckSupportJar() { - ArtifactDescriptor descriptor = new ArtifactDescriptor(TCKArtifactDescriptor.class); - descriptor.addPackage(AbstractTest.class.getPackage()); - descriptor.addPackage("org.jboss.jsr299.tck.impl", true); - descriptor.addPackage("org.jboss.jsr299.tck.literals", true); - descriptor.addPackage("org.jboss.jsr299.tck.runner", true); - String tmpdir = System.getProperty("java.io.tmpdir"); - try - { - descriptor.writeArtifactToDisk(tmpdir, "tck-support"); - File file = new File(tmpdir, "tck-support.jar"); - file.deleteOnExit(); - TCK_SUPPORT_JAR = new ResourceDescriptor("tck-support.jar", new FileInputStream(tmpdir + "/" + "tck-support.jar")); - } - catch (IOException e) - { - throw new RuntimeException("Error building TCK support Jar", e); - } - + ArtifactDescriptor descriptor = new ArtifactDescriptor(TCKArtifactDescriptor.class); + descriptor.addPackage(AbstractTest.class.getPackage()); + descriptor.addPackage("org.jboss.jsr299.tck.impl", true); + descriptor.addPackage("org.jboss.jsr299.tck.literals", true); + descriptor.addPackage("org.jboss.jsr299.tck.runner", true); + if (descriptor.getClasses().size() == 0) + { + throw new AssertionError("Error building tck-support.jar"); + } + try + { + return new ResourceDescriptor("tck-support.jar", descriptor.getJar()); + } + catch (IOException e) + { + throw new RuntimeException("Error building TCK support Jar", e); + } } private static final Logger log = Logger.getLogger(TCKArtifactDescriptor.class); @@ -52,7 +47,7 @@ super(declaringClass, beansXmlSourceFileName); getLibraries().add(new ResourceDescriptor("testng.jar", "/lib/testng-jdk15.jar")); getLibraries().add(new ResourceDescriptor("jsr-299-tck-api.jar", "/lib/jsr299-tck-api.jar")); - getLibraries().add(TCK_SUPPORT_JAR); + getLibraries().add(getTckSupportJar()); try { getResources().add(new ResourceDescriptor(getClassesRoot() + DeploymentProperties.RESOURCE_BUNDLE, getDeploymentProperties(declaringClass))); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -57,7 +57,10 @@ { if (webInfLib == null) { - webInfLib = new File(archiveRoot, "WEB-INF/lib/"); + File webInf = new File(archiveRoot, "WEB-INF"); + webInf.mkdir(); + webInf.deleteOnExit(); + webInfLib = new File(webInf, "lib"); webInfLib.deleteOnExit(); webInfLib.mkdirs(); } Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/BufferedListener.java (from rev 1459, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/runner/BufferedListener.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/BufferedListener.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/BufferedListener.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,57 @@ +package org.jboss.jsr299.tck.impl.runner; + +import org.testng.ITestContext; +import org.testng.ITestListener; +import org.testng.ITestResult; + +public class BufferedListener implements ITestListener +{ + + private ITestContext context; + + + public BufferedListener() + { + } + + public void onFinish(ITestContext context) + { + this.context = context; + } + + public void onStart(ITestContext context) + { + // No-op + } + + public void onTestFailedButWithinSuccessPercentage(ITestResult result) + { + // No-op + } + + public void onTestFailure(ITestResult result) + { + // No-op + } + + public void onTestSkipped(ITestResult result) + { + // No-op + } + + public void onTestStart(ITestResult result) + { + // No-op + } + + public void onTestSuccess(ITestResult result) + { + // No-op + } + + public ITestContext getContext() + { + return context; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/BufferedListener.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java (from rev 1459, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/runner/TestRunner.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,59 @@ +package org.jboss.jsr299.tck.impl.runner; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.jboss.jsr299.tck.impl.util.DeploymentProperties; +import org.testng.ITestContext; +import org.testng.TestNG; +import org.testng.xml.XmlClass; +import org.testng.xml.XmlSuite; +import org.testng.xml.XmlTest; + +public class TestRunner +{ + + private List<String> classNames; + + public TestRunner(String className) + { + this.classNames = new ArrayList<String>(); + classNames.add(className); + } + + public TestRunner() + { + DeploymentProperties deploymentProperties = new DeploymentProperties(); + this.classNames = deploymentProperties.getPropertyValues("className"); + } + + public ITestContext 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 listener.getContext(); + } + + private XmlSuite createSuite() + { + XmlSuite suite = new XmlSuite(); + suite.setName("JSR-299 TCK"); + + for (String className : classNames) + { + XmlTest test = new XmlTest(suite); + test.setName("JSR-299 TCK " + className); + List<XmlClass> testClasses = Arrays.asList(new XmlClass(className)); + test.setXmlClasses(testClasses); + } + return suite; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestRunner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java (from rev 1459, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/InContainerTestRunner.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,55 @@ +package org.jboss.jsr299.tck.impl.runner; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + +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.ITestResult; + + +public class TestSuiteLauncher +{ + + private final Configuration configuration; + private final List<ITestResult> results; + + public TestSuiteLauncher(Configuration configuration) + { + this.configuration = configuration; + this.results = new ArrayList<ITestResult>(); + } + + public void run() throws Exception + { + List<ArtifactDescriptor> artifacts = new ArtifactGenerator(configuration).createArtifacts(); + System.out.println(artifacts); + for (ArtifactDescriptor artifact : artifacts) + { + deployArtifact(artifact); + results.addAll(configuration.getInContainerTestLauncher().launchTest(configuration, artifact.getDeclaringClass())); + } + } + + protected void deployArtifact(ArtifactDescriptor artifact) throws Exception + { + InputStream jar = artifact.getJar(); + configuration.getContainers().deploy(jar, artifact.getDefaultName()); + jar.close(); + try + { + Thread.sleep(configuration.getDeploymentDelay()); + } + catch (InterruptedException e) + { + Thread.interrupted(); + } + } + + public List<ITestResult> getResults() + { + return results; + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/TestSuiteLauncher.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet (from rev 1459, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/runner/servlet) Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java (from rev 1459, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ServletInContainerTestLauncher.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,51 @@ +package org.jboss.jsr299.tck.impl.runner.servlet; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.net.HttpURLConnection; +import java.net.URL; +import java.net.URLConnection; +import java.util.Collection; +import java.util.List; + +import org.jboss.jsr299.tck.api.Configuration; +import org.jboss.jsr299.tck.api.TestLauncher; +import org.testng.ITestResult; + +public class ServletTestLauncher implements TestLauncher +{ + + public Collection<ITestResult> 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)) + { + throw new IllegalStateException("Not an http connection! " + connection); + } + HttpURLConnection httpConnection = (HttpURLConnection) connection; + httpConnection.connect(); + if (httpConnection.getResponseCode() == HttpURLConnection.HTTP_OK) + { + Object o = new ObjectInputStream(httpConnection.getInputStream()).readObject(); + if (!(o instanceof List)) + { + throw new IllegalStateException("Error reading test results - expected a List<TestResult> but got " + o); + } + List<ITestResult> results = (List<ITestResult>) o; + return results; + } + else + { + throw new IllegalStateException("Error launching test " + httpConnection.getResponseMessage()); + } + } + + private Object deserialize(byte[] bytes) throws IOException, ClassNotFoundException + { + ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes)); + return in.readObject(); + } + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestLauncher.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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/runner/servlet/ServletTestRunner.java 2009-02-08 18:42:35 UTC (rev 1459) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.runner.servlet; +package org.jboss.jsr299.tck.impl.runner.servlet; import java.io.IOException; import java.io.ObjectOutputStream; @@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse; import org.jboss.jsr299.tck.impl.ConfigurationImpl; -import org.jboss.jsr299.tck.runner.TestRunner; +import org.jboss.jsr299.tck.impl.runner.TestRunner; import org.testng.ITestContext; import org.testng.ITestResult; Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/runner/BufferedListener.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/runner/BufferedListener.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/runner/BufferedListener.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,57 +0,0 @@ -package org.jboss.jsr299.tck.runner; - -import org.testng.ITestContext; -import org.testng.ITestListener; -import org.testng.ITestResult; - -public class BufferedListener implements ITestListener -{ - - private ITestContext context; - - - public BufferedListener() - { - } - - public void onFinish(ITestContext context) - { - this.context = context; - } - - public void onStart(ITestContext context) - { - // No-op - } - - public void onTestFailedButWithinSuccessPercentage(ITestResult result) - { - // No-op - } - - public void onTestFailure(ITestResult result) - { - // No-op - } - - public void onTestSkipped(ITestResult result) - { - // No-op - } - - public void onTestStart(ITestResult result) - { - // No-op - } - - public void onTestSuccess(ITestResult result) - { - // No-op - } - - public ITestContext getContext() - { - return context; - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/runner/TestRunner.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/runner/TestRunner.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/runner/TestRunner.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,59 +0,0 @@ -package org.jboss.jsr299.tck.runner; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.jboss.jsr299.tck.impl.util.DeploymentProperties; -import org.testng.ITestContext; -import org.testng.TestNG; -import org.testng.xml.XmlClass; -import org.testng.xml.XmlSuite; -import org.testng.xml.XmlTest; - -public class TestRunner -{ - - private List<String> classNames; - - public TestRunner(String className) - { - this.classNames = new ArrayList<String>(); - classNames.add(className); - } - - public TestRunner() - { - DeploymentProperties deploymentProperties = new DeploymentProperties(); - this.classNames = deploymentProperties.getPropertyValues("className"); - } - - public ITestContext 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 listener.getContext(); - } - - private XmlSuite createSuite() - { - XmlSuite suite = new XmlSuite(); - suite.setName("JSR-299 TCK"); - - for (String className : classNames) - { - XmlTest test = new XmlTest(suite); - test.setName("JSR-299 TCK " + className); - List<XmlClass> testClasses = Arrays.asList(new XmlClass(className)); - test.setXmlClasses(testClasses); - } - return suite; - } - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -68,8 +68,8 @@ Set<Bean<Fox>> foxBeans = manager.resolveByType(Fox.class); assert foxBeans.size() == 1; - Fox fox1 = ConfigurationImpl.get().getEL().evaluateValueExpression("#{fox}", Fox.class); - Fox fox2 = ConfigurationImpl.get().getEL().evaluateValueExpression("#{fox}", Fox.class); + Fox fox1 = ConfigurationImpl.get().getEl().evaluateValueExpression("#{fox}", Fox.class); + Fox fox2 = ConfigurationImpl.get().getEl().evaluateValueExpression("#{fox}", Fox.class); assert !fox1.equals(fox2); } }.run(); @@ -306,7 +306,7 @@ @Override protected void execute() throws Exception { - String foxName = ConfigurationImpl.get().getEL().evaluateMethodExpression("#{sensitiveFox.getName}", String.class, new Class[0], new Object[0]); + String foxName = ConfigurationImpl.get().getEl().evaluateMethodExpression("#{sensitiveFox.getName}", String.class, new Class[0], new Object[0]); assert foxName != null; assert SensitiveFox.isDependentContextActiveDuringEval(); } @@ -429,7 +429,7 @@ assert foxBeans.size() == 1; Bean<Fox> foxBean = foxBeans.iterator().next(); - Fox fox1 = ConfigurationImpl.get().getEL().evaluateValueExpression("#{fox}", Fox.class); + Fox fox1 = ConfigurationImpl.get().getEl().evaluateValueExpression("#{fox}", Fox.class); assert fox1 != null; assert manager.getContext(Dependent.class).get(foxBean) == null; } Added: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/mock/MockConfiguration.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/mock/MockConfiguration.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/mock/MockConfiguration.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.test.impl.mock; + +import org.jboss.jsr299.tck.impl.ConfigurationImpl; + +public class MockConfiguration extends ConfigurationImpl +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/mock/MockConfiguration.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/ArtifactTest.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/ArtifactTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,44 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging; - -import java.io.File; -import java.io.FileInputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.jar.JarEntry; -import java.util.jar.JarInputStream; - -import org.jboss.jsr299.tck.impl.packaging.ArtifactDescriptor; -import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor; -import org.testng.annotations.Test; - -public class ArtifactTest extends AbstractArtifactTest -{ - - @Test - public void testDefaultTCKArtifact() throws Exception - { - ArtifactDescriptor artifactDescriptor = new WarArtifactDescriptor(DummyTest.class, null); - File root = artifactDescriptor.getExplodedJar(); - File tckSupportJar = new File(root, "WEB-INF/lib/tck-support.jar"); - assert tckSupportJar.exists(); - assert tckSupportJar.isFile(); - JarInputStream is = new JarInputStream(new FileInputStream(tckSupportJar)); - JarEntry entry; - List<String> fileNames = new ArrayList<String>(); - while ((entry = is.getNextJarEntry()) != null) - { - fileNames.add(entry.getName()); - } - assert fileNames.contains("org/jboss/jsr299/tck/impl/util/Reflections.class"); - assert fileNames.contains("org/jboss/jsr299/tck/literals/NewLiteral.class"); - assert fileNames.contains("org/jboss/jsr299/tck/AbstractTest.class"); - assert fileNames.contains("org/jboss/jsr299/tck/impl/WebBeansTCKImpl.class"); - assert fileNames.contains("org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.class"); - assert fileNames.contains("org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.class"); - assert fileNames.contains("org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.class"); - assert fileNames.contains("org/jboss/jsr299/tck/runner/TestRunner.class"); - assert fileNames.contains("org/jboss/jsr299/tck/runner/servlet/ServletTestRunner.class"); - } - - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/Cow.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/Cow.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging; - -class Cow -{ - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/DummyTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/DummyTest.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/DummyTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging; - -public class DummyTest -{ - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/artifactScanner/ArtifactScannerTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/artifactScanner/ArtifactScannerTest.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/artifactScanner/ArtifactScannerTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,24 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.artifactScanner; - -import java.util.Set; - -import org.jboss.jsr299.tck.impl.packaging.ArtifactScanner; -import org.jboss.jsr299.tck.test.impl.packaging.artifactScanner.subpackage.AnotherDummyArtifact; -import org.jboss.jsr299.tck.test.impl.packaging.artifactScanner.subpackage.NotAnArtifact; -import org.testng.annotations.Test; - -public class ArtifactScannerTest -{ - - @Test - public void testScanner() - { - ArtifactScanner scanner = new ArtifactScanner(ArtifactScannerTest.class.getPackage().getName()); - Set<Class<?>> classes = scanner.getClasses(); - assert classes.contains(DummyArtifact.class); - assert classes.contains(AnotherDummyArtifact.class); - assert !classes.contains(NotAnArtifact.class); - } - - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/artifactScanner/DummyArtifact.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/artifactScanner/DummyArtifact.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/artifactScanner/DummyArtifact.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.artifactScanner; - -import org.jboss.jsr299.tck.impl.packaging.Artifact; - -@Artifact -public class DummyArtifact -{ - -} Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Cow.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/Cow.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Cow.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Cow.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; + +class Cow +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Cow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,142 @@ +package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.jsr299.tck.impl.packaging.DeclarativeArtifactProcessor; +import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; +import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest; +import org.testng.annotations.Test; + +public class DeclarativeStandaloneTest extends AbstractArtifactTest +{ + + @Test + public void testDefaultDeclartiveArtifact() throws Exception + { + DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyTest.class, true, null); + TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact(); + assert !artifact.isEjbs(); + assert artifact.isUnit(); + File root = artifact.getExplodedJar(); + File currentPackage = getCurrentPackageAsFile(root); + File[] cowClasses = currentPackage.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.equals("Cow.class"); + } + + }); + assert cowClasses.length == 1; + assert cowClasses[0].getName().equals("Cow.class"); + assert cowClasses[0].isFile(); + File[] foxClasses = currentPackage.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.equals("Fox.class"); + } + + }); + assert foxClasses.length == 1; + assert foxClasses[0].getName().equals("Fox.class"); + assert foxClasses[0].isFile(); + + File[] testClasses = currentPackage.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.startsWith("DummyTest"); + } + + }); + assert testClasses.length == 1; + + assert root.listFiles(META_INF_FILTER).length == 1; + File metaInf = root.listFiles(META_INF_FILTER)[0]; + assert metaInf.listFiles().length == 2; + assert metaInf.listFiles(BEANS_XML_FILTER).length == 1; + assert metaInf.listFiles(BEANS_XML_FILTER)[0].length() == 0; + } + + @Test + public void testClassesSpecifiedArtifact() throws Exception + { + DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyClassesSpecifiedTest.class, true, null); + TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact(); + File root = artifact.getExplodedJar(); + File currentPackage = getCurrentPackageAsFile(root); + assert currentPackage.listFiles().length == 1; + File[] subPackages = currentPackage.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.startsWith("subpackage"); + } + + }); + assert subPackages.length == 1; + File subPackage = subPackages[0]; + assert subPackage.listFiles().length == 1; + assert subPackage.listFiles()[0].getName().equals("Rat.class"); + } + + @Test + public void testResourcesSpecifiedArtifact() throws Exception + { + DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyResourcesSpecifiedTest.class, false, null); + TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact(); + 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() + { + + public boolean accept(File dir, String name) + { + return name.equals("bar.xml"); + } + + }).length == 1; + } + + @Test + public void testIntegrationTestDeclartiveArtifact() throws Exception + { + DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyIntegrationTest.class, false, null); + assert !declarativeArtifactProcessor.getArtifact().isUnit(); + } + + @Test + public void testCustomBeansXml() throws Exception + { + DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyCustomBeansXmlTest.class, false, null); + TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact(); + 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]); + assert beans.startsWith("<my></my>"); + } + + //@Test + public void testEjbTestDeclartiveArtifact() throws Exception + { + DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyEjbTest.class, false, null); + assert declarativeArtifactProcessor.getArtifact().isEjbs(); + } + + @Test(expectedExceptions=IllegalArgumentException.class) + public void testWrongPackaging() + { + DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyWarUnitTest_Broken.class, false, null); + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DeclarativeStandaloneTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyClassesSpecifiedTest.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyClassesSpecifiedTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyClassesSpecifiedTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; + +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.Classes; +import org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone.subpackage.Rat; + + +@Artifact(addCurrentPackage=false) +(a)Classes(Rat.class) +class DummyClassesSpecifiedTest +{ + + public void test() + { + assert true; + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyClassesSpecifiedTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyCustomBeansXmlTest.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyCustomBeansXmlTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyCustomBeansXmlTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; + +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; + + +@Artifact @BeansXml(value="my-web-beans.xml") +class DummyCustomBeansXmlTest +{ + + public void test() + { + assert true; + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyCustomBeansXmlTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyEjbTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; + +import org.jboss.jsr299.tck.impl.packaging.EjbArtifact; + + +@EjbArtifact +class DummyEjbTest +{ + + public void test() + { + assert true; + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyEjbTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyIntegrationTest.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyIntegrationTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyIntegrationTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; + +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; + + +@Artifact +@IntegrationTest +class DummyIntegrationTest +{ + + public void test() + { + assert true; + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyIntegrationTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyResourcesSpecifiedTest.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyResourcesSpecifiedTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyResourcesSpecifiedTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; + +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.Resource; +import org.jboss.jsr299.tck.impl.packaging.Resources; + + +@Artifact(addCurrentPackage=false) +@Resources(value=@Resource(destination = "/META-INF/bar.xml", source="foo/foo.xml")) +class DummyResourcesSpecifiedTest +{ + + public void test() + { + assert true; + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyResourcesSpecifiedTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyTest.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; + +import org.jboss.jsr299.tck.impl.packaging.Artifact; + + +@Artifact +class DummyTest +{ + + public void test() + { + assert true; + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest_Broken.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest_Broken.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest_Broken.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; + +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.Packaging; +import org.jboss.jsr299.tck.impl.packaging.PackagingType; + + +@Artifact +(a)Packaging(PackagingType.WAR) +class DummyWarUnitTest_Broken +{ + + public void test() + { + assert true; + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/DummyWarUnitTest_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Fox.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/Fox.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Fox.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Fox.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone; + +class Fox +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/Fox.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/subpackage (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/pests) Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/subpackage/Rat.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/Rat.java 2009-02-08 18:42:35 UTC (rev 1459) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/subpackage/Rat.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarativeArtifact.unspecified.pests; +package org.jboss.jsr299.tck.test.impl.packaging.declarative.standalone.subpackage; public class Rat { Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/war) Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java 2009-02-08 18:42:35 UTC (rev 1459) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/ArtifactTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,30 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarativeArtifact.war; - -import java.io.File; - -import org.jboss.jsr299.tck.impl.packaging.DeclarativeArtifactProcessor; -import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; -import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest; -import org.testng.annotations.Test; - -public class ArtifactTest extends AbstractArtifactTest -{ - - @Test - public void testDefaultWebXml() throws Exception - { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyTest.class, false, null); - TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact(); - File root = artifact.getExplodedJar(); - assert root.listFiles(WEB_INF_FILTER).length == 1; - File webInf = root.listFiles(WEB_INF_FILTER)[0]; - assert webInf.getName().equals("WEB-INF"); - assert webInf.isDirectory(); - assert webInf.listFiles(WEB_XML_FILTER).length == 1; - File webXml = webInf.listFiles(WEB_XML_FILTER)[0]; - assert webXml.isFile(); - assert webXml.getName().equals("web.xml"); - assert webXml.length() != 0; - } - -} Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/war/Cow.java 2009-02-08 18:42:35 UTC (rev 1459) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/Cow.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarativeArtifact.war; +package org.jboss.jsr299.tck.test.impl.packaging.declarative.war; class Cow { Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DeclarativeWarTest.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DeclarativeWarTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DeclarativeWarTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,30 @@ +package org.jboss.jsr299.tck.test.impl.packaging.declarative.war; + +import java.io.File; + +import org.jboss.jsr299.tck.impl.packaging.DeclarativeArtifactProcessor; +import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; +import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest; +import org.testng.annotations.Test; + +public class DeclarativeWarTest extends AbstractArtifactTest +{ + + @Test + public void testDefaultWebXml() throws Exception + { + DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyTest.class, false, null); + TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact(); + File root = artifact.getExplodedJar(); + assert root.listFiles(WEB_INF_FILTER).length == 1; + File webInf = root.listFiles(WEB_INF_FILTER)[0]; + assert webInf.getName().equals("WEB-INF"); + assert webInf.isDirectory(); + assert webInf.listFiles(WEB_XML_FILTER).length == 1; + File webXml = webInf.listFiles(WEB_XML_FILTER)[0]; + assert webXml.isFile(); + assert webXml.getName().equals("web.xml"); + assert webXml.length() != 0; + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DeclarativeWarTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DummyTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/war/DummyTest.java 2009-02-08 18:42:35 UTC (rev 1459) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/DummyTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarativeArtifact.war; +package org.jboss.jsr299.tck.test.impl.packaging.declarative.war; import org.jboss.jsr299.tck.impl.packaging.Artifact; import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/Fox.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/war/Fox.java 2009-02-08 18:42:35 UTC (rev 1459) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarative/war/Fox.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarativeArtifact.war; +package org.jboss.jsr299.tck.test.impl.packaging.declarative.war; class Fox { Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,142 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarativeArtifact.unspecified; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.jsr299.tck.impl.packaging.DeclarativeArtifactProcessor; -import org.jboss.jsr299.tck.impl.packaging.jsr299.TCKArtifactDescriptor; -import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest; -import org.testng.annotations.Test; - -public class ArtifactTest extends AbstractArtifactTest -{ - - @Test - public void testDefaultDeclartiveArtifact() throws Exception - { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyTest.class, true, null); - TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact(); - assert !artifact.isEjbs(); - assert artifact.isUnit(); - File root = artifact.getExplodedJar(); - File currentPackage = getCurrentPackageAsFile(root); - File[] cowClasses = currentPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("Cow.class"); - } - - }); - assert cowClasses.length == 1; - assert cowClasses[0].getName().equals("Cow.class"); - assert cowClasses[0].isFile(); - File[] foxClasses = currentPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("Fox.class"); - } - - }); - assert foxClasses.length == 1; - assert foxClasses[0].getName().equals("Fox.class"); - assert foxClasses[0].isFile(); - - File[] testClasses = currentPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.startsWith("DummyTest"); - } - - }); - assert testClasses.length == 1; - - assert root.listFiles(META_INF_FILTER).length == 1; - File metaInf = root.listFiles(META_INF_FILTER)[0]; - assert metaInf.listFiles().length == 2; - assert metaInf.listFiles(BEANS_XML_FILTER).length == 1; - assert metaInf.listFiles(BEANS_XML_FILTER)[0].length() == 0; - } - - @Test - public void testClassesSpecifiedArtifact() throws Exception - { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyClassesSpecifiedTest.class, true, null); - TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact(); - File root = artifact.getExplodedJar(); - File currentPackage = getCurrentPackageAsFile(root); - assert currentPackage.listFiles().length == 1; - File[] pestPackages = currentPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.startsWith("pests"); - } - - }); - assert pestPackages.length == 1; - File pestPackage = pestPackages[0]; - assert pestPackage.listFiles().length == 1; - assert pestPackage.listFiles()[0].getName().equals("Rat.class"); - } - - @Test - public void testResourcesSpecifiedArtifact() throws Exception - { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyResourcesSpecifiedTest.class, false, null); - TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact(); - 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() - { - - public boolean accept(File dir, String name) - { - return name.equals("bar.xml"); - } - - }).length == 1; - } - - @Test - public void testIntegrationTestDeclartiveArtifact() throws Exception - { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyIntegrationTest.class, false, null); - assert !declarativeArtifactProcessor.getArtifact().isUnit(); - } - - @Test - public void testCustomBeansXml() throws Exception - { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyCustomBeansXmlTest.class, false, null); - TCKArtifactDescriptor artifact = declarativeArtifactProcessor.getArtifact(); - 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]); - assert beans.startsWith("<my></my>"); - } - - //@Test - public void testEjbTestDeclartiveArtifact() throws Exception - { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyEjbTest.class, false, null); - assert declarativeArtifactProcessor.getArtifact().isEjbs(); - } - - @Test(expectedExceptions=IllegalArgumentException.class) - public void testWrongPackaging() - { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyWarUnitTest_Broken.class, false, null); - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/Cow.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/Cow.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarativeArtifact.unspecified; - -class Cow -{ - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarativeArtifact.unspecified; - -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Classes; -import org.jboss.jsr299.tck.test.impl.packaging.declarativeArtifact.unspecified.pests.Rat; - - -@Artifact(addCurrentPackage=false) -(a)Classes(Rat.class) -class DummyClassesSpecifiedTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarativeArtifact.unspecified; - -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; - - -@Artifact @BeansXml(value="my-web-beans.xml") -class DummyCustomBeansXmlTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyEjbTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyEjbTest.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyEjbTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarativeArtifact.unspecified; - -import org.jboss.jsr299.tck.impl.packaging.EjbArtifact; - - -@EjbArtifact -class DummyEjbTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,17 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarativeArtifact.unspecified; - -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.IntegrationTest; - - -@Artifact -@IntegrationTest -class DummyIntegrationTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarativeArtifact.unspecified; - -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Resource; -import org.jboss.jsr299.tck.impl.packaging.Resources; - - -@Artifact(addCurrentPackage=false) -@Resources(value=@Resource(destination = "/META-INF/bar.xml", source="foo/foo.xml")) -class DummyResourcesSpecifiedTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyTest.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarativeArtifact.unspecified; - -import org.jboss.jsr299.tck.impl.packaging.Artifact; - - -@Artifact -class DummyTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,18 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarativeArtifact.unspecified; - -import org.jboss.jsr299.tck.impl.packaging.Artifact; -import org.jboss.jsr299.tck.impl.packaging.Packaging; -import org.jboss.jsr299.tck.impl.packaging.PackagingType; - - -@Artifact -(a)Packaging(PackagingType.WAR) -class DummyWarUnitTest_Broken -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/Fox.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/Fox.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/Fox.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.declarativeArtifact.unspecified; - -class Fox -{ - -} Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/packages (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/all) Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/packages/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/all/ArtifactTest.java 2009-02-08 18:42:35 UTC (rev 1459) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/packages/ArtifactTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.test.impl.packaging.all; +package org.jboss.jsr299.tck.test.impl.packaging.descriptors.packages; import java.io.File; import java.io.FilenameFilter; Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/packages/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/all/Cow.java 2009-02-08 18:42:35 UTC (rev 1459) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/packages/Cow.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.test.impl.packaging.all; +package org.jboss.jsr299.tck.test.impl.packaging.descriptors.packages; class Cow { Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/packages/Fox.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/all/Fox.java 2009-02-08 18:42:35 UTC (rev 1459) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/packages/Fox.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.test.impl.packaging.all; +package org.jboss.jsr299.tck.test.impl.packaging.descriptors.packages; class Fox { Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/Cow.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/subpackages/Cow.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/Cow.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/Cow.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.test.impl.packaging.descriptors.subpackages; + +class Cow +{ + +} Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/SubpackagesArtifactTest.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/subpackages/ArtifactTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/SubpackagesArtifactTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/SubpackagesArtifactTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,46 @@ +package org.jboss.jsr299.tck.test.impl.packaging.descriptors.subpackages; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.jsr299.tck.impl.packaging.ArtifactDescriptor; +import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest; +import org.testng.annotations.Test; + +public class SubpackagesArtifactTest extends AbstractArtifactTest +{ + + @Test + public void testAllClassesInPackageAndNotSubPackages() throws Exception + { + ArtifactDescriptor artifactDescriptor = new ArtifactDescriptor(null); + artifactDescriptor.addPackage(SubpackagesArtifactTest.class.getPackage()); + File root = artifactDescriptor.getExplodedJar(); + File currentPackage = getCurrentPackageAsFile(root); + assert currentPackage.listFiles().length == 4; + File[] cowClasses = currentPackage.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.equals("Cow.class"); + } + + }); + assert cowClasses.length == 1; + assert cowClasses[0].getName().equals("Cow.class"); + assert cowClasses[0].isFile(); + + File[] testClasses = currentPackage.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.startsWith("SubpackagesArtifactTest"); + } + + }); + assert testClasses.length == 3; + } + +} Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/subpackge (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/subpackages/pests) Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/subpackge/Fox.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/subpackages/pests/Fox.java 2009-02-08 18:42:35 UTC (rev 1459) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/subpackages/subpackge/Fox.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.test.impl.packaging.subpackages.pests; +package org.jboss.jsr299.tck.test.impl.packaging.descriptors.subpackages.subpackge; class Fox { Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/Cow.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/Cow.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/Cow.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/Cow.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.test.impl.packaging.descriptors.tck; + +class Cow +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/Cow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/DummyTest.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/DummyTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/DummyTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/DummyTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.test.impl.packaging.descriptors.tck; + +public class DummyTest +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/DummyTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/TCKArtifactTest.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/ArtifactTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/TCKArtifactTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/TCKArtifactTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,46 @@ +package org.jboss.jsr299.tck.test.impl.packaging.descriptors.tck; + +import java.io.File; +import java.io.FileInputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.jar.JarEntry; +import java.util.jar.JarInputStream; + +import org.jboss.jsr299.tck.impl.packaging.ArtifactDescriptor; +import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest; +import org.testng.annotations.Test; + +public class TCKArtifactTest extends AbstractArtifactTest +{ + + @Test + public void testTCKSupportJar() throws Exception + { + System.out.println("test"); + ArtifactDescriptor artifactDescriptor = new WarArtifactDescriptor(DummyTest.class, null); + File root = artifactDescriptor.getExplodedJar(); + File tckSupportJar = new File(root, "WEB-INF/lib/tck-support.jar"); + assert tckSupportJar.exists(); + assert tckSupportJar.isFile(); + assert tckSupportJar.length() > 0; + JarInputStream is = new JarInputStream(new FileInputStream(tckSupportJar)); + JarEntry entry; + List<String> fileNames = new ArrayList<String>(); + while ((entry = is.getNextJarEntry()) != null) + { + fileNames.add(entry.getName()); + } + assert fileNames.contains("org/jboss/jsr299/tck/impl/util/Reflections.class"); + assert fileNames.contains("org/jboss/jsr299/tck/literals/NewLiteral.class"); + assert fileNames.contains("org/jboss/jsr299/tck/AbstractTest.class"); + assert fileNames.contains("org/jboss/jsr299/tck/impl/TCKImpl.class"); + assert fileNames.contains("org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.class"); + assert fileNames.contains("org/jboss/jsr299/tck/impl/packaging/jsr299/TCKArtifactDescriptor.class"); + assert fileNames.contains("org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.class"); + assert fileNames.contains("org/jboss/jsr299/tck/impl/runner/TestRunner.class"); + assert fileNames.contains("org/jboss/jsr299/tck/impl/runner/servlet/ServletTestRunner.class"); + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/tck/TCKArtifactTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/war) Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/war/ArtifactTest.java 2009-02-08 18:42:35 UTC (rev 1459) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/ArtifactTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,100 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.war; - -import java.io.File; -import java.io.FilenameFilter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.jar.JarEntry; -import java.util.jar.JarInputStream; - -import org.jboss.jsr299.tck.AbstractTest; -import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor; -import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest; -import org.testng.annotations.Test; - -public class ArtifactTest extends AbstractArtifactTest -{ - @Test - public void testDefaultWar() throws Exception - { - WarArtifactDescriptor war = new WarArtifactDescriptor(DummyTest.class, null); - war.getClasses().add(Cow.class); - File root = war.getExplodedJar(); - assert root.listFiles().length == 1; - assert root.isDirectory(); - assert root.listFiles(WEB_INF_FILTER).length == 1; - File webInf = root.listFiles(WEB_INF_FILTER)[0]; - assert webInf.getName().equals("WEB-INF"); - assert webInf.isDirectory(); - assert webInf.listFiles().length == 4; - assert webInf.listFiles(WEB_XML_FILTER).length == 1; - File webXml = webInf.listFiles(WEB_XML_FILTER)[0]; - assert webXml.isFile(); - assert webXml.getName().equals("web.xml"); - assert webXml.length() != 0; - File beansXml = webInf.listFiles(BEANS_XML_FILTER)[0]; - assert beansXml.isFile(); - assert beansXml.getName().equals("web-beans.xml"); - assert beansXml.length() == 0; - File currentPackage = getCurrentPackageAsFile(root); - File[] cowClasses = currentPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("Cow.class"); - } - - }); - assert cowClasses.length == 1; - assert cowClasses[0].getName().equals("Cow.class"); - assert cowClasses[0].isFile(); - File tckPackage = getPackageAsFile(AbstractTest.class.getPackage(), root); - File[] abstractTestClasses = tckPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("AbstractTest.class"); - } - - }); - File webInfLib = new File(webInf, "lib"); - assert webInfLib.isDirectory(); - assert webInfLib.list().length == 3; - List<String> libs = Arrays.asList(webInfLib.list()); - assert libs.contains("jsr-299-tck-api.jar"); - assert libs.contains("testng.jar"); - assert libs.contains("tck-support.jar"); - } - - - @Test - public void testJarProduction() throws Exception - { - WarArtifactDescriptor war = new WarArtifactDescriptor(DummyTest.class, null); - war.getClasses().add(Cow.class); - JarInputStream is = new JarInputStream(war.getJar()); - JarEntry entry; - List<String> fileNames = new ArrayList<String>(); - while ((entry = is.getNextJarEntry()) != null) - { - fileNames.add(entry.getName()); - } - assert fileNames.contains("WEB-INF/web-beans.xml"); - assert fileNames.contains("WEB-INF/web.xml"); - assert fileNames.contains("WEB-INF/classes/org/jboss/jsr299/tck/test/impl/packaging/war/Cow.class"); - assert fileNames.contains("WEB-INF/lib/tck-support.jar"); - } - - @Override - protected File getPackageAsFile(Package pkg, File root) - { - root = root.listFiles(WEB_INF_FILTER)[0]; - root = root.listFiles(CLASSES_FILTER)[0]; - return super.getPackageAsFile(pkg, root); - } - -} - Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/war/Cow.java 2009-02-08 18:42:35 UTC (rev 1459) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/Cow.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.test.impl.packaging.war; +package org.jboss.jsr299.tck.test.impl.packaging.descriptors.war; class Cow { Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/DummyTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/war/DummyTest.java 2009-02-08 18:42:35 UTC (rev 1459) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/DummyTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.test.impl.packaging.war; +package org.jboss.jsr299.tck.test.impl.packaging.descriptors.war; public class DummyTest { Added: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,101 @@ +package org.jboss.jsr299.tck.test.impl.packaging.descriptors.war; + +import java.io.File; +import java.io.FilenameFilter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.jar.JarEntry; +import java.util.jar.JarInputStream; + +import org.jboss.jsr299.tck.AbstractTest; +import org.jboss.jsr299.tck.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest; +import org.testng.annotations.Test; + +public class WarArtifactTest extends AbstractArtifactTest +{ + @Test + public void testDefaultWar() throws Exception + { + WarArtifactDescriptor war = new WarArtifactDescriptor(DummyTest.class, null); + war.getClasses().add(Cow.class); + File root = war.getExplodedJar(); + assert root.listFiles().length == 1; + assert root.isDirectory(); + assert root.listFiles(WEB_INF_FILTER).length == 1; + File webInf = root.listFiles(WEB_INF_FILTER)[0]; + assert webInf.getName().equals("WEB-INF"); + assert webInf.isDirectory(); + assert webInf.listFiles().length == 4; + assert webInf.listFiles(WEB_XML_FILTER).length == 1; + File webXml = webInf.listFiles(WEB_XML_FILTER)[0]; + assert webXml.isFile(); + assert webXml.getName().equals("web.xml"); + assert webXml.length() != 0; + File beansXml = webInf.listFiles(BEANS_XML_FILTER)[0]; + assert beansXml.isFile(); + assert beansXml.getName().equals("web-beans.xml"); + assert beansXml.length() == 0; + File currentPackage = getCurrentPackageAsFile(root); + File[] cowClasses = currentPackage.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.equals("Cow.class"); + } + + }); + assert cowClasses.length == 1; + assert cowClasses[0].getName().equals("Cow.class"); + assert cowClasses[0].isFile(); + File tckPackage = getPackageAsFile(AbstractTest.class.getPackage(), root); + File[] abstractTestClasses = tckPackage.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.equals("AbstractTest.class"); + } + + }); + File webInfLib = new File(webInf, "lib"); + assert webInfLib.isDirectory(); + assert webInfLib.list().length == 3; + List<String> libs = Arrays.asList(webInfLib.list()); + assert libs.contains("jsr-299-tck-api.jar"); + assert libs.contains("testng.jar"); + assert libs.contains("tck-support.jar"); + } + + + @Test + public void testJarProduction() throws Exception + { + WarArtifactDescriptor war = new WarArtifactDescriptor(DummyTest.class, null); + war.getClasses().add(Cow.class); + JarInputStream is = new JarInputStream(war.getJar()); + JarEntry entry; + List<String> fileNames = new ArrayList<String>(); + while ((entry = is.getNextJarEntry()) != null) + { + fileNames.add(entry.getName()); + } + is.close(); + assert fileNames.contains("WEB-INF/web-beans.xml"); + assert fileNames.contains("WEB-INF/web.xml"); + assert fileNames.contains("WEB-INF/classes/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/Cow.class"); + assert fileNames.contains("WEB-INF/lib/tck-support.jar"); + } + + @Override + protected File getPackageAsFile(Package pkg, File root) + { + root = root.listFiles(WEB_INF_FILTER)[0]; + root = root.listFiles(CLASSES_FILTER)[0]; + return super.getPackageAsFile(pkg, root); + } + +} + Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/descriptors/war/WarArtifactTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/ArtifactScannerTest.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/artifactScanner/ArtifactScannerTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/ArtifactScannerTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/ArtifactScannerTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,46 @@ +package org.jboss.jsr299.tck.test.impl.packaging.scanner; + +import java.util.Arrays; +import java.util.List; +import java.util.Set; + +import org.jboss.jsr299.tck.api.Configuration; +import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator; +import org.jboss.jsr299.tck.impl.packaging.ArtifactScanner; +import org.jboss.jsr299.tck.test.impl.mock.MockConfiguration; +import org.jboss.jsr299.tck.test.impl.packaging.scanner.subpackage.AnotherDummyArtifact; +import org.jboss.jsr299.tck.test.impl.packaging.scanner.subpackage.NotAnArtifact; +import org.testng.annotations.Test; + +public class ArtifactScannerTest +{ + + @Test + public void testScanner() + { + ArtifactScanner scanner = new ArtifactScanner(ArtifactScannerTest.class.getPackage().getName()); + Set<Class<?>> classes = scanner.getClasses(); + assert classes.contains(DummyArtifact.class); + assert classes.contains(AnotherDummyArtifact.class); + assert !classes.contains(NotAnArtifact.class); + } + + @Test + public void testArtifactGenerator() throws Exception + { + Configuration configuration = new MockConfiguration() + { + + @Override + public List<String> getInContainerTestPackageNames() + { + return Arrays.asList("org.jboss.seam.packaging.scanner"); + } + + }; + ArtifactGenerator generator = new ArtifactGenerator(configuration); + } + + + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/ArtifactScannerTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/DummyArtifact.java (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/artifactScanner/DummyArtifact.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/DummyArtifact.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/DummyArtifact.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.test.impl.packaging.scanner; + +import org.jboss.jsr299.tck.impl.packaging.Artifact; + +@Artifact +public class DummyArtifact +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/DummyArtifact.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/subpackage (from rev 1459, tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/artifactScanner/subpackage) Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/subpackage/AnotherDummyArtifact.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java 2009-02-08 18:42:35 UTC (rev 1459) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/subpackage/AnotherDummyArtifact.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.test.impl.packaging.artifactScanner.subpackage; +package org.jboss.jsr299.tck.test.impl.packaging.scanner.subpackage; import org.jboss.jsr299.tck.impl.packaging.Artifact; Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/subpackage/NotAnArtifact.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/artifactScanner/subpackage/NotAnArtifact.java 2009-02-08 18:42:35 UTC (rev 1459) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/subpackage/NotAnArtifact.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.test.impl.packaging.artifactScanner.subpackage; +package org.jboss.jsr299.tck.test.impl.packaging.scanner.subpackage; public class NotAnArtifact { Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/subpackages/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/subpackages/ArtifactTest.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/subpackages/ArtifactTest.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,46 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.subpackages; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.jsr299.tck.impl.packaging.ArtifactDescriptor; -import org.jboss.jsr299.tck.test.impl.packaging.AbstractArtifactTest; -import org.testng.annotations.Test; - -public class ArtifactTest extends AbstractArtifactTest -{ - - @Test - public void testAllClassesInPackageAndNotSubPackages() throws Exception - { - ArtifactDescriptor artifactDescriptor = new ArtifactDescriptor(null); - artifactDescriptor.addPackage(ArtifactTest.class.getPackage()); - File root = artifactDescriptor.getExplodedJar(); - File currentPackage = getCurrentPackageAsFile(root); - assert currentPackage.listFiles().length == 4; - File[] cowClasses = currentPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("Cow.class"); - } - - }); - assert cowClasses.length == 1; - assert cowClasses[0].getName().equals("Cow.class"); - assert cowClasses[0].isFile(); - - File[] testClasses = currentPackage.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.startsWith("ArtifactTest"); - } - - }); - assert testClasses.length == 3; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/subpackages/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/subpackages/Cow.java 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/subpackages/Cow.java 2009-02-08 22:44:55 UTC (rev 1462) @@ -1,6 +0,0 @@ -package org.jboss.jsr299.tck.test.impl.packaging.subpackages; - -class Cow -{ - -} Copied: tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/foo (from rev 1459, tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/foo) Copied: tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/my-web-beans.xml (from rev 1459, tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/my-web-beans.xml) =================================================================== --- tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/my-web-beans.xml (rev 0) +++ tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/my-web-beans.xml 2009-02-08 22:44:55 UTC (rev 1462) @@ -0,0 +1 @@ +<my></my> \ No newline at end of file Property changes on: tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/standalone/my-web-beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarative/war (from rev 1459, tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/war) Deleted: tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/my-web-beans.xml =================================================================== --- tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/my-web-beans.xml 2009-02-08 18:51:29 UTC (rev 1461) +++ tck/trunk/impl/src/test/resources/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/my-web-beans.xml 2009-02-08 22:44:55 UTC (rev 1462) @@ -1 +0,0 @@ -<my></my> \ No newline at end of file