Author: pete.muir(a)jboss.org Date: 2009-02-06 16:28:34 -0500 (Fri, 06 Feb 2009) New Revision: 1433 Added: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/ 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/packaging/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/AbstractArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/Cow.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/DummyTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Cow.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Fox.java 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/artifactScanner/ArtifactScannerTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/DummyArtifact.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/NotAnArtifact.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/ 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/declarativeArtifact/unspecified/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Cow.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyEjbTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Fox.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/Rat.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Cow.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Fox.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/Cow.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests/Fox.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/Cow.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/DummyTest.java Removed: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/InContainerTestRunnerTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/Cow.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/ArtifactScannerTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/DummyArtifact.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/subpackage/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Cow.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyEjbTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Fox.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/pests/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/Cow.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/pests/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Cow.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Fox.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/NotAnArtifact.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/Rat.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Cow.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyCustomWebXmlTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Fox.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests/Fox.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/ArtifactTest.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/Cow.java Log: repackage tests Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/InContainerTestRunnerTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/InContainerTestRunnerTest.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/InContainerTestRunnerTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,66 +0,0 @@ -package org.jboss.webbeans.tck.impl.test; - -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(); - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,112 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Reader; -import java.util.Arrays; - -public abstract class AbstractArtifactTest -{ - - protected static final FilenameFilter WEB_INF_FILTER = new FilenameFilter() - { - public boolean accept(File dir, String name) - { - return name.equals("WEB-INF"); - } - }; - - protected static final FilenameFilter CLASSES_FILTER = new FilenameFilter() - { - public boolean accept(File dir, String name) - { - return name.equals("classes"); - } - }; - - protected static final FilenameFilter META_INF_FILTER = new FilenameFilter() - { - public boolean accept(File dir, String name) - { - return name.equals("META-INF"); - } - }; - - protected static final FilenameFilter BEANS_XML_FILTER = new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("beans.xml"); - } - - }; - - - - protected static final FilenameFilter WEB_XML_FILTER = new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals("web.xml"); - } - - }; - - protected File getCurrentPackageAsFile(File root) - { - return getPackageAsFile(getClass().getPackage(), root); - } - - protected File getPackageAsFile(Package pkg, File root) - { - String[] packageHierarchy = pkg.getName().split("\\."); - for (final String packageName : packageHierarchy) - { - File[] files = root.listFiles(new FilenameFilter() - { - - public boolean accept(File dir, String name) - { - return name.equals(packageName); - } - - }); - if (files.length == 1) - { - root = files[0]; - } - else - { - throw new IllegalStateException("Unable to traverse package hierarchy " + Arrays.asList(packageHierarchy) + ", unable to open directory " + packageName); - } - } - return root; - } - - protected String readFile(File file) throws IOException - { - if (file.isFile()) - { - Reader reader = new InputStreamReader(new BufferedInputStream(new FileInputStream(file))); - StringBuffer buffer = new StringBuffer(1024); - char[] bytes = new char[1024]; - while (reader.read(bytes) > -1) - { - buffer.append(String.valueOf(bytes)); - } - reader.close(); - return buffer.toString(); - } - else - { - return null; - } - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/ArtifactTest.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,26 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging; - -import java.io.File; - -import org.jboss.webbeans.tck.AbstractTest; -import org.jboss.webbeans.tck.impl.packaging.ArtifactDescriptor; -import org.jboss.webbeans.tck.impl.packaging.jsr299.TCKArtifactDescriptor; -import org.jboss.webbeans.tck.impl.util.Reflections; -import org.jboss.webbeans.tck.literals.NewLiteral; -import org.testng.annotations.Test; - -public class ArtifactTest extends AbstractArtifactTest -{ - - @Test - public void testDefaultTCKArtifact() throws Exception - { - ArtifactDescriptor artifactDescriptor = new TCKArtifactDescriptor(null, null); - File root = artifactDescriptor.getExplodedJar(); - assert getPackageAsFile(Reflections.class.getPackage(), root).listFiles().length > 0; - assert getPackageAsFile(NewLiteral.class.getPackage(), root).listFiles().length > 0; - assert getPackageAsFile(AbstractTest.class.getPackage(), root).listFiles().length > 0; - } - - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/Cow.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/Cow.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging; - -class Cow -{ - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/ArtifactScannerTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/ArtifactScannerTest.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/ArtifactScannerTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,24 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.artifactScanner; - -import java.util.Set; - -import org.jboss.webbeans.tck.impl.packaging.ArtifactScanner; -import org.jboss.webbeans.tck.impl.test.packaging.artifactScanner.subpackage.AnotherDummyArtifact; -import org.jboss.webbeans.tck.impl.test.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/webbeans/tck/impl/test/packaging/artifactScanner/DummyArtifact.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/DummyArtifact.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/DummyArtifact.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.artifactScanner; - -import org.jboss.webbeans.tck.impl.packaging.Artifact; - -@Artifact -public class DummyArtifact -{ - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/ArtifactTest.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,144 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.webbeans.tck.impl.packaging.DeclarativeArtifactProcessor; -import org.jboss.webbeans.tck.impl.packaging.jsr299.TCKArtifactDescriptor; -import org.jboss.webbeans.tck.impl.test.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); - 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 == 1; - 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); - 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); - 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 == 2; - 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); - assert !declarativeArtifactProcessor.getArtifact().isUnit(); - } - - @Test - public void testCustomBeansXml() throws Exception - { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyCustomBeansXmlTest.class, false); - 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(BEANS_XML_FILTER).length == 1; - assert metaInf.listFiles(BEANS_XML_FILTER)[0].length() != 0; - String beans = readFile(metaInf.listFiles(BEANS_XML_FILTER)[0]); - assert beans.startsWith("<my></my>"); - } - - //@Test - public void testEjbTestDeclartiveArtifact() throws Exception - { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyEjbTest.class, false); - assert declarativeArtifactProcessor.getArtifact().isEjbs(); - } - - @Test(expectedExceptions=IllegalArgumentException.class) - public void testWrongPackaging() - { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyWarUnitTest_Broken.class, false); - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Cow.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Cow.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified; - -class Cow -{ - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,18 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified; - -import org.jboss.webbeans.tck.impl.packaging.Artifact; -import org.jboss.webbeans.tck.impl.packaging.Classes; -import org.jboss.webbeans.tck.impl.test.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/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,16 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified; - -import org.jboss.webbeans.tck.impl.packaging.Artifact; -import org.jboss.webbeans.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/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyEjbTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyEjbTest.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyEjbTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,15 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified; - -import org.jboss.webbeans.tck.impl.packaging.EjbArtifact; - - -@EjbArtifact -class DummyEjbTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,17 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified; - -import org.jboss.webbeans.tck.impl.packaging.Artifact; -import org.jboss.webbeans.tck.impl.packaging.IntegrationTest; - - -@Artifact -@IntegrationTest -class DummyIntegrationTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,18 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified; - -import org.jboss.webbeans.tck.impl.packaging.Artifact; -import org.jboss.webbeans.tck.impl.packaging.Resource; -import org.jboss.webbeans.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/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyTest.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,15 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified; - -import org.jboss.webbeans.tck.impl.packaging.Artifact; - - -@Artifact -class DummyTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,18 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified; - -import org.jboss.webbeans.tck.impl.packaging.Artifact; -import org.jboss.webbeans.tck.impl.packaging.Packaging; -import org.jboss.webbeans.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/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Fox.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Fox.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Fox.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified; - -class Fox -{ - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,46 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.subpackages; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.webbeans.tck.impl.packaging.ArtifactDescriptor; -import org.jboss.webbeans.tck.impl.test.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/webbeans/tck/impl/test/packaging/subpackages/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/Cow.java 2009-02-06 21:25:39 UTC (rev 1432) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/Cow.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.subpackages; - -class Cow -{ - -} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/InContainerTestRunnerTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/InContainerTestRunnerTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/InContainerTestRunnerTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/InContainerTestRunnerTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,66 @@ +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(); + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/InContainerTestRunnerTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/AbstractArtifactTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/AbstractArtifactTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/AbstractArtifactTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/AbstractArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,112 @@ +package org.jboss.webbeans.tck.test.impl.packaging; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; +import java.util.Arrays; + +public abstract class AbstractArtifactTest +{ + + protected static final FilenameFilter WEB_INF_FILTER = new FilenameFilter() + { + public boolean accept(File dir, String name) + { + return name.equals("WEB-INF"); + } + }; + + protected static final FilenameFilter CLASSES_FILTER = new FilenameFilter() + { + public boolean accept(File dir, String name) + { + return name.equals("classes"); + } + }; + + protected static final FilenameFilter META_INF_FILTER = new FilenameFilter() + { + public boolean accept(File dir, String name) + { + return name.equals("META-INF"); + } + }; + + protected static final FilenameFilter BEANS_XML_FILTER = new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.equals("web-beans.xml"); + } + + }; + + + + protected static final FilenameFilter WEB_XML_FILTER = new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.equals("web.xml"); + } + + }; + + protected File getCurrentPackageAsFile(File root) + { + return getPackageAsFile(getClass().getPackage(), root); + } + + protected File getPackageAsFile(Package pkg, File root) + { + String[] packageHierarchy = pkg.getName().split("\\."); + for (final String packageName : packageHierarchy) + { + File[] files = root.listFiles(new FilenameFilter() + { + + public boolean accept(File dir, String name) + { + return name.equals(packageName); + } + + }); + if (files.length == 1) + { + root = files[0]; + } + else + { + throw new IllegalStateException("Unable to traverse package hierarchy " + Arrays.asList(packageHierarchy) + ", unable to open directory " + packageName); + } + } + return root; + } + + protected String readFile(File file) throws IOException + { + if (file.isFile()) + { + Reader reader = new InputStreamReader(new BufferedInputStream(new FileInputStream(file))); + StringBuffer buffer = new StringBuffer(1024); + char[] bytes = new char[1024]; + while (reader.read(bytes) > -1) + { + buffer.append(String.valueOf(bytes)); + } + reader.close(); + return buffer.toString(); + } + else + { + return null; + } + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/AbstractArtifactTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/ArtifactTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/ArtifactTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/ArtifactTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,44 @@ +package org.jboss.webbeans.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.webbeans.tck.impl.packaging.ArtifactDescriptor; +import org.jboss.webbeans.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/webbeans/tck/impl/util/Reflections.class"); + assert fileNames.contains("org/jboss/webbeans/tck/literals/NewLiteral.class"); + assert fileNames.contains("org/jboss/webbeans/tck/AbstractTest.class"); + assert fileNames.contains("org/jboss/webbeans/tck/impl/WebBeansTCKImpl.class"); + assert fileNames.contains("org/jboss/webbeans/tck/impl/packaging/ArtifactDescriptor.class"); + assert fileNames.contains("org/jboss/webbeans/tck/impl/packaging/jsr299/TCKArtifactDescriptor.class"); + assert fileNames.contains("org/jboss/webbeans/tck/impl/packaging/war/WarArtifactDescriptor.class"); + assert fileNames.contains("org/jboss/webbeans/tck/runner/TestRunner.class"); + assert fileNames.contains("org/jboss/webbeans/tck/runner/servlet/ServletTestRunner.class"); + } + + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/ArtifactTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/Cow.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/Cow.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/Cow.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/Cow.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.test.impl.packaging; + +class Cow +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/Cow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/DummyTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/DummyTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/DummyTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.test.impl.packaging; + +public class DummyTest +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/DummyTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all) Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java 2009-02-06 15:07:43 UTC (rev 1428) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,59 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.all; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.webbeans.tck.impl.packaging.ArtifactDescriptor; -import org.jboss.webbeans.tck.impl.test.packaging.AbstractArtifactTest; -import org.testng.annotations.Test; - -public class ArtifactTest extends AbstractArtifactTest -{ - - @Test - public void testAllClassesInPackage() throws Exception - { - ArtifactDescriptor artifactDescriptor = new ArtifactDescriptor(null); - artifactDescriptor.addPackage(ArtifactTest.class.getPackage()); - File root = artifactDescriptor.getExplodedJar(); - File currentPackage = getCurrentPackageAsFile(root); - assert currentPackage.listFiles().length == 6; - 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("ArtifactTest"); - } - - }); - assert testClasses.length == 4; - - } - -} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/ArtifactTest.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/ArtifactTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/ArtifactTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,59 @@ +package org.jboss.webbeans.tck.test.impl.packaging.all; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.webbeans.tck.impl.packaging.ArtifactDescriptor; +import org.jboss.webbeans.tck.test.impl.packaging.AbstractArtifactTest; +import org.testng.annotations.Test; + +public class ArtifactTest extends AbstractArtifactTest +{ + + @Test + public void testAllClassesInPackage() throws Exception + { + ArtifactDescriptor artifactDescriptor = new ArtifactDescriptor(null); + artifactDescriptor.addPackage(ArtifactTest.class.getPackage()); + File root = artifactDescriptor.getExplodedJar(); + File currentPackage = getCurrentPackageAsFile(root); + assert currentPackage.listFiles().length == 6; + 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("ArtifactTest"); + } + + }); + assert testClasses.length == 4; + + } + +} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Cow.java 2009-02-06 15:07:43 UTC (rev 1428) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Cow.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.all; - -class Cow -{ - -} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Cow.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Cow.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Cow.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Cow.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.test.impl.packaging.all; + +class Cow +{ + +} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Fox.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Fox.java 2009-02-06 15:07:43 UTC (rev 1428) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Fox.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.all; - -class Fox -{ - -} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Fox.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/all/Fox.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Fox.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/all/Fox.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.test.impl.packaging.all; + +class Fox +{ + +} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/ArtifactScannerTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/ArtifactScannerTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/ArtifactScannerTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/ArtifactScannerTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,24 @@ +package org.jboss.webbeans.tck.test.impl.packaging.artifactScanner; + +import java.util.Set; + +import org.jboss.webbeans.tck.impl.packaging.ArtifactScanner; +import org.jboss.webbeans.tck.test.impl.packaging.artifactScanner.subpackage.AnotherDummyArtifact; +import org.jboss.webbeans.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); + } + + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/ArtifactScannerTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/DummyArtifact.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/DummyArtifact.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/DummyArtifact.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/DummyArtifact.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.tck.test.impl.packaging.artifactScanner; + +import org.jboss.webbeans.tck.impl.packaging.Artifact; + +@Artifact +public class DummyArtifact +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/DummyArtifact.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/subpackage) Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java 2009-02-06 15:07:43 UTC (rev 1428) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.artifactScanner.subpackage; - -import org.jboss.webbeans.tck.impl.packaging.Artifact; - -@Artifact -public class AnotherDummyArtifact -{ - -} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/AnotherDummyArtifact.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.tck.test.impl.packaging.artifactScanner.subpackage; + +import org.jboss.webbeans.tck.impl.packaging.Artifact; + +@Artifact +public class AnotherDummyArtifact +{ + +} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/NotAnArtifact.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/subpackage/NotAnArtifact.java 2009-02-06 15:07:43 UTC (rev 1428) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/NotAnArtifact.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.artifactScanner.subpackage; - -public class NotAnArtifact -{ - -} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/NotAnArtifact.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/artifactScanner/subpackage/NotAnArtifact.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/NotAnArtifact.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/artifactScanner/subpackage/NotAnArtifact.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.test.impl.packaging.artifactScanner.subpackage; + +public class NotAnArtifact +{ + +} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/ArtifactTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,142 @@ +package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.webbeans.tck.impl.packaging.DeclarativeArtifactProcessor; +import org.jboss.webbeans.tck.impl.packaging.jsr299.TCKArtifactDescriptor; +import org.jboss.webbeans.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); + 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); + 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); + 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); + assert !declarativeArtifactProcessor.getArtifact().isUnit(); + } + + @Test + public void testCustomBeansXml() throws Exception + { + DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyCustomBeansXmlTest.class, false); + 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); + assert declarativeArtifactProcessor.getArtifact().isEjbs(); + } + + @Test(expectedExceptions=IllegalArgumentException.class) + public void testWrongPackaging() + { + DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyWarUnitTest_Broken.class, false); + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/ArtifactTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Cow.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Cow.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Cow.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Cow.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified; + +class Cow +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Cow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,18 @@ +package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified; + +import org.jboss.webbeans.tck.impl.packaging.Artifact; +import org.jboss.webbeans.tck.impl.packaging.Classes; +import org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified.pests.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/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyClassesSpecifiedTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,16 @@ +package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified; + +import org.jboss.webbeans.tck.impl.packaging.Artifact; +import org.jboss.webbeans.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/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyCustomBeansXmlTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyEjbTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyEjbTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyEjbTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyEjbTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,15 @@ +package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified; + +import org.jboss.webbeans.tck.impl.packaging.EjbArtifact; + + +@EjbArtifact +class DummyEjbTest +{ + + public void test() + { + assert true; + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyEjbTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,17 @@ +package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified; + +import org.jboss.webbeans.tck.impl.packaging.Artifact; +import org.jboss.webbeans.tck.impl.packaging.IntegrationTest; + + +@Artifact +@IntegrationTest +class DummyIntegrationTest +{ + + public void test() + { + assert true; + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyIntegrationTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,18 @@ +package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified; + +import org.jboss.webbeans.tck.impl.packaging.Artifact; +import org.jboss.webbeans.tck.impl.packaging.Resource; +import org.jboss.webbeans.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/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyResourcesSpecifiedTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,15 @@ +package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified; + +import org.jboss.webbeans.tck.impl.packaging.Artifact; + + +@Artifact +class DummyTest +{ + + public void test() + { + assert true; + } + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,18 @@ +package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified; + +import org.jboss.webbeans.tck.impl.packaging.Artifact; +import org.jboss.webbeans.tck.impl.packaging.Packaging; +import org.jboss.webbeans.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/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/DummyWarUnitTest_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Fox.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/Fox.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Fox.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Fox.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified; + +class Fox +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/Fox.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/pests) Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/Rat.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/pests/Rat.java 2009-02-06 15:07:43 UTC (rev 1428) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/Rat.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.unspecified.pests; - -public class Rat -{ - -} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/Rat.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/unspecified/pests/Rat.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/Rat.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/unspecified/pests/Rat.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.unspecified.pests; + +public class Rat +{ + +} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war) Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/ArtifactTest.java 2009-02-06 15:07:43 UTC (rev 1428) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,49 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.war; - -import java.io.File; - -import org.jboss.webbeans.tck.impl.packaging.DeclarativeArtifactProcessor; -import org.jboss.webbeans.tck.impl.packaging.jsr299.TCKArtifactDescriptor; -import org.jboss.webbeans.tck.impl.test.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); - 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().length == 2; - 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; - } - - @Test - public void testCustomWebXml() throws Exception - { - DeclarativeArtifactProcessor declarativeArtifactProcessor = new DeclarativeArtifactProcessor(DummyCustomWebXmlTest.class, false); - 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().length == 2; - 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 readFile(webXml).startsWith("<web></web>"); - } - -} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/ArtifactTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,30 @@ +package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.war; + +import java.io.File; + +import org.jboss.webbeans.tck.impl.packaging.DeclarativeArtifactProcessor; +import org.jboss.webbeans.tck.impl.packaging.jsr299.TCKArtifactDescriptor; +import org.jboss.webbeans.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); + 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; + } + +} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/Cow.java 2009-02-06 15:07:43 UTC (rev 1428) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Cow.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.war; - -class Cow -{ - -} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Cow.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/Cow.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Cow.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Cow.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.war; + +class Cow +{ + +} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyCustomWebXmlTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/DummyCustomWebXmlTest.java 2009-02-06 15:07:43 UTC (rev 1428) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyCustomWebXmlTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,22 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.war; - -import org.jboss.webbeans.tck.impl.packaging.Artifact; -import org.jboss.webbeans.tck.impl.packaging.IntegrationTest; -import org.jboss.webbeans.tck.impl.packaging.Packaging; -import org.jboss.webbeans.tck.impl.packaging.PackagingType; -import org.jboss.webbeans.tck.impl.packaging.war.WebXml; - - -@Artifact -@IntegrationTest -(a)Packaging(PackagingType.WAR) -(a)WebXml(&quot;my-web.xml&quot;) -class DummyCustomWebXmlTest -{ - - public void test() - { - assert true; - } - -} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/DummyTest.java 2009-02-06 15:07:43 UTC (rev 1428) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,20 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.war; - -import org.jboss.webbeans.tck.impl.packaging.Artifact; -import org.jboss.webbeans.tck.impl.packaging.IntegrationTest; -import org.jboss.webbeans.tck.impl.packaging.Packaging; -import org.jboss.webbeans.tck.impl.packaging.PackagingType; - - -@Artifact -@IntegrationTest -(a)Packaging(PackagingType.WAR) -class DummyTest -{ - - public void test() - { - assert true; - } - -} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyTest.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/DummyTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/DummyTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,20 @@ +package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.war; + +import org.jboss.webbeans.tck.impl.packaging.Artifact; +import org.jboss.webbeans.tck.impl.packaging.IntegrationTest; +import org.jboss.webbeans.tck.impl.packaging.Packaging; +import org.jboss.webbeans.tck.impl.packaging.PackagingType; + + +@Artifact +@IntegrationTest +(a)Packaging(PackagingType.WAR) +class DummyTest +{ + + public void test() + { + assert true; + } + +} Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Fox.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/Fox.java 2009-02-06 15:07:43 UTC (rev 1428) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Fox.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.declarativeArtifact.war; - -class Fox -{ - -} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Fox.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/Fox.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Fox.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/declarativeArtifact/war/Fox.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.test.impl.packaging.declarativeArtifact.war; + +class Fox +{ + +} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/ArtifactTest.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/ArtifactTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/ArtifactTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,46 @@ +package org.jboss.webbeans.tck.test.impl.packaging.subpackages; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.webbeans.tck.impl.packaging.ArtifactDescriptor; +import org.jboss.webbeans.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; + } + +} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/Cow.java (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/Cow.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/Cow.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/Cow.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.test.impl.packaging.subpackages; + +class Cow +{ + +} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/pests) Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests/Fox.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/pests/Fox.java 2009-02-06 15:07:43 UTC (rev 1428) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests/Fox.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.subpackages.pests; - -class Fox -{ - -} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests/Fox.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/subpackages/pests/Fox.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests/Fox.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/subpackages/pests/Fox.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.test.impl.packaging.subpackages.pests; + +class Fox +{ + +} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war (from rev 1428, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war) Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/ArtifactTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/ArtifactTest.java 2009-02-06 15:07:43 UTC (rev 1428) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,87 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.war; - -import java.io.File; -import java.io.FilenameFilter; -import java.util.ArrayList; -import java.util.List; -import java.util.jar.JarEntry; -import java.util.jar.JarInputStream; - -import org.jboss.webbeans.tck.impl.packaging.war.WarArtifactDescriptor; -import org.jboss.webbeans.tck.impl.test.packaging.AbstractArtifactTest; -import org.testng.annotations.Test; - -public class ArtifactTest extends AbstractArtifactTest -{ - @Test - public void testDefaultWar() throws Exception - { - WarArtifactDescriptor war = new WarArtifactDescriptor(null, null, null); - war.getClasses().add(Cow.class); - File root = war.getExplodedJar(); - assert root.listFiles().length == 2; - assert root.isDirectory(); - assert root.listFiles(WEB_INF_FILTER).length == 1; - File metaInf = root.listFiles(META_INF_FILTER)[0]; - assert metaInf.getName().equals("META-INF"); - assert metaInf.isDirectory(); - assert metaInf.listFiles().length == 1; - assert metaInf.listFiles(BEANS_XML_FILTER).length == 1; - File beansXml = metaInf.listFiles(BEANS_XML_FILTER)[0]; - assert beansXml.isFile(); - assert beansXml.getName().equals("beans.xml"); - assert beansXml.length() == 0; - File webInf = root.listFiles(WEB_INF_FILTER)[0]; - assert webInf.getName().equals("WEB-INF"); - assert webInf.isDirectory(); - assert webInf.listFiles().length == 2; - 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 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(); - } - - - @Test - public void testJarProduction() throws Exception - { - WarArtifactDescriptor war = new WarArtifactDescriptor(null, null, 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("META-INF/beans.xml"); - assert fileNames.contains("WEB-INF/web.xml"); - assert fileNames.contains("WEB-INF/classes/org/jboss/webbeans/tck/impl/test/packaging/war/Cow.class"); - assert fileNames.contains("WEB-INF/classes/org/jboss/webbeans/tck/AbstractTest.class"); - assert fileNames.contains("WEB-INF/classes/org/jboss/webbeans/tck/impl/util/Reflections.class"); - } - - @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); - } - -} - Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/ArtifactTest.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/ArtifactTest.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/ArtifactTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/ArtifactTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,100 @@ +package org.jboss.webbeans.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.webbeans.tck.AbstractTest; +import org.jboss.webbeans.tck.impl.packaging.war.WarArtifactDescriptor; +import org.jboss.webbeans.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/webbeans/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); + } + +} + Deleted: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/Cow.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/Cow.java 2009-02-06 15:07:43 UTC (rev 1428) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/Cow.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -1,6 +0,0 @@ -package org.jboss.webbeans.tck.impl.test.packaging.war; - -class Cow -{ - -} Copied: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/Cow.java (from rev 1432, tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/war/Cow.java) =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/Cow.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/Cow.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.test.impl.packaging.war; + +class Cow +{ + +} Added: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/DummyTest.java =================================================================== --- tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/DummyTest.java (rev 0) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/DummyTest.java 2009-02-06 21:28:34 UTC (rev 1433) @@ -0,0 +1,6 @@ +package org.jboss.webbeans.tck.test.impl.packaging.war; + +public class DummyTest +{ + +} Property changes on: tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/test/impl/packaging/war/DummyTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain