[webbeans-commits] Webbeans SVN: r1463 - in tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging: declarativeArtifact and 1 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-08 17:52:28 -0500 (Sun, 08 Feb 2009)
New Revision: 1463
Removed:
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/artifactScanner/
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/declarativeArtifact/unspecified/
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/subpackages/
Modified:
tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/ArtifactScannerTest.java
Log:
artifactscanner tests
Modified: 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/ArtifactScannerTest.java 2009-02-08 22:44:55 UTC (rev 1462)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/ArtifactScannerTest.java 2009-02-08 22:52:28 UTC (rev 1463)
@@ -5,6 +5,7 @@
import java.util.Set;
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.jboss.jsr299.tck.impl.packaging.ArtifactScanner;
import org.jboss.jsr299.tck.test.impl.mock.MockConfiguration;
@@ -34,11 +35,30 @@
@Override
public List<String> getInContainerTestPackageNames()
{
- return Arrays.asList("org.jboss.seam.packaging.scanner");
+ return Arrays.asList("org.jboss.jsr299.tck.test.impl.packaging.scanner");
}
};
ArtifactGenerator generator = new ArtifactGenerator(configuration);
+ List<ArtifactDescriptor> artifacts = generator.createArtifacts();
+ assert artifacts.size() == 2;
+ for (ArtifactDescriptor artifact : artifacts)
+ {
+ if (artifact.getDeclaringClass().equals(DummyArtifact.class))
+ {
+ assert artifact.getClasses().contains(ArtifactScannerTest.class);
+ assert artifact.getClasses().contains(DummyArtifact.class);
+ assert !artifact.getClasses().contains(AnotherDummyArtifact.class);
+ assert !artifact.getClasses().contains(NotAnArtifact.class);
+ }
+ if (artifact.getDeclaringClass().equals(AnotherDummyArtifact.class))
+ {
+ assert !artifact.getClasses().contains(ArtifactScannerTest.class);
+ assert !artifact.getClasses().contains(DummyArtifact.class);
+ assert artifact.getClasses().contains(AnotherDummyArtifact.class);
+ assert artifact.getClasses().contains(NotAnArtifact.class);
+ }
+ }
}
17 years, 2 months
[webbeans-commits] Webbeans SVN: r1462 - ri/trunk/jboss-tck-runner/src/main/java and 43 other directories.
by webbeans-commits@lists.jboss.org
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
17 years, 2 months
[webbeans-commits] Webbeans SVN: r1461 - in ri/trunk/porting-package/src/main: java/org/jboss/webbeans/tck and 1 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-08 13:51:29 -0500 (Sun, 08 Feb 2009)
New Revision: 1461
Added:
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/
Removed:
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/
Modified:
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/BeansImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ContextsImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ELImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java
ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties
Log:
rename
Copied: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck (from rev 1458, ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting)
Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/BeansImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/BeansImpl.java 2009-02-08 18:39:53 UTC (rev 1458)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/BeansImpl.java 2009-02-08 18:51:29 UTC (rev 1461)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.porting;
+package org.jboss.webbeans.tck;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ContextsImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContextsImpl.java 2009-02-08 18:39:53 UTC (rev 1458)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ContextsImpl.java 2009-02-08 18:51:29 UTC (rev 1461)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.porting;
+package org.jboss.webbeans.tck;
import org.jboss.jsr299.tck.spi.Contexts;
import org.jboss.webbeans.context.AbstractBeanMapContext;
Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ELImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ELImpl.java 2009-02-08 18:39:53 UTC (rev 1458)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ELImpl.java 2009-02-08 18:51:29 UTC (rev 1461)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.porting;
+package org.jboss.webbeans.tck;
import javax.el.ELContext;
Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ManagersImpl.java 2009-02-08 18:39:53 UTC (rev 1458)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java 2009-02-08 18:51:29 UTC (rev 1461)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.porting;
+package org.jboss.webbeans.tck;
import java.lang.annotation.Annotation;
import java.util.List;
Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/StandaloneContainersImpl.java 2009-02-08 18:39:53 UTC (rev 1458)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/StandaloneContainersImpl.java 2009-02-08 18:51:29 UTC (rev 1461)
@@ -1,4 +1,4 @@
-package org.jboss.webbeans.porting;
+package org.jboss.webbeans.tck;
import java.lang.annotation.Annotation;
import java.util.List;
Modified: ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties
===================================================================
--- ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties 2009-02-08 18:46:06 UTC (rev 1460)
+++ ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties 2009-02-08 18:51:29 UTC (rev 1461)
@@ -1,5 +1,5 @@
-org.jboss.jsr299.tck.spi.Managers=org.jboss.webbeans.porting.ManagersImpl
-org.jboss.jsr299.tck.spi.Beans=org.jboss.webbeans.porting.BeansImpl
-org.jboss.jsr299.tck.spi.Contexts=org.jboss.webbeans.porting.ContextsImpl
-org.jboss.jsr299.tck.spi.StandaloneContainers=org.jboss.webbeans.porting.StandaloneContainersImpl
-org.jboss.jsr299.tck.spi.EL=org.jboss.webbeans.porting.ELImpl
\ No newline at end of file
+org.jboss.jsr299.tck.spi.Managers=org.jboss.webbeans.tck.ManagersImpl
+org.jboss.jsr299.tck.spi.Beans=org.jboss.webbeans.tck.BeansImpl
+org.jboss.jsr299.tck.spi.Contexts=org.jboss.webbeans.tck.ContextsImpl
+org.jboss.jsr299.tck.spi.StandaloneContainers=org.jboss.webbeans.tck.StandaloneContainersImpl
+org.jboss.jsr299.tck.spi.EL=org.jboss.webbeans.tck.ELImpl
\ No newline at end of file
17 years, 2 months
[webbeans-commits] Webbeans SVN: r1459 - in tck/trunk: impl/src/main/java/org/jboss/webbeans/tck and 8 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-08 13:42:35 -0500 (Sun, 08 Feb 2009)
New Revision: 1459
Removed:
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/impl/packaging/standard/
tck/trunk/impl/src/main/resources/org/jboss/webbeans/tck/impl/packaging/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/
tck/trunk/impl/src/test/resources/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/
Log:
cleanup
17 years, 2 months
[webbeans-commits] Webbeans SVN: r1458 - in tck/trunk: impl/src/main/java/org/jboss/webbeans/tck and 12 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-08 13:39:53 -0500 (Sun, 08 Feb 2009)
New Revision: 1458
Removed:
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/context/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/implementation/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/integration/lookup/non/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/runner/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/implementation/producer/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/inheritance/specialization/producer/
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/
tck/trunk/impl/src/main/resources/org/jboss/webbeans/tck/impl/packaging/jsr299/
tck/trunk/impl/src/main/resources/org/jboss/webbeans/tck/impl/packaging/war/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/
tck/trunk/impl/src/test/resources/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/
Log:
cleanup
17 years, 2 months
[webbeans-commits] Webbeans SVN: r1457 - in ri/trunk/porting-package/src/main: resources/META-INF and 1 other directory.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-08 13:36:21 -0500 (Sun, 08 Feb 2009)
New Revision: 1457
Modified:
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/BeansImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContextsImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ELImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ManagersImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/StandaloneContainersImpl.java
ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties
Log:
update for repackaged TCK
Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/BeansImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/BeansImpl.java 2009-02-08 18:35:34 UTC (rev 1456)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/BeansImpl.java 2009-02-08 18:36:21 UTC (rev 1457)
@@ -5,6 +5,7 @@
import javax.inject.manager.Bean;
+import org.jboss.jsr299.tck.spi.Beans;
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.bean.AbstractClassBean;
import org.jboss.webbeans.bean.EnterpriseBean;
@@ -13,7 +14,6 @@
import org.jboss.webbeans.bean.SimpleBean;
import org.jboss.webbeans.ejb.spi.EjbDescriptor;
import org.jboss.webbeans.mock.MockEjbDescriptor;
-import org.jboss.webbeans.tck.spi.Beans;
import org.jboss.webbeans.util.Reflections;
/**
Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContextsImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContextsImpl.java 2009-02-08 18:35:34 UTC (rev 1456)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContextsImpl.java 2009-02-08 18:36:21 UTC (rev 1457)
@@ -1,10 +1,10 @@
package org.jboss.webbeans.porting;
+import org.jboss.jsr299.tck.spi.Contexts;
import org.jboss.webbeans.context.AbstractBeanMapContext;
import org.jboss.webbeans.context.AbstractContext;
import org.jboss.webbeans.context.DependentContext;
import org.jboss.webbeans.context.RequestContext;
-import org.jboss.webbeans.tck.spi.Contexts;
public class ContextsImpl implements Contexts<AbstractContext>
{
Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ELImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ELImpl.java 2009-02-08 18:35:34 UTC (rev 1456)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ELImpl.java 2009-02-08 18:36:21 UTC (rev 1457)
@@ -4,7 +4,7 @@
import org.jboss.webbeans.mock.el.EL;
-public class ELImpl implements org.jboss.webbeans.tck.spi.EL
+public class ELImpl implements org.jboss.jsr299.tck.spi.EL
{
Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ManagersImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ManagersImpl.java 2009-02-08 18:35:34 UTC (rev 1456)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ManagersImpl.java 2009-02-08 18:36:21 UTC (rev 1457)
@@ -5,8 +5,8 @@
import javax.inject.manager.Manager;
+import org.jboss.jsr299.tck.spi.Managers;
import org.jboss.webbeans.CurrentManager;
-import org.jboss.webbeans.tck.spi.Managers;
public class ManagersImpl implements Managers
{
Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/StandaloneContainersImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/StandaloneContainersImpl.java 2009-02-08 18:35:34 UTC (rev 1456)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/StandaloneContainersImpl.java 2009-02-08 18:36:21 UTC (rev 1457)
@@ -5,10 +5,10 @@
import javax.inject.manager.Manager;
+import org.jboss.jsr299.tck.spi.StandaloneContainers;
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.mock.MockBootstrap;
import org.jboss.webbeans.mock.MockWebBeanDiscovery;
-import org.jboss.webbeans.tck.spi.StandaloneContainers;
public class StandaloneContainersImpl implements StandaloneContainers
{
Modified: ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties
===================================================================
--- ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties 2009-02-08 18:35:34 UTC (rev 1456)
+++ ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties 2009-02-08 18:36:21 UTC (rev 1457)
@@ -1,5 +1,5 @@
-org.jboss.webbeans.tck.spi.Managers=org.jboss.webbeans.porting.ManagersImpl
-org.jboss.webbeans.tck.spi.Beans=org.jboss.webbeans.porting.BeansImpl
-org.jboss.webbeans.tck.spi.Contexts=org.jboss.webbeans.porting.ContextsImpl
-org.jboss.webbeans.tck.spi.StandaloneContainers=org.jboss.webbeans.porting.StandaloneContainersImpl
-org.jboss.webbeans.tck.spi.EL=org.jboss.webbeans.porting.ELImpl
\ No newline at end of file
+org.jboss.jsr299.tck.spi.Managers=org.jboss.webbeans.porting.ManagersImpl
+org.jboss.jsr299.tck.spi.Beans=org.jboss.webbeans.porting.BeansImpl
+org.jboss.jsr299.tck.spi.Contexts=org.jboss.webbeans.porting.ContextsImpl
+org.jboss.jsr299.tck.spi.StandaloneContainers=org.jboss.webbeans.porting.StandaloneContainersImpl
+org.jboss.jsr299.tck.spi.EL=org.jboss.webbeans.porting.ELImpl
\ No newline at end of file
17 years, 2 months
[webbeans-commits] Webbeans SVN: r1455 - in ri/trunk: jboss-tck-runner and 1 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-08 12:19:23 -0500 (Sun, 08 Feb 2009)
New Revision: 1455
Modified:
ri/trunk/jboss-tck-runner/pom.xml
ri/trunk/pom.xml
ri/trunk/porting-package/pom.xml
Log:
change tck module names
Modified: ri/trunk/jboss-tck-runner/pom.xml
===================================================================
--- ri/trunk/jboss-tck-runner/pom.xml 2009-02-08 17:18:46 UTC (rev 1454)
+++ ri/trunk/jboss-tck-runner/pom.xml 2009-02-08 17:19:23 UTC (rev 1455)
@@ -36,8 +36,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.tck</groupId>
- <artifactId>webbeans-tck-impl</artifactId>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-impl</artifactId>
<scope>test</scope>
</dependency>
@@ -58,9 +58,8 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.jboss.webbeans.tck</groupId>
- <artifactId>webbeans-tck-impl</artifactId>
- <version>${webbeans.tck.version}</version>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-impl</artifactId>
<type>xml</type>
<classifier>suite</classifier>
<overWrite>true</overWrite>
@@ -75,7 +74,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<suiteXmlFiles>
- <suiteXmlFile>${project.build.directory}/dependency/webbeans-tck-impl-${webbeans.tck.version}-suite.xml</suiteXmlFile>
+ <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-${jsr299.tck.version}-suite.xml</suiteXmlFile>
</suiteXmlFiles>
</configuration>
</plugin>
Modified: ri/trunk/pom.xml
===================================================================
--- ri/trunk/pom.xml 2009-02-08 17:18:46 UTC (rev 1454)
+++ ri/trunk/pom.xml 2009-02-08 17:19:23 UTC (rev 1455)
@@ -80,7 +80,7 @@
</modules>
<properties>
- <webbeans.tck.version>1.0.0-SNAPSHOT</webbeans.tck.version>
+ <jsr299.tck.version>1.0.0-SNAPSHOT</jsr299.tck.version>
<webbeans.ri.version>1.0.0-SNAPSHOT</webbeans.ri.version>
</properties>
@@ -253,15 +253,15 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.tck</groupId>
- <artifactId>webbeans-tck-api</artifactId>
- <version>${webbeans.tck.version}</version>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-api</artifactId>
+ <version>${jsr299.tck.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.tck</groupId>
- <artifactId>webbeans-tck-impl</artifactId>
- <version>${webbeans.tck.version}</version>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-impl</artifactId>
+ <version>${jsr299.tck.version}</version>
</dependency>
</dependencies>
Modified: ri/trunk/porting-package/pom.xml
===================================================================
--- ri/trunk/porting-package/pom.xml 2009-02-08 17:18:46 UTC (rev 1454)
+++ ri/trunk/porting-package/pom.xml 2009-02-08 17:19:23 UTC (rev 1455)
@@ -21,8 +21,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.tck</groupId>
- <artifactId>webbeans-tck-api</artifactId>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-api</artifactId>
</dependency>
<dependency>
<groupId>javax.el</groupId>
17 years, 2 months
[webbeans-commits] Webbeans SVN: r1454 - in tck/trunk: api and 3 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-08 12:18:46 -0500 (Sun, 08 Feb 2009)
New Revision: 1454
Modified:
tck/trunk/api/pom.xml
tck/trunk/impl/pom.xml
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java
tck/trunk/impl/src/main/resources/tck-unit-tests.xml
tck/trunk/pom.xml
Log:
change tck module names
Modified: tck/trunk/api/pom.xml
===================================================================
--- tck/trunk/api/pom.xml 2009-02-08 17:02:04 UTC (rev 1453)
+++ tck/trunk/api/pom.xml 2009-02-08 17:18:46 UTC (rev 1454)
@@ -21,13 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.webbeans.tck</groupId>
+ <groupId>org.jboss.jsr299.tck</groupId>
<artifactId>parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.webbeans.tck</groupId>
- <artifactId>webbeans-tck-api</artifactId>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-api</artifactId>
<packaging>jar</packaging>
<name>JSR-299 TCK API</name>
<url>http://www.seamframework.org/WebBeans</url>
@@ -55,7 +55,7 @@
<configuration>
<archive>
<manifest>
- <mainClass>org.jboss.webbeans.tck.api.WebBeansTCK</mainClass>
+ <mainClass>org.jboss.webbeans.tck.api.TCK</mainClass>
</manifest>
</archive>
</configuration>
Modified: tck/trunk/impl/pom.xml
===================================================================
--- tck/trunk/impl/pom.xml 2009-02-08 17:02:04 UTC (rev 1453)
+++ tck/trunk/impl/pom.xml 2009-02-08 17:18:46 UTC (rev 1454)
@@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>parent</artifactId>
- <groupId>org.jboss.webbeans.tck</groupId>
+ <groupId>org.jboss.jsr299.tck</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans.tck</groupId>
- <artifactId>webbeans-tck-impl</artifactId>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-impl</artifactId>
<name>JSR-299 TCK tests and harness</name>
<dependencies>
@@ -18,8 +18,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.tck</groupId>
- <artifactId>webbeans-tck-api</artifactId>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-api</artifactId>
</dependency>
<dependency>
@@ -125,8 +125,8 @@
<stripVersion>true</stripVersion>
<artifactItems>
<artifactItem>
- <groupId>org.jboss.webbeans.tck</groupId>
- <artifactId>webbeans-tck-api</artifactId>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-api</artifactId>
<overWrite>true</overWrite>
</artifactItem>
<artifactItem>
@@ -209,10 +209,10 @@
<tasks>
<java classname="org.jboss.webbeans.tck.api.TCK" classpathref="maven.compile.classpath" failonerror="true" fork="true">
<jvmarg line="-DdumpArtifacts=true"/>
- <jvmarg line="-Dorg.jboss.webbeans.tck.outputDirectory=${project.build.directory}/jsr-299-artifacts" />
+ <jvmarg line="-Dorg.jboss.webbeans.tck.outputDirectory=${project.build.directory}/jsr299-artifacts" />
<jvmarg line="-Dorg.jboss.webbeans.tck.libraryDirectory=${libraryDirectory}" />
</java>
- <echo>Dumped artifacts to ${project.build.directory}/jsr-299-artifacts</echo>
+ <echo>Dumped artifacts to ${project.build.directory}/jsr299-artifacts</echo>
</tasks>
</configuration>
<goals>
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java 2009-02-08 17:02:04 UTC (rev 1453)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/jsr299/TCKArtifactDescriptor.java 2009-02-08 17:18:46 UTC (rev 1454)
@@ -51,7 +51,7 @@
{
super(declaringClass, beansXmlSourceFileName);
getLibraries().add(new ResourceDescriptor("testng.jar", "/lib/testng-jdk15.jar"));
- getLibraries().add(new ResourceDescriptor("jsr-299-tck-api.jar", "/lib/webbeans-tck-api.jar"));
+ getLibraries().add(new ResourceDescriptor("jsr-299-tck-api.jar", "/lib/jsr299-tck-api.jar"));
getLibraries().add(TCK_SUPPORT_JAR);
try
{
Modified: tck/trunk/impl/src/main/resources/tck-unit-tests.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-unit-tests.xml 2009-02-08 17:02:04 UTC (rev 1453)
+++ tck/trunk/impl/src/main/resources/tck-unit-tests.xml 2009-02-08 17:18:46 UTC (rev 1454)
@@ -1,8 +1,8 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<suite name="Web Beans TCK" verbose="2" >
+<suite name="JSR-299 TCK" verbose="2" >
- <test name="Web Beans TCK" >
+ <test name="JSR-299 TCK" >
<groups >
<run>
<!--
Modified: tck/trunk/pom.xml
===================================================================
--- tck/trunk/pom.xml 2009-02-08 17:02:04 UTC (rev 1453)
+++ tck/trunk/pom.xml 2009-02-08 17:18:46 UTC (rev 1454)
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans.tck</groupId>
+ <groupId>org.jboss.jsr299.tck</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
- <name>Web Beans</name>
+ <name>JSR-299 TCK</name>
<url>http://www.seamframework.org/WebBeans</url>
- <description>
- The TCK of JSR 299: Web Beans
- </description>
-
<developers>
<developer>
<name>Pete Muir</name>
@@ -106,9 +102,9 @@
<version>${webbeans.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.webbeans.tck</groupId>
- <artifactId>webbeans-tck-api</artifactId>
- <version>${webbeans.tck.version}</version>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-api</artifactId>
+ <version>${jsr299.tck.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
@@ -242,7 +238,7 @@
<properties>
<webbeans.version>1.0.0-SNAPSHOT</webbeans.version>
- <webbeans.tck.version>1.0.0-SNAPSHOT</webbeans.tck.version>
+ <jsr299.tck.version>1.0.0-SNAPSHOT</jsr299.tck.version>
</properties>
</project>
17 years, 2 months
[webbeans-commits] Webbeans SVN: r1453 - ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting and 22 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-08 12:02:04 -0500 (Sun, 08 Feb 2009)
New Revision: 1453
Added:
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ELImpl.java
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/StandaloneContainersImpl.java
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Configuration.java
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/InContainerTestLauncher.java
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCK.java
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/EL.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/ConfigurationImpl.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/PropertiesBasedConfigurationImpl.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/ServletInContainerTestLauncher.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/ArtifactGenerator.java
Removed:
ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContainersImpl.java
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCKConfiguration.java
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TestSuite.java
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/WebBeansTCK.java
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/
tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/InContainerTestRunnerTest.java
Modified:
ri/trunk/porting-package/pom.xml
ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties
tck/trunk/api/pom.xml
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/Containers.java
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/StandaloneContainers.java
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/helpers/ForwardingContainers.java
tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/helpers/ForwardingStandaloneContainers.java
tck/trunk/impl/pom.xml
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/WebBeansTCKImpl.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/DeploymentProperties.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/runner/TestRunner.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/runner/servlet/ServletTestRunner.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/TooManyDeploymentTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java
Log:
Much better configuration system for TCK, clean up TCK SPI and API
Modified: ri/trunk/porting-package/pom.xml
===================================================================
--- ri/trunk/porting-package/pom.xml 2009-02-08 15:03:03 UTC (rev 1452)
+++ ri/trunk/porting-package/pom.xml 2009-02-08 17:02:04 UTC (rev 1453)
@@ -31,7 +31,6 @@
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-ri</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
Deleted: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContainersImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContainersImpl.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContainersImpl.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -1,60 +0,0 @@
-package org.jboss.webbeans.porting;
-
-import java.io.InputStream;
-import java.lang.annotation.Annotation;
-import java.util.List;
-
-import javax.el.ELContext;
-import javax.inject.manager.Manager;
-
-import org.jboss.webbeans.ManagerImpl;
-import org.jboss.webbeans.mock.MockBootstrap;
-import org.jboss.webbeans.mock.MockWebBeanDiscovery;
-import org.jboss.webbeans.mock.el.EL;
-import org.jboss.webbeans.tck.spi.StandaloneContainers;
-
-public class ContainersImpl implements StandaloneContainers
-{
-
- public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, Class<?>... classes)
- {
- MockBootstrap bootstrap = new MockBootstrap();
- ManagerImpl manager = bootstrap.getManager();
- if (enabledDeploymentTypes != null)
- {
- manager.setEnabledDeploymentTypes(enabledDeploymentTypes);
- }
- bootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(classes));
- bootstrap.boot();
- return manager;
- }
-
- public Manager deploy(java.lang.Class<?>... classes)
- {
- return deploy(null, classes);
- }
-
- public Manager deploy(InputStream archive)
- {
- throw new UnsupportedOperationException();
- }
-
- public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, InputStream archive)
- {
- throw new UnsupportedOperationException();
- }
-
- @SuppressWarnings("unchecked")
- public <T> T evaluateValueExpression(String expression, Class<T> expectedType)
- {
- ELContext elContext = EL.createELContext();
- return (T) EL.EXPRESSION_FACTORY.createValueExpression(elContext, expression, expectedType).getValue(elContext);
- }
-
- @SuppressWarnings("unchecked")
- public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams)
- {
- ELContext elContext = EL.createELContext();
- return (T) EL.EXPRESSION_FACTORY.createMethodExpression(elContext, expression, expectedType, expectedParamTypes).invoke(elContext, expectedParams);
- }
-}
Added: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ELImpl.java
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ELImpl.java (rev 0)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ELImpl.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -0,0 +1,25 @@
+package org.jboss.webbeans.porting;
+
+import javax.el.ELContext;
+
+import org.jboss.webbeans.mock.el.EL;
+
+public class ELImpl implements org.jboss.webbeans.tck.spi.EL
+{
+
+
+ @SuppressWarnings("unchecked")
+ public <T> T evaluateValueExpression(String expression, Class<T> expectedType)
+ {
+ ELContext elContext = EL.createELContext();
+ return (T) EL.EXPRESSION_FACTORY.createValueExpression(elContext, expression, expectedType).getValue(elContext);
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams)
+ {
+ ELContext elContext = EL.createELContext();
+ return (T) EL.EXPRESSION_FACTORY.createMethodExpression(elContext, expression, expectedType, expectedParamTypes).invoke(elContext, expectedParams);
+ }
+
+}
Property changes on: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ELImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/StandaloneContainersImpl.java (from rev 1445, ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/ContainersImpl.java)
===================================================================
--- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/StandaloneContainersImpl.java (rev 0)
+++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/porting/StandaloneContainersImpl.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -0,0 +1,34 @@
+package org.jboss.webbeans.porting;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
+
+import javax.inject.manager.Manager;
+
+import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.mock.MockBootstrap;
+import org.jboss.webbeans.mock.MockWebBeanDiscovery;
+import org.jboss.webbeans.tck.spi.StandaloneContainers;
+
+public class StandaloneContainersImpl implements StandaloneContainers
+{
+
+ public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, Class<?>... classes)
+ {
+ MockBootstrap bootstrap = new MockBootstrap();
+ ManagerImpl manager = bootstrap.getManager();
+ if (enabledDeploymentTypes != null)
+ {
+ manager.setEnabledDeploymentTypes(enabledDeploymentTypes);
+ }
+ bootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(classes));
+ bootstrap.boot();
+ return manager;
+ }
+
+ public Manager deploy(java.lang.Class<?>... classes)
+ {
+ return deploy(null, classes);
+ }
+
+}
Modified: ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties
===================================================================
--- ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties 2009-02-08 15:03:03 UTC (rev 1452)
+++ ri/trunk/porting-package/src/main/resources/META-INF/web-beans-tck.properties 2009-02-08 17:02:04 UTC (rev 1453)
@@ -1,4 +1,5 @@
org.jboss.webbeans.tck.spi.Managers=org.jboss.webbeans.porting.ManagersImpl
org.jboss.webbeans.tck.spi.Beans=org.jboss.webbeans.porting.BeansImpl
org.jboss.webbeans.tck.spi.Contexts=org.jboss.webbeans.porting.ContextsImpl
-org.jboss.webbeans.tck.spi.Containers=org.jboss.webbeans.porting.ContainersImpl
\ No newline at end of file
+org.jboss.webbeans.tck.spi.StandaloneContainers=org.jboss.webbeans.porting.StandaloneContainersImpl
+org.jboss.webbeans.tck.spi.EL=org.jboss.webbeans.porting.ELImpl
\ No newline at end of file
Modified: tck/trunk/api/pom.xml
===================================================================
--- tck/trunk/api/pom.xml 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/api/pom.xml 2009-02-08 17:02:04 UTC (rev 1453)
@@ -38,6 +38,11 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ </dependency>
</dependencies>
Copied: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Configuration.java (from rev 1445, tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TestSuite.java)
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Configuration.java (rev 0)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Configuration.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -0,0 +1,86 @@
+package org.jboss.webbeans.tck.api;
+
+import java.util.List;
+
+import javax.context.Context;
+
+import org.jboss.webbeans.tck.spi.Beans;
+import org.jboss.webbeans.tck.spi.Containers;
+import org.jboss.webbeans.tck.spi.Contexts;
+import org.jboss.webbeans.tck.spi.EL;
+import org.jboss.webbeans.tck.spi.Managers;
+import org.jboss.webbeans.tck.spi.StandaloneContainers;
+
+public interface Configuration
+{
+
+ public static final String OUTPUT_DIRECTORY_PROPERTY_NAME = "org.jboss.webbeans.tck.outputDirectory";
+ public static final String STANDALONE_PROPERTY_NAME = "org.jboss.webbeans.tck.standalone";
+ public static final String RUN_INTEGRATION_TESTS_PROPERTY_NAME = "org.jboss.webbeans.tck.runIntegrationTests";
+ 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 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 String getOutputDirectory();
+
+ public boolean isStandalone();
+
+ public int getDeploymentDelay();
+
+ public boolean isWriteDeployedArchivesToDisk();
+
+ public String getLibraryDirectory();
+
+ public InContainerTestLauncher getInContainerTestLauncher();
+
+ public Beans getBeans();
+
+ public <T extends Context> Contexts<T> getContexts();
+
+ public Managers getManagers();
+
+ public Containers getContainers();
+
+ public boolean isRunIntegrationTests();
+
+ public void setOutputDirectory(String outputDirectory);
+
+ public void setStandalone(boolean standalone);
+
+ public void setDeploymentDelay(int deploymentDelay);
+
+ public void setWriteDeployedArchivesToDisk(boolean writeDeployedArchivesToDisk);
+
+ public void setLibraryDirectory(String libraryDir);
+
+ public void setInContainerTestLauncher(InContainerTestLauncher inContainerTestLauncher);
+
+ public void setBeans(Beans beans);
+
+ public <T extends Context> void setContexts(Contexts<T> contexts);
+
+ public void setManagers(Managers managers);
+
+ public void setContainers(Containers containers);
+
+ public StandaloneContainers getStandaloneContainers();
+
+ public void setStandaloneContainers(StandaloneContainers standaloneContainers);
+
+ public void setRunIntegrationTests(boolean runIntegrationTests);
+
+ public List<String> getInContainerTestPackageNames();
+
+ public List<String> getStandaloneTestPackageNames();
+
+ public void setEL(EL el);
+
+ public EL getEL();
+
+}
\ No newline at end of file
Property changes on: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/Configuration.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/InContainerTestLauncher.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/InContainerTestLauncher.java (rev 0)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/InContainerTestLauncher.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -0,0 +1,22 @@
+package org.jboss.webbeans.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;
+
+}
Property changes on: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/InContainerTestLauncher.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCK.java (from rev 1445, tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/WebBeansTCK.java)
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCK.java (rev 0)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCK.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -0,0 +1,65 @@
+package org.jboss.webbeans.tck.api;
+
+
+
+/**
+ * Programmatic TCK control
+ *
+ * @author Pete Muir
+ *
+ */
+public abstract class TCK
+{
+
+ public static final String DUMP_ARTIFACTS_PROPERTY_NAME = "dumpArtifacts";
+
+ /**
+ * Obtain an instance of the TCK
+ *
+ * @param configuration
+ * the TCK configuration; if null, the TCK should try to load
+ * configuration from system properties and
+ * web-beans-tck.properties
+ * @return
+ */
+ public static final TCK newInstance()
+ {
+ TCK tCK;
+ try
+ {
+ tCK = (TCK) Class.forName("org.jboss.webbeans.tck.impl.WebBeansTCKImpl").newInstance();
+ }
+ catch (InstantiationException e)
+ {
+ throw new IllegalStateException("WebBeansTCK cannot be run unless webbeans-tck-impl.jar is on the classpath", e);
+ }
+ catch (IllegalAccessException e)
+ {
+ throw new IllegalStateException("WebBeansTCK cannot be run unless webbeans-tck-impl.jar is on the classpath", e);
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new IllegalStateException("WebBeansTCK cannot be run unless webbeans-tck-impl.jar is on the classpath", e);
+ }
+ return tCK;
+ }
+
+ 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)))
+ {
+ TCK tck = newInstance();
+ tck.dumpArtifacts();
+ }
+ }
+
+ protected TCK()
+ {
+ }
+
+ public abstract void dumpArtifacts();
+
+
+ public abstract Configuration getConfiguration();
+
+}
Property changes on: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCK.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCKConfiguration.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCKConfiguration.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TCKConfiguration.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -1,72 +0,0 @@
-package org.jboss.webbeans.tck.api;
-
-import javax.context.Context;
-
-import org.jboss.webbeans.tck.spi.Beans;
-import org.jboss.webbeans.tck.spi.Containers;
-import org.jboss.webbeans.tck.spi.Contexts;
-import org.jboss.webbeans.tck.spi.Managers;
-
-
-public class TCKConfiguration
-{
-
- public static final TCKConfiguration newInstance(Beans beans, Contexts<?> contexts, Managers managers, Containers standaloneContainers, TestSuite testSuite)
- {
- return new TCKConfiguration(beans, contexts, managers, standaloneContainers, testSuite);
- }
-
- private Beans beans;
-
- private Contexts<?> contexts;
-
- private Managers managers;
-
- private TestSuite testSuite;
-
- private Containers containers;
-
- protected TCKConfiguration(Beans beans, Contexts<?> contexts, Managers managers, Containers containers, TestSuite testSuite)
- {
- super();
- this.beans = beans;
- this.contexts = contexts;
- this.managers = managers;
- this.containers = containers;
- if (testSuite != null)
- {
- this.testSuite = testSuite;
- }
- else
- {
- this.testSuite = new TestSuite();
- }
- }
-
- public Beans getBeans()
- {
- return beans;
- }
-
- @SuppressWarnings("unchecked")
- public <T extends Context> Contexts<T> getContexts()
- {
- return (Contexts<T>) contexts;
- }
-
- public Managers getManagers()
- {
- return managers;
- }
-
- public TestSuite getTestSuite()
- {
- return testSuite;
- }
-
- public Containers getContainers()
- {
- return containers;
- }
-
-}
Deleted: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TestSuite.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TestSuite.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TestSuite.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -1,69 +0,0 @@
-package org.jboss.webbeans.tck.api;
-
-public class TestSuite
-{
-
- public static final String PROPERTY_NAME = TestSuite.class.getName();
-
- private String outputDirectory = System.getProperty("java.io.tmpdir") + "/jsr-299-tck/";
- private boolean standalone = true;
- private int deploymentDelay = 5000;
- private boolean writeDeployedArchivesToDisk;
- public String libraryDirectory;
-
- public TestSuite()
- {
-
- }
-
- public String getOutputDirectory()
- {
- return outputDirectory;
- }
-
- public void setOutputDirectory(String outputDirectory)
- {
- this.outputDirectory = outputDirectory;
- }
-
- public boolean isStandalone()
- {
- return standalone;
- }
-
- public void setStandalone(boolean standalone)
- {
- this.standalone = standalone;
- }
-
- public long getDeploymentDelay()
- {
- return deploymentDelay;
- }
-
- public void setDeploymentDelay(int deploymentDelay)
- {
- this.deploymentDelay = deploymentDelay;
- }
-
- public boolean isWriteDeployedArchivesToDisk()
- {
- return writeDeployedArchivesToDisk;
- }
-
- public void setWriteDeployedArchivesToDisk(boolean writeDeployedArchivesToDisk)
- {
- this.writeDeployedArchivesToDisk = writeDeployedArchivesToDisk;
- }
-
- public String getLibraryDirectory()
- {
- return libraryDirectory;
- }
-
- public void setLibraryDirectory(String libraryDir)
- {
- this.libraryDirectory = libraryDir;
- }
-
-}
Deleted: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/WebBeansTCK.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/WebBeansTCK.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/WebBeansTCK.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -1,74 +0,0 @@
-package org.jboss.webbeans.tck.api;
-
-
-/**
- * TCK runner
- *
- * @author Pete Muir
- *
- */
-public abstract class WebBeansTCK
-{
-
- /**
- * Obtain an instance of the TCK
- *
- * @param configuration
- * the TCK configuration; if null, the TCK should try to load
- * configuration from system properties and
- * web-beans-tck.properties
- * @return
- */
- public static final WebBeansTCK newInstance(TCKConfiguration configuration)
- {
- WebBeansTCK webBeansTCK;
- try
- {
- webBeansTCK = (WebBeansTCK) Class.forName("org.jboss.webbeans.tck.impl.WebBeansTCKImpl").newInstance();
- }
- catch (InstantiationException e)
- {
- throw new IllegalStateException("WebBeansTCK cannot be run unless webbeans-tck-impl.jar is on the classpath", e);
- }
- catch (IllegalAccessException e)
- {
- throw new IllegalStateException("WebBeansTCK cannot be run unless webbeans-tck-impl.jar is on the classpath", e);
- }
- catch (ClassNotFoundException e)
- {
- throw new IllegalStateException("WebBeansTCK cannot be run unless webbeans-tck-impl.jar is on the classpath", e);
- }
- webBeansTCK.configure(configuration);
- return webBeansTCK;
- }
-
- /**
- * Run the whole TCK
- */
- public final boolean run()
- {
- // Load Configuration and run
- return runUnitTests();
- }
-
- public static void main(String[] args)
- {
- newInstance(null).run();
- }
-
- protected WebBeansTCK()
- {
- }
-
- protected abstract boolean runUnitTests();
-
- /**
- * Configure the TCK
- *
- * @param configuration if null, the TCK should try to load
- * configuration from system properties and
- * web-beans-tck.properties
- */
- protected abstract void configure(TCKConfiguration configuration);
-
-}
Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/Containers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/Containers.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/Containers.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -11,25 +11,6 @@
public static final String PROPERTY_NAME = Containers.class.getName();
- /**
- *
- * @param <T>
- * @param expression
- * @param expectedType
- * @return
- */
- public <T> T evaluateValueExpression(String expression, Class<T> expectedType);
-
- /**
- *
- * @param <T>
- * @param expression
- * @param expectedType
- * @param expectedParamTypes
- * @return
- */
- public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams);
-
public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, InputStream archive);
/**
Added: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/EL.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/EL.java (rev 0)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/EL.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -0,0 +1,27 @@
+package org.jboss.webbeans.tck.spi;
+
+public interface EL
+{
+
+ public static final String PROPERTY_NAME = EL.class.getName();
+
+ /**
+ *
+ * @param <T>
+ * @param expression
+ * @param expectedType
+ * @return
+ */
+ public <T> T evaluateValueExpression(String expression, Class<T> expectedType);
+
+ /**
+ *
+ * @param <T>
+ * @param expression
+ * @param expectedType
+ * @param expectedParamTypes
+ * @return
+ */
+ public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams);
+
+}
Property changes on: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/EL.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/StandaloneContainers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/StandaloneContainers.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/StandaloneContainers.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -6,15 +6,18 @@
import javax.inject.manager.Manager;
/**
- * Container related operations
+ * Standalone container related operations
*
+ * You must implement this as part of the porting package if you intend to run
+ * the TCK in standalone mode
+ *
* @author Pete Muir
*
*/
-public interface StandaloneContainers extends Containers
+public interface StandaloneContainers
{
- public static final String PROPERTY_NAME = Containers.class.getName();
+ public static final String PROPERTY_NAME = StandaloneContainers.class.getName();
/**
* <p>Bootstrap the container by registering Beans and Observers, raising
Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/helpers/ForwardingContainers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/helpers/ForwardingContainers.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/helpers/ForwardingContainers.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -19,16 +19,6 @@
return delegate().deploy(enabledDeploymentTypes, archive);
}
- public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams)
- {
- return delegate().evaluateMethodExpression(expression, expectedType, expectedParamTypes, expectedParams);
- }
-
- public <T> T evaluateValueExpression(String expression, Class<T> expectedType)
- {
- return delegate().evaluateValueExpression(expression, expectedType);
- }
-
public Manager deploy(InputStream archive)
{
return delegate().deploy(archive);
Modified: tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/helpers/ForwardingStandaloneContainers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/helpers/ForwardingStandaloneContainers.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/api/src/main/java/org/jboss/webbeans/tck/spi/helpers/ForwardingStandaloneContainers.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -7,10 +7,9 @@
import org.jboss.webbeans.tck.spi.StandaloneContainers;
-public abstract class ForwardingStandaloneContainers extends ForwardingContainers implements StandaloneContainers
+public abstract class ForwardingStandaloneContainers implements StandaloneContainers
{
- @Override
protected abstract StandaloneContainers delegate();
public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, Class<?>... classes)
Modified: tck/trunk/impl/pom.xml
===================================================================
--- tck/trunk/impl/pom.xml 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/pom.xml 2009-02-08 17:02:04 UTC (rev 1453)
@@ -85,6 +85,7 @@
</dependencies>
<build>
+ <defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -206,10 +207,10 @@
<phase>package</phase>
<configuration>
<tasks>
- <java classname="org.jboss.webbeans.tck.impl.InContainerTestRunner" classpathref="maven.compile.classpath" failonerror="true" fork="true">
- <jvmarg line="-DcreateArtifacts=true"/>
- <jvmarg line="-DoutputDirectory=${project.build.directory}/jsr-299-artifacts" />
- <jvmarg line="-DlibraryDirectory=${libraryDirectory}" />
+ <java classname="org.jboss.webbeans.tck.api.TCK" classpathref="maven.compile.classpath" failonerror="true" fork="true">
+ <jvmarg line="-DdumpArtifacts=true"/>
+ <jvmarg line="-Dorg.jboss.webbeans.tck.outputDirectory=${project.build.directory}/jsr-299-artifacts" />
+ <jvmarg line="-Dorg.jboss.webbeans.tck.libraryDirectory=${libraryDirectory}" />
</java>
<echo>Dumped artifacts to ${project.build.directory}/jsr-299-artifacts</echo>
</tasks>
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/AbstractTest.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -1,7 +1,5 @@
package org.jboss.webbeans.tck;
-import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -23,6 +21,7 @@
import javax.inject.manager.Bean;
import javax.inject.manager.Manager;
+import org.jboss.webbeans.tck.impl.ConfigurationImpl;
import org.jboss.webbeans.tck.impl.packaging.Artifact;
import org.jboss.webbeans.tck.impl.packaging.ArtifactDescriptor;
import org.jboss.webbeans.tck.impl.packaging.DeclarativeArtifactProcessor;
@@ -41,12 +40,12 @@
protected void setup()
{
- configuration().getContexts().setActive(configuration().getContexts().getDependentContext());
+ ConfigurationImpl.get().getContexts().setActive(ConfigurationImpl.get().getContexts().getDependentContext());
}
protected void cleanup()
{
- configuration().getContexts().setInactive(configuration().getContexts().getDependentContext());
+ ConfigurationImpl.get().getContexts().setInactive(ConfigurationImpl.get().getContexts().getDependentContext());
}
public final void run() throws Exception
@@ -77,18 +76,18 @@
@BeforeMethod
public final void before(Method testMethod)
{
- manager = configuration().getManagers().getManager();
+ manager = ConfigurationImpl.get().getManagers().getManager();
if (getEnabledDeploymentTypes().size() > 0)
{
- configuration().getManagers().setEnabledDeploymentTypes(getEnabledDeploymentTypes());
+ ConfigurationImpl.get().getManagers().setEnabledDeploymentTypes(getEnabledDeploymentTypes());
}
else
{
}
- containers = (StandaloneContainers) configuration().getContainers();
- if (configuration().getTestSuite().isStandalone())
+ if (ConfigurationImpl.get().isStandalone())
{
+ containers = ConfigurationImpl.get().getStandaloneContainers();
Class<?> declaringClass = testMethod.getDeclaringClass();
if (declaringClass.isAnnotationPresent(Artifact.class) || declaringClass.isAnnotationPresent(EjbArtifact.class))
{
@@ -116,30 +115,32 @@
@Deprecated
public <T> Bean<T> createSimpleBean(Class<T> beanClass)
{
- return configuration().getBeans().createSimpleBean(beanClass);
+ return ConfigurationImpl.get().getBeans().createSimpleBean(beanClass);
}
@Deprecated
public <T> Bean<T> createEnterpriseBean(Class<T> beanClass)
{
- return configuration().getBeans().createEnterpriseBean(beanClass);
+ return ConfigurationImpl.get().getBeans().createEnterpriseBean(beanClass);
}
@Deprecated
public <T> Bean<T> createProducerMethodBean(Method method, Bean<?> producerBean)
{
- return configuration().getBeans().createProducerMethodBean(method, producerBean);
+ return ConfigurationImpl.get().getBeans().createProducerMethodBean(method, producerBean);
}
@Deprecated
public <T> Bean<T> createProducerFieldBean(Field field, Bean<?> producerBean)
{
- return configuration().getBeans().createProducerFieldBean(field, producerBean);
+ return ConfigurationImpl.get().getBeans().createProducerFieldBean(field, producerBean);
}
/**
- * Used to deploy simple beans in a Web container.
+ * Used to deploy simple beans in a standalone container.
*
+ *
+ *
* @param classes A list of classes representing the beans to deploy
*/
@Deprecated
@@ -191,7 +192,7 @@
@Deprecated
protected static void activateDependentContext()
{
- configuration().getContexts().setActive(configuration().getContexts().getDependentContext());
+ ConfigurationImpl.get().getContexts().setActive(ConfigurationImpl.get().getContexts().getDependentContext());
}
/**
@@ -200,22 +201,22 @@
@Deprecated
protected static void deactivateDependentContext()
{
- configuration().getContexts().setInactive(configuration().getContexts().getDependentContext());
+ ConfigurationImpl.get().getContexts().setInactive(ConfigurationImpl.get().getContexts().getDependentContext());
}
protected static void setContextActive(Context context)
{
- configuration().getContexts().setActive(context);
+ ConfigurationImpl.get().getContexts().setActive(context);
}
protected static void setContextInactive(Context context)
{
- configuration().getContexts().setInactive(context);
+ ConfigurationImpl.get().getContexts().setInactive(context);
}
protected static void destroyContext(Context context)
{
- configuration().getContexts().destroyContext(context);
+ ConfigurationImpl.get().getContexts().destroyContext(context);
}
@Deprecated
Copied: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/ConfigurationImpl.java (from rev 1445, tck/trunk/api/src/main/java/org/jboss/webbeans/tck/api/TestSuite.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/ConfigurationImpl.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/ConfigurationImpl.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -0,0 +1,230 @@
+package org.jboss.webbeans.tck.impl;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.context.Context;
+
+import org.jboss.webbeans.tck.api.Configuration;
+import org.jboss.webbeans.tck.api.InContainerTestLauncher;
+import org.jboss.webbeans.tck.spi.Beans;
+import org.jboss.webbeans.tck.spi.Containers;
+import org.jboss.webbeans.tck.spi.Contexts;
+import org.jboss.webbeans.tck.spi.EL;
+import org.jboss.webbeans.tck.spi.Managers;
+import org.jboss.webbeans.tck.spi.StandaloneContainers;
+
+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";
+
+ private static Configuration current;
+ public static Configuration get()
+ {
+ if (ConfigurationImpl.current == null)
+ {
+ ConfigurationImpl.current = new PropertiesBasedConfigurationImpl().loadSPIImplementation();
+ }
+ return ConfigurationImpl.current;
+ }
+
+ private String outputDirectory;
+ private boolean standalone;
+ private boolean runIntegrationTests;
+ private int deploymentDelay;
+ private boolean writeDeployedArchivesToDisk;
+ private String libraryDirectory;
+ private InContainerTestLauncher inContainerTestLauncher;
+ private Beans beans;
+ private Contexts<? extends Context> contexts;
+ private Managers managers;
+ private Containers containers;
+ private StandaloneContainers standaloneContainers;
+ private EL el;
+ private List<String> integrationTestPackageNames;
+ private List<String> unitTestPackageNames;
+
+ protected ConfigurationImpl()
+ {
+ // TODO Auto-generated constructor stub
+ }
+
+ public ConfigurationImpl(Configuration configuration)
+ {
+ this.outputDirectory = configuration.getOutputDirectory();
+ this.standalone = configuration.isStandalone();
+ this.runIntegrationTests = configuration.isRunIntegrationTests();
+ this.deploymentDelay = configuration.getDeploymentDelay();
+ this.writeDeployedArchivesToDisk = configuration.isWriteDeployedArchivesToDisk();
+ this.libraryDirectory = configuration.getLibraryDirectory();
+ this.inContainerTestLauncher = configuration.getInContainerTestLauncher();
+ this.beans = configuration.getBeans();
+ this.contexts = configuration.getContexts();
+ this.managers = configuration.getManagers();
+ this.containers = configuration.getContainers();
+ this.el = configuration.getEL();
+ this.standaloneContainers = configuration.getStandaloneContainers();
+ }
+
+ public String getOutputDirectory()
+ {
+ return outputDirectory;
+ }
+
+ public void setOutputDirectory(String outputDirectory)
+ {
+ this.outputDirectory = outputDirectory;
+ }
+
+ public boolean isStandalone()
+ {
+ return standalone;
+ }
+
+ public void setStandalone(boolean standalone)
+ {
+ this.standalone = standalone;
+ }
+
+ public int getDeploymentDelay()
+ {
+ return deploymentDelay;
+ }
+
+ public void setDeploymentDelay(int deploymentDelay)
+ {
+ this.deploymentDelay = deploymentDelay;
+ }
+
+ public boolean isWriteDeployedArchivesToDisk()
+ {
+ return writeDeployedArchivesToDisk;
+ }
+
+ public void setWriteDeployedArchivesToDisk(boolean writeDeployedArchivesToDisk)
+ {
+ this.writeDeployedArchivesToDisk = writeDeployedArchivesToDisk;
+ }
+
+ public String getLibraryDirectory()
+ {
+ return libraryDirectory;
+ }
+
+ public void setLibraryDirectory(String libraryDir)
+ {
+ this.libraryDirectory = libraryDir;
+ }
+
+ public InContainerTestLauncher getInContainerTestLauncher()
+ {
+ return inContainerTestLauncher;
+ }
+
+ public void setInContainerTestLauncher(InContainerTestLauncher inContainerTestLauncher)
+ {
+ this.inContainerTestLauncher = inContainerTestLauncher;
+ }
+
+ public Beans getBeans()
+ {
+ return beans;
+ }
+
+ public void setBeans(Beans beans)
+ {
+ this.beans = beans;
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T extends Context> Contexts<T> getContexts()
+ {
+ return (Contexts<T>) contexts;
+ }
+
+ public <T extends Context> void setContexts(Contexts<T> contexts)
+ {
+ this.contexts = contexts;
+ }
+
+ public Managers getManagers()
+ {
+ return managers;
+ }
+
+ public void setManagers(Managers managers)
+ {
+ this.managers = managers;
+ }
+
+ public Containers getContainers()
+ {
+ return containers;
+ }
+
+ public void setContainers(Containers containers)
+ {
+ this.containers = containers;
+ }
+
+ public boolean isRunIntegrationTests()
+ {
+ return runIntegrationTests;
+ }
+
+ public void setRunIntegrationTests(boolean runIntegrationTests)
+ {
+ this.runIntegrationTests = runIntegrationTests;
+ }
+
+ public List<String> getInContainerTestPackageNames()
+ {
+ if (integrationTestPackageNames == null)
+ {
+ integrationTestPackageNames = new ArrayList<String>();
+ integrationTestPackageNames.add(INTEGRATION_TEST_PACKAGE_NAME);
+ if (!isStandalone())
+ {
+ integrationTestPackageNames.add(UNIT_TEST_PACKAGE_NAME);
+ }
+ }
+ return Collections.unmodifiableList(integrationTestPackageNames);
+ }
+
+ public List<String> getStandaloneTestPackageNames()
+ {
+ if (unitTestPackageNames == null)
+ {
+ unitTestPackageNames = new ArrayList<String>();
+ if (isStandalone())
+ {
+ unitTestPackageNames.add(UNIT_TEST_PACKAGE_NAME);
+ }
+ }
+ return Collections.unmodifiableList(unitTestPackageNames);
+ }
+
+ public EL getEL()
+ {
+ return el;
+ }
+
+ public void setEL(EL el)
+ {
+ this.el = el;
+ }
+
+ public StandaloneContainers getStandaloneContainers()
+ {
+ return standaloneContainers;
+ }
+
+ public void setStandaloneContainers(StandaloneContainers standaloneContainers)
+ {
+ this.standaloneContainers = standaloneContainers;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/ConfigurationImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/InContainerTestRunner.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -1,22 +1,11 @@
package org.jboss.webbeans.tck.impl;
-
-import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
-
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import org.apache.log4j.Logger;
-import org.jboss.webbeans.tck.api.TestSuite;
+import org.jboss.webbeans.tck.api.Configuration;
import org.jboss.webbeans.tck.impl.packaging.ArtifactDescriptor;
-import org.jboss.webbeans.tck.impl.packaging.ArtifactScanner;
-import org.jboss.webbeans.tck.impl.packaging.DeclarativeArtifactProcessor;
-import org.jboss.webbeans.tck.spi.Containers;
-import org.testng.ITestContext;
public class InContainerTestRunner
@@ -24,95 +13,19 @@
private static final Logger log = Logger.getLogger(InContainerTestRunner.class);
- private final TestSuite testSuite;
- private final Containers containers;
+ private final Configuration configuration;
public InContainerTestRunner()
{
- testSuite = configuration().getTestSuite();
- containers = configuration().getContainers();
+ configuration = new ConfigurationImpl(ConfigurationImpl.get());
}
- protected InContainerTestRunner(TestSuite testSuite, Containers containers)
+ protected InContainerTestRunner(Configuration configuration)
{
super();
- this.testSuite = testSuite;
- this.containers = containers;
+ this.configuration = configuration;
}
-
- public static void main(String[] args)
- {
- if (System.getProperty("createArtifacts") != null)
- {
- TestSuite testSuite = new TestSuite();
- if (System.getProperty("outputDirectory") != null)
- {
- testSuite.setOutputDirectory(System.getProperty("outputDirectory"));
- }
- if (System.getProperty("libraryDirectory") != null)
- {
- testSuite.setLibraryDirectory(System.getProperty("libraryDirectory"));
- }
- testSuite.setStandalone(false);
- testSuite.setWriteDeployedArchivesToDisk(true);
- InContainerTestRunner runner = new InContainerTestRunner(testSuite, null);
- runner.writeArtifactsOutputDirectory(runner.createArtifacts());
- }
- }
- public void run()
- {
- List<ArtifactDescriptor> artifacts = createArtifacts();
- if (testSuite.isWriteDeployedArchivesToDisk())
- {
- writeArtifactsOutputDirectory(artifacts);
- }
- deployArtifacts(artifacts);
- }
-
- protected List<ArtifactDescriptor> createArtifacts()
- {
- Set<Class<?>> classes = new HashSet<Class<?>>();
- classes.addAll(new ArtifactScanner("org.jboss.webbeans.tck.integration").getClasses());
-
- if (!testSuite.isStandalone())
- {
- classes.addAll(new ArtifactScanner("org.jboss.webbeans.tck.unit").getClasses());
- }
- List<ArtifactDescriptor> artifacts = new ArrayList<ArtifactDescriptor>();
- for (Class<?> clazz : classes)
- {
- artifacts.add(new DeclarativeArtifactProcessor(clazz, testSuite.isStandalone(), testSuite.getLibraryDirectory()).getArtifact());
- }
- return artifacts;
- }
-
- protected void writeArtifactsOutputDirectory(List<ArtifactDescriptor> artifacts)
- {
- File file = new File(testSuite.getOutputDirectory());
- if (!file.exists())
- {
- file.mkdirs();
- }
- else if (file.isFile())
- {
- throw new IllegalStateException("Cannot use debug directory " + testSuite.getOutputDirectory() + ", it already exists");
- }
- log.info("Writing artifacts to " + testSuite.getOutputDirectory());
- for (ArtifactDescriptor artifact : artifacts)
- {
- try
- {
- artifact.writeArtifactToDisk(testSuite.getOutputDirectory());
- log.info("Written artifact to disk " + artifact);
- }
- catch (IOException e)
- {
- log.warn("Error writing artifact to disk " + artifact, e);
- }
- }
- }
-
protected void deployArtifacts(List<ArtifactDescriptor> artifacts)
{
for (ArtifactDescriptor artifact : artifacts)
@@ -121,16 +34,17 @@
{
InputStream jar = artifact.getJar();
- containers.deploy(jar);
+ configuration.getContainers().deploy(jar);
jar.close();
try
{
- Thread.sleep(testSuite.getDeploymentDelay());
+ Thread.sleep(configuration.getDeploymentDelay());
}
catch (InterruptedException e)
{
Thread.interrupted();
}
+
}
catch (IOException e)
{
@@ -139,9 +53,4 @@
}
}
- private void mergeInTestReports(ITestContext context)
- {
-
- }
-
}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/PropertiesBasedConfigurationImpl.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/PropertiesBasedConfigurationImpl.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/PropertiesBasedConfigurationImpl.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -0,0 +1,48 @@
+package org.jboss.webbeans.tck.impl;
+
+import javax.context.Context;
+
+import org.jboss.webbeans.tck.api.InContainerTestLauncher;
+import org.jboss.webbeans.tck.impl.util.DeploymentProperties;
+import org.jboss.webbeans.tck.spi.Beans;
+import org.jboss.webbeans.tck.spi.Containers;
+import org.jboss.webbeans.tck.spi.Contexts;
+import org.jboss.webbeans.tck.spi.EL;
+import org.jboss.webbeans.tck.spi.Managers;
+import org.jboss.webbeans.tck.spi.StandaloneContainers;
+
+public class PropertiesBasedConfigurationImpl extends ConfigurationImpl
+{
+
+ private final DeploymentProperties deploymentProperties;
+
+ public PropertiesBasedConfigurationImpl()
+ {
+ this.deploymentProperties = new DeploymentProperties();
+
+ setOutputDirectory(deploymentProperties.getStringValue(OUTPUT_DIRECTORY_PROPERTY_NAME, DEFAULT_OUTPUT_DIRECTORY, false));
+ setStandalone(deploymentProperties.getBooleanValue(STANDALONE_PROPERTY_NAME, DEFAULT_STANDALONE, false));
+ setRunIntegrationTests(deploymentProperties.getBooleanValue(RUN_INTEGRATION_TESTS_PROPERTY_NAME, DEFAULT_RUN_INTEGRATION_TESTS, false));
+ setDeploymentDelay(deploymentProperties.getIntValue(DEPLOYMENT_DELAY_PROPERTY_NAME, DEFAULT_DEPLOYMENT_DELAY, false));
+ setWriteDeployedArchivesToDisk(deploymentProperties.getBooleanValue(WRITE_DEPLOYED_ARCHIVES_TO_DISK_PROPERTY_NAME, DEFAULT_WRITE_DEPLOYED_ARCHIVES_TO_DISK, false));
+ setLibraryDirectory(deploymentProperties.getStringValue(LIBRARY_DIRECTORY_PROPERTY_NAME, DEFAULT_LIBRARY_DIRECTORY, false));
+
+ }
+
+ public PropertiesBasedConfigurationImpl loadSPIImplementation()
+ {
+ setInContainerTestLauncher(deploymentProperties.getInstanceValue(InContainerTestLauncher.PROPERTY_NAME, InContainerTestLauncher.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));
+
+ @SuppressWarnings("unchecked")
+ Contexts<? extends Context> instanceValue = deploymentProperties.getInstanceValue(Contexts.PROPERTY_NAME, Contexts.class, true);
+
+ setContexts(instanceValue);
+ return this;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/PropertiesBasedConfigurationImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/ServletInContainerTestLauncher.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/ServletInContainerTestLauncher.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/ServletInContainerTestLauncher.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -0,0 +1,59 @@
+package org.jboss.webbeans.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.webbeans.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();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/ServletInContainerTestLauncher.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/WebBeansTCKImpl.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/WebBeansTCKImpl.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/WebBeansTCKImpl.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -4,57 +4,32 @@
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
import javax.xml.parsers.ParserConfigurationException;
-import org.jboss.webbeans.tck.api.TCKConfiguration;
-import org.jboss.webbeans.tck.api.TestSuite;
-import org.jboss.webbeans.tck.api.WebBeansTCK;
-import org.jboss.webbeans.tck.impl.util.DeploymentProperties;
-import org.jboss.webbeans.tck.spi.Beans;
-import org.jboss.webbeans.tck.spi.Containers;
-import org.jboss.webbeans.tck.spi.Contexts;
-import org.jboss.webbeans.tck.spi.Managers;
+import org.jboss.webbeans.tck.api.Configuration;
+import org.jboss.webbeans.tck.api.TCK;
+import org.jboss.webbeans.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 WebBeansTCK
+public class WebBeansTCKImpl extends TCK
{
- private static TCKConfiguration configuration;
-
- public static TCKConfiguration configuration()
+ protected void runUnitTests()
{
- if (configuration == null)
- {
- configuration = createTCKConfiguration();
- }
- return configuration;
- }
-
- public WebBeansTCKImpl()
- {
- super();
-
- }
-
- @Override
- public boolean runUnitTests()
- {
TestNG testNG = new TestNG();
- setXmlSuitePath(testNG);
- if (configuration.getTestSuite().getOutputDirectory() != null)
+ addUnitTests(testNG);
+ if (getConfiguration().getOutputDirectory() != null)
{
- testNG.setOutputDirectory(configuration.getTestSuite().getOutputDirectory());
+ testNG.setOutputDirectory(getConfiguration().getOutputDirectory());
}
testNG.run();
- return !(testNG.hasFailure() || testNG.hasSkip());
}
- private static void setXmlSuitePath(TestNG testNG)
+ private static void addUnitTests(TestNG testNG)
{
InputStream is = WebBeansTCKImpl.class.getResourceAsStream("/tck-unit-tests.xml");
if (is == null)
@@ -83,59 +58,18 @@
}
@Override
- protected void configure(TCKConfiguration configuration)
+ public void dumpArtifacts()
{
- if (configuration != null)
- {
- WebBeansTCKImpl.configuration = configuration;
- }
+ Configuration configuration = new PropertiesBasedConfigurationImpl();
+ configuration.setStandalone(false);
+ configuration.setWriteDeployedArchivesToDisk(true);
+ new ArtifactGenerator(configuration).dumpArtifacts();
}
-
- public static final TCKConfiguration createTCKConfiguration()
+ @Override
+ public Configuration getConfiguration()
{
- DeploymentProperties deploymentProperties = new DeploymentProperties();
- Managers managers = create(deploymentProperties.getClasses(Managers.PROPERTY_NAME, Managers.class), Managers.class, true);
- Containers containers = create(deploymentProperties.getClasses(Containers.PROPERTY_NAME, Containers.class), Containers.class, true);
- Beans beans = create(deploymentProperties.getClasses(Beans.PROPERTY_NAME, Beans.class), Beans.class, true);
- Contexts<?> contexts = create(deploymentProperties.getClasses(Contexts.PROPERTY_NAME, Contexts.class), Contexts.class, true);
- TestSuite testSuite = create(deploymentProperties.getClasses(TestSuite.PROPERTY_NAME, TestSuite.class), TestSuite.class, false);
- return TCKConfiguration.newInstance(beans, contexts, managers, containers, testSuite);
+ return ConfigurationImpl.get();
}
-
- private static <T> T create(Set<Class<? extends T>> classes, Class<T> expectedType, boolean required)
- {
- if (classes.size() == 0)
- {
- if (required)
- {
- throw new IllegalArgumentException("Cannot find any implementations of " + expectedType.getSimpleName() + ", check that " + expectedType.getName() + " is specified");
- }
- else
- {
- return null;
- }
- }
- else if (classes.size() > 1)
- {
- throw new IllegalArgumentException("More than one implementation of " + expectedType.getSimpleName() + " specified, not sure which one to use!");
- }
- else
- {
- Class<? extends T> clazz = classes.iterator().next();
- try
- {
- return clazz.newInstance();
- }
- catch (InstantiationException e)
- {
- throw new IllegalStateException("Unable to instantiate " + clazz, e);
- }
- catch (IllegalAccessException e)
- {
- throw new IllegalStateException("Unable to instantiate " + clazz, e);
- }
- }
- }
}
Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/ArtifactGenerator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/ArtifactGenerator.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/ArtifactGenerator.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -0,0 +1,71 @@
+package org.jboss.webbeans.tck.impl.packaging;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+import org.jboss.webbeans.tck.api.Configuration;
+
+public class ArtifactGenerator
+{
+
+ private static final Logger log = Logger.getLogger(ArtifactGenerator.class);
+
+ private final Configuration configuration;
+
+ public ArtifactGenerator(Configuration configuration)
+ {
+ if (configuration == null)
+ {
+ throw new IllegalArgumentException("packageNames must not be null");
+ }
+ this.configuration = configuration;
+ }
+
+ public List<ArtifactDescriptor> createArtifacts()
+ {
+ Set<Class<?>> classes = new HashSet<Class<?>>();
+ for (String packageName : configuration.getInContainerTestPackageNames())
+ {
+ classes.addAll(new ArtifactScanner(packageName).getClasses());
+ }
+ List<ArtifactDescriptor> artifacts = new ArrayList<ArtifactDescriptor>();
+ for (Class<?> clazz : classes)
+ {
+ artifacts.add(new DeclarativeArtifactProcessor(clazz, configuration.isStandalone(), configuration.getLibraryDirectory()).getArtifact());
+ }
+ return artifacts;
+ }
+
+ public void dumpArtifacts()
+ {
+ List<ArtifactDescriptor> artifacts = createArtifacts();
+ File file = new File(configuration.getOutputDirectory());
+ if (!file.exists())
+ {
+ file.mkdirs();
+ }
+ else if (file.isFile())
+ {
+ throw new IllegalStateException("Cannot use debug directory " + configuration.getOutputDirectory() + ", it already exists");
+ }
+ log.info("Writing artifacts to " + configuration.getOutputDirectory());
+ for (ArtifactDescriptor artifact : artifacts)
+ {
+ try
+ {
+ artifact.writeArtifactToDisk(configuration.getOutputDirectory());
+ log.info("Written artifact to disk " + artifact);
+ }
+ catch (IOException e)
+ {
+ log.warn("Error writing artifact to disk " + artifact, e);
+ }
+ }
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/ArtifactGenerator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/DeploymentProperties.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/DeploymentProperties.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/util/DeploymentProperties.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -9,6 +9,8 @@
import java.util.Properties;
import java.util.Set;
+import org.apache.log4j.Logger;
+
/**
* Utility class to load deployment properties
*
@@ -19,6 +21,8 @@
// The resource bundle used to control Web Beans RI deployment
public static final String RESOURCE_BUNDLE = "META-INF/web-beans-tck.properties";
+ private static final Logger log = Logger.getLogger(DeploymentProperties.class);
+
// The class to work from
private SimpleResourceLoader resourceLoader;
@@ -126,14 +130,14 @@
* @return A set of classes specified
*/
@SuppressWarnings("unchecked")
- public <T> Set<Class<? extends T>> getClasses(String propertyName, Class<T> expectedType)
+ public <T> Set<Class<T>> getClasses(String propertyName, Class<T> expectedType)
{
- Set<Class<? extends T>> classes = new HashSet<Class<? extends T>>();
+ Set<Class<T>> classes = new HashSet<Class<T>>();
for (String className : getPropertyValues(propertyName))
{
try
{
- classes.add((Class<? extends T>) resourceLoader.classForName(className));
+ classes.add((Class<T>) resourceLoader.classForName(className));
}
catch (ResourceLoadingException e)
{
@@ -142,5 +146,87 @@
}
return classes;
}
+
+ public <T> Class<T> getClassValue(String propertyName, Class<T> expectedType, boolean required)
+ {
+ Set<Class<T>> classes = getClasses(propertyName, expectedType);
+ if (classes.size() == 0)
+ {
+ if (required)
+ {
+ throw new IllegalArgumentException("Cannot find any implementations of " + expectedType.getSimpleName() + ", check that " + propertyName + " is specified");
+ }
+ else
+ {
+ return null;
+ }
+ }
+ else if (classes.size() > 1)
+ {
+ throw new IllegalArgumentException("More than one implementation of " + expectedType.getSimpleName() + " specified by " + propertyName + ", not sure which one to use!");
+ }
+ else
+ {
+ return classes.iterator().next();
+ }
+ }
+
+ public <T> T getInstanceValue(String propertyName, Class<T> expectedType, boolean required)
+ {
+ Class<T> clazz = getClassValue(propertyName, expectedType, required);
+ if (clazz != null)
+ {
+ try
+ {
+ return clazz.newInstance();
+ }
+ catch (InstantiationException e)
+ {
+ throw new IllegalStateException("Error instantiating " + clazz + " specified by " + propertyName, e);
+ }
+ catch (IllegalAccessException e)
+ {
+ throw new IllegalStateException("Error instantiating " + clazz + " specified by " + propertyName, e);
+ }
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ public boolean getBooleanValue(String propertyName, boolean _default, boolean required)
+ {
+ return Boolean.valueOf(getStringValue(propertyName, _default ? "true" : "false", required));
+ }
+
+ public int getIntValue(String propertyName, int _default, boolean required)
+ {
+ return Integer.valueOf(getStringValue(propertyName, Integer.toString(_default), required)).intValue();
+ }
+
+ public String getStringValue(String propertyName, String _default, boolean required)
+ {
+ List<String> values = getPropertyValues(propertyName);
+ if (values.size() == 0)
+ {
+ if (required)
+ {
+ throw new IllegalArgumentException("Cannot find required property " + propertyName + ", check that it is specified");
+ }
+ else
+ {
+ return _default;
+ }
+ }
+ else if (values.size() > 1)
+ {
+ throw new IllegalArgumentException("More than one value given for " + propertyName + ", not sure which one to use!");
+ }
+ else
+ {
+ return values.iterator().next();
+ }
+ }
}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/runner/TestRunner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/runner/TestRunner.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/runner/TestRunner.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -31,6 +31,7 @@
public ITestContext run()
{
TestNG testNG = new TestNG(false);
+ testNG.setVerbose(0);
BufferedListener listener = new BufferedListener();
testNG.addListener(listener);
List<XmlSuite> suites = new ArrayList<XmlSuite>();
@@ -43,7 +44,6 @@
private XmlSuite createSuite()
{
XmlSuite suite = new XmlSuite();
- suite.setVerbose(2);
suite.setName("JSR-299 TCK");
for (String className : classNames)
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/runner/servlet/ServletTestRunner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/runner/servlet/ServletTestRunner.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/runner/servlet/ServletTestRunner.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -1,7 +1,5 @@
package org.jboss.webbeans.tck.runner.servlet;
-import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
-
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.PrintWriter;
@@ -11,6 +9,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.jboss.webbeans.tck.impl.ConfigurationImpl;
import org.jboss.webbeans.tck.runner.TestRunner;
import org.testng.ITestContext;
import org.testng.ITestResult;
@@ -21,7 +20,7 @@
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
- configuration().getTestSuite().setStandalone(false);
+ ConfigurationImpl.get().setStandalone(false);
TestRunner runner = new TestRunner();
ITestContext context = runner.run();
String outputMode;
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/ContextTest.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -1,7 +1,5 @@
package org.jboss.webbeans.tck.unit.context;
-import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
-
import java.lang.annotation.Annotation;
import javax.context.Context;
@@ -12,6 +10,7 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.SpecAssertion;
+import org.jboss.webbeans.tck.impl.ConfigurationImpl;
import org.testng.annotations.Test;
/**
@@ -59,7 +58,7 @@
@SpecAssertion(section = "8.5", id = "unknown")
public void testGetContextWithNoActiveContextsFails()
{
- configuration().getContexts().setInactive(configuration().getContexts().getRequestContext());
+ ConfigurationImpl.get().getContexts().setInactive(ConfigurationImpl.get().getContexts().getRequestContext());
manager.getContext(RequestScoped.class);
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/context/dependent/DependentContextTest.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -1,7 +1,5 @@
package org.jboss.webbeans.tck.unit.context.dependent;
-import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
-
import java.util.Set;
import javax.context.Context;
@@ -11,6 +9,7 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.SpecAssertion;
+import org.jboss.webbeans.tck.impl.ConfigurationImpl;
import org.testng.annotations.Test;
/**
@@ -56,7 +55,7 @@
* Any instance of the (@Dependent scoped) bean that is used to evaluate a
* Unified EL expression exists to service that evaluation only.
*/
- @Test(groups = { "contexts", "el", "broken" })
+ @Test(groups = { "contexts", "el" })
@SpecAssertion(section = "8.3", id = "unknown")
public void testInstanceUsedForElEvaluationNotShared() throws Exception
{
@@ -69,8 +68,8 @@
Set<Bean<Fox>> foxBeans = manager.resolveByType(Fox.class);
assert foxBeans.size() == 1;
- Fox fox1 = configuration().getContainers().evaluateValueExpression("#{fox}", Fox.class);
- Fox fox2 = configuration().getContainers().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();
@@ -296,7 +295,7 @@
* while a Unified EL expression is evaluated, or
* @throws Exception
*/
- @Test(groups = { "contexts", "el", "broken" })
+ @Test(groups = { "contexts", "el" })
@SpecAssertion(section = "8.3", id = "unknown")
public void testContextIsActiveWhenEvaluatingElExpression() throws Exception
{
@@ -307,7 +306,7 @@
@Override
protected void execute() throws Exception
{
- String foxName = configuration().getContainers().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();
}
@@ -416,7 +415,7 @@
*
* @throws Exception
*/
- @Test(groups = { "contexts", "el", "broken" })
+ @Test(groups = { "contexts", "el"})
@SpecAssertion(section = "8.3.2", id = "unknown")
public void testDependentsDestroyedWhenElEvaluationCompletes() throws Exception
{
@@ -430,7 +429,7 @@
assert foxBeans.size() == 1;
Bean<Fox> foxBean = foxBeans.iterator().next();
- Fox fox1 = configuration().getContainers().evaluateValueExpression("#{fox}", Fox.class);
+ Fox fox1 = ConfigurationImpl.get().getEL().evaluateValueExpression("#{fox}", Fox.class);
assert fox1 != null;
assert manager.getContext(Dependent.class).get(foxBean) == null;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/CustomDeploymentTypeTest.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -1,7 +1,5 @@
package org.jboss.webbeans.tck.unit.definition.deployment;
-import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
-
import java.lang.annotation.Annotation;
import java.util.Arrays;
import java.util.List;
@@ -11,6 +9,7 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.SpecAssertion;
import org.jboss.webbeans.tck.SpecAssertions;
+import org.jboss.webbeans.tck.impl.ConfigurationImpl;
import org.testng.annotations.Test;
/**
@@ -36,10 +35,10 @@
})
public void testCustomDeploymentTypes()
{
- assert configuration().getManagers().getEnabledDeploymentTypes().size() == 3;
- assert configuration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class);
- assert configuration().getManagers().getEnabledDeploymentTypes().get(1).equals(AnotherDeploymentType.class);
- assert configuration().getManagers().getEnabledDeploymentTypes().get(2).equals(HornedAnimalDeploymentType.class);
+ assert ConfigurationImpl.get().getManagers().getEnabledDeploymentTypes().size() == 3;
+ assert ConfigurationImpl.get().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class);
+ assert ConfigurationImpl.get().getManagers().getEnabledDeploymentTypes().get(1).equals(AnotherDeploymentType.class);
+ assert ConfigurationImpl.get().getManagers().getEnabledDeploymentTypes().get(2).equals(HornedAnimalDeploymentType.class);
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -1,13 +1,12 @@
package org.jboss.webbeans.tck.unit.definition.deployment;
-import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
-
import javax.inject.Production;
import javax.inject.Standard;
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.SpecAssertion;
import org.jboss.webbeans.tck.SpecAssertions;
+import org.jboss.webbeans.tck.impl.ConfigurationImpl;
import org.jboss.webbeans.tck.impl.packaging.Artifact;
import org.jboss.webbeans.tck.impl.packaging.Classes;
import org.testng.annotations.Test;
@@ -29,9 +28,9 @@
})
public void testDefaultEnabledDeploymentTypes()
{
- assert configuration().getManagers().getEnabledDeploymentTypes().size() == 2;
- assert configuration().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class);
- assert configuration().getManagers().getEnabledDeploymentTypes().get(1).equals(Production.class);
+ assert ConfigurationImpl.get().getManagers().getEnabledDeploymentTypes().size() == 2;
+ assert ConfigurationImpl.get().getManagers().getEnabledDeploymentTypes().get(0).equals(Standard.class);
+ assert ConfigurationImpl.get().getManagers().getEnabledDeploymentTypes().get(1).equals(Production.class);
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -12,7 +12,6 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.SpecAssertion;
import org.jboss.webbeans.tck.SpecAssertions;
-import org.jboss.webbeans.tck.impl.packaging.Artifact;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/TooManyDeploymentTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/TooManyDeploymentTypesTest.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/definition/deployment/broken/TooManyDeploymentTypesTest.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -21,8 +21,6 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.SpecAssertion;
-import org.jboss.webbeans.tck.impl.packaging.Artifact;
-import org.jboss.webbeans.tck.impl.packaging.Classes;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/event/EventTest.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -1394,6 +1394,7 @@
@SpecAssertion(section = "7.7", id = "unknown")
public void testResolvingChecksBindingTypes()
{
+ deployBeans();
AnObserver observer = new AnObserver();
AnObserver anotherObserver = new AnObserver();
manager.addObserver(observer, AnEventType.class, new BindingTypeABinding());
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -1,7 +1,5 @@
package org.jboss.webbeans.tck.unit.lookup.clientProxy;
-import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
-
import java.io.IOException;
import java.lang.annotation.Annotation;
import java.util.List;
@@ -12,6 +10,7 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.SpecAssertion;
+import org.jboss.webbeans.tck.impl.ConfigurationImpl;
import org.testng.annotations.Test;
/**
@@ -36,7 +35,7 @@
{
deployBeans(Tuna.class);
Tuna tuna = manager.getInstanceByType(Tuna.class);
- assert configuration().getBeans().isProxy(tuna);
+ assert ConfigurationImpl.get().getBeans().isProxy(tuna);
}
@Test(groups = "configuration().getBeans()")
@@ -48,7 +47,7 @@
{
activateDependentContext();
Fox fox = manager.getInstance(foxBean);
- assert !configuration().getBeans().isProxy(fox);
+ assert !ConfigurationImpl.get().getBeans().isProxy(fox);
}
finally
{
@@ -63,10 +62,10 @@
Bean<TunedTuna> tunaBean = createSimpleBean(TunedTuna.class);
manager.addBean(tunaBean);
TunedTuna tuna = manager.getInstance(tunaBean);
- assert configuration().getBeans().isProxy(tuna);
+ assert ConfigurationImpl.get().getBeans().isProxy(tuna);
byte[] bytes = serialize(tuna);
tuna = (TunedTuna) deserialize(bytes);
- assert configuration().getBeans().isProxy(tuna);
+ assert ConfigurationImpl.get().getBeans().isProxy(tuna);
assert tuna.getState().equals("tuned");
}
@@ -88,7 +87,7 @@
Bean<TunedTuna> tunaBean = createSimpleBean(TunedTuna.class);
manager.addBean(tunaBean);
TunedTuna tuna = manager.getInstance(tunaBean);
- assert configuration().getBeans().isProxy(tuna);
+ assert ConfigurationImpl.get().getBeans().isProxy(tuna);
assert tuna.getState().equals("tuned");
}
Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/unit/lookup/injection/InjectionTest.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -1,7 +1,5 @@
package org.jboss.webbeans.tck.unit.lookup.injection;
-import static org.jboss.webbeans.tck.impl.WebBeansTCKImpl.configuration;
-
import java.lang.annotation.Annotation;
import java.util.List;
@@ -12,6 +10,7 @@
import org.jboss.webbeans.tck.AbstractTest;
import org.jboss.webbeans.tck.SpecAssertion;
+import org.jboss.webbeans.tck.impl.ConfigurationImpl;
import org.jboss.webbeans.tck.impl.util.MockCreationalContext;
import org.testng.annotations.Test;
@@ -60,7 +59,7 @@
manager.addBean(tunaBean);
TunaFarm tunaFarm = tunaFarmBean.create(new MockCreationalContext<TunaFarm>());
assert tunaFarm.tuna != null;
- configuration().getContexts().setInactive(configuration().getContexts().getRequestContext());
+ ConfigurationImpl.get().getContexts().setInactive(ConfigurationImpl.get().getContexts().getRequestContext());
tunaFarm.tuna.getName();
}
Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/InContainerTestRunnerTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/InContainerTestRunnerTest.java 2009-02-08 15:03:03 UTC (rev 1452)
+++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/InContainerTestRunnerTest.java 2009-02-08 17:02:04 UTC (rev 1453)
@@ -1,66 +0,0 @@
-package org.jboss.webbeans.tck.test.impl;
-
-import java.io.InputStream;
-import java.lang.annotation.Annotation;
-import java.util.List;
-
-import javax.inject.manager.Manager;
-
-import org.jboss.webbeans.tck.api.TestSuite;
-import org.jboss.webbeans.tck.impl.InContainerTestRunner;
-import org.jboss.webbeans.tck.spi.Containers;
-
-public class InContainerTestRunnerTest
-{
-
- private static class MockInContainerTestRunner extends InContainerTestRunner
- {
-
- public MockInContainerTestRunner(TestSuite testSuite, Containers containers)
- {
- super(testSuite, containers);
- // TODO Auto-generated constructor stub
- }
-
- }
-
- private static class MockContainers implements Containers
- {
-
- public Manager deploy(List<Class<? extends Annotation>> enabledDeploymentTypes, InputStream archive)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Manager deploy(InputStream archive)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public <T> T evaluateMethodExpression(String expression, Class<T> expectedType, Class<?>[] expectedParamTypes, Object[] expectedParams)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public <T> T evaluateValueExpression(String expression, Class<T> expectedType)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- }
-
- //@Test
- public void testRunner()
- {
-// TestSuite testSuite = new TestSuite();
-// testSuite.setWriteDeployedArchivesToDisk(true);
-// testSuite.setDeploymentDelay(0);
-// MockInContainerTestRunner runner = new MockInContainerTestRunner(testSuite, new MockContainers());
-// runner.run();
- }
-
-}
17 years, 2 months