Author: richard.opalka(a)jboss.com Date: 2008-07-09 06:45:48 -0400 (Wed, 09 Jul 2008) New Revision: 7803 Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/wstools-config.xml Log: [JBPAPP-921] fix test Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-07-09 09:03:45 UTC (rev 7802) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-07-09 10:45:48 UTC (rev 7803) @@ -26,6 +26,7 @@ </classpath> </taskdef> + <macro-wstools dest="tools/jbpapp921" config="tools/jbpapp921/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/docstyle/wrapped/WEB-INF" config="jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/docstyle/bare/WEB-INF" config="jaxrpc/samples/docstyle/bare/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/dynamichandler/WEB-INF" config="jaxrpc/samples/dynamichandler/wstools-config.xml"/> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java 2008-07-09 09:03:45 UTC (rev 7802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbpapp921/JBPAPP921TestCase.java 2008-07-09 10:45:48 UTC (rev 7803) @@ -22,6 +22,7 @@ package org.jboss.test.ws.tools.jbpapp921; import java.io.File; +import java.util.Arrays; import org.jboss.test.ws.tools.fixture.JBossSourceComparator; import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; @@ -30,21 +31,21 @@ public class JBPAPP921TestCase extends JBossWSTest { + private static final String resourceDir = "tools/jbpapp921"; + private static final String toolsDir = "target/wstools/jbpapp921/output"; - private static final String resourceDir = "resources/tools/jbpapp921"; - private static final String toolsDir = "tools/jbpapp921"; - public void testGenerate() throws Exception { - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + String realResourceDir = getResourceFile("tools/jbpapp921").getAbsolutePath(); + String[] args = new String[] { "-dest", toolsDir, "-config", realResourceDir + "/wstools-config.xml" }; new WSTools().generate(args); compareSource("Models_ServiceIM_ServiceProxyService.java"); compareSource("ValidationEvent_test.java"); } - private static void compareSource(final String fileName) throws Exception + private void compareSource(final String fileName) throws Exception { - File expected = new File(resourceDir + "/" + fileName); + File expected = getResourceFile(resourceDir + "/" + fileName); File generated = new File(toolsDir + "/org/jboss/test/ws/jbpapp921/" + fileName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/wstools-config.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/wstools-config.xml 2008-07-09 09:03:45 UTC (rev 7802) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/tools/jbpapp921/wstools-config.xml 2008-07-09 10:45:48 UTC (rev 7803) @@ -1,4 +1,4 @@ <configuration> - <wsdl-java location="resources/tools/jbpapp921/test.wsdl"> + <wsdl-java location=&quot;@test.resources.directory(a)/tools/jbpapp921/test.wsdl&quot;&gt; </wsdl-java> </configuration> \ No newline at end of file