Author: pete.muir(a)jboss.org Date: 2009-02-04 13:58:04 -0500 (Wed, 04 Feb 2009) New Revision: 1413 Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/DeclarativeArtifactProcessor.java tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/ArtifactTest.java Log: Create the correct artifact depending on test type Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/DeclarativeArtifactProcessor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/DeclarativeArtifactProcessor.java 2009-02-04 18:46:21 UTC (rev 1412) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/impl/packaging/DeclarativeArtifactProcessor.java 2009-02-04 18:58:04 UTC (rev 1413) @@ -117,18 +117,32 @@ public TCKArtifactDescriptor getArtifact() { + return getArtifact(true); + } + + public TCKArtifactDescriptor getArtifact(boolean standalone) + { final TCKArtifactDescriptor artifact; - switch (packagingType) + if (packagingType.equals(WAR)) { - case WAR: artifact = new WarArtifactDescriptor(beansXml, webXml); - break; - case EAR: - throw new UnsupportedOperationException(); - default: - artifact = new TCKArtifactDescriptor(beansXml); - break; + } + else if (packagingType.equals(EAR)) + { + throw new UnsupportedOperationException(); } + else if (standalone) + { + artifact = new TCKArtifactDescriptor(beansXml); + } + else if (ejbs) + { + throw new UnsupportedOperationException(); + } + else + { + artifact = new WarArtifactDescriptor(beansXml, null); + } if (addDeclaringPackage) { artifact.getPackages().add(declaringClass.getPackage()); Modified: 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/impl/test/packaging/declarativeArtifact/war/ArtifactTest.java 2009-02-04 18:46:21 UTC (rev 1412) +++ tck/trunk/impl/src/test/java/org/jboss/webbeans/tck/impl/test/packaging/declarativeArtifact/war/ArtifactTest.java 2009-02-04 18:58:04 UTC (rev 1413) @@ -20,7 +20,7 @@ File webInf = root.listFiles(WEB_INF_FILTER)[0]; assert webInf.getName().equals("WEB-INF"); assert webInf.isDirectory(); - assert webInf.listFiles().length == 1; + assert webInf.listFiles().length == 2; assert webInf.listFiles(WEB_XML_FILTER).length == 1; File webXml = webInf.listFiles(WEB_XML_FILTER)[0]; assert webXml.isFile(); @@ -38,7 +38,7 @@ File webInf = root.listFiles(WEB_INF_FILTER)[0]; assert webInf.getName().equals("WEB-INF"); assert webInf.isDirectory(); - assert webInf.listFiles().length == 1; + assert webInf.listFiles().length == 2; assert webInf.listFiles(WEB_XML_FILTER).length == 1; File webXml = webInf.listFiles(WEB_XML_FILTER)[0]; assert webXml.isFile();