[jbossws-commits] JBossWS SVN: r6953 - in stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools: jbws1090 and 2 other directories.

Author: heiko.braun(a)jboss.com Date: 2008-05-07 16:39:26 -0400 (Wed, 07 May 2008) New Revision: 6953 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java Log: Additional tools test fixes ;) Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java 2008-05-07 20:14:37 UTC (rev 6952) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/WSToolsBase.java 2008-05-07 20:39:26 UTC (rev 6953) @@ -202,9 +202,9 @@ protected void validateXML(String fixtureFile, String genFile) throws Exception { - File wsdlfix = createResourceFile(fixtureFile); + File wsdlfix = new File(fixtureFile); Element exp = DOMUtils.parse(wsdlfix.toURL().openStream()); - File wsdlFile = createResourceFile(genFile); + File wsdlFile = new File(genFile); assertNotNull("Generated WSDL File exists?", wsdlFile); Element was = DOMUtils.parse(wsdlFile.toURL().openStream()); assertEquals(exp, was); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2008-05-07 20:14:37 UTC (rev 6952) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2008-05-07 20:39:26 UTC (rev 6953) @@ -42,11 +42,12 @@ public void testWebServicesAppend() throws Exception { // create output dir - createResourceFile("tools/jbws1090").mkdirs(); + File resourceDir = createResourceFile("tools/jbws1090"); + resourceDir.mkdirs(); // copy webservices.xml fixture to output folder FileInputStream src = new FileInputStream(getResourceFile("tools/metadatafixture/webservices.xml").getPath()); - FileOutputStream dest = new FileOutputStream("tools/jbws1090/webservices.xml"); + FileOutputStream dest = new FileOutputStream(createResourceFile("tools/jbws1090/webservices.xml")); IOUtils.copyStream(dest, src); src.close(); dest.close(); @@ -56,7 +57,7 @@ new WSTools().generate(args); Element expected = DOMUtils.parse(new FileInputStream(getResourceFile("tools/jbws1090/webservices.xml").getPath())); - Element was = DOMUtils.parse(new FileInputStream("tools/jbws1090/webservices.xml")); + Element was = DOMUtils.parse(new FileInputStream(getResourceFile("tools/jbws1090/webservices.xml"))); assertEquals(expected, was); } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-05-07 20:14:37 UTC (rev 6952) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-05-07 20:39:26 UTC (rev 6953) @@ -79,12 +79,13 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1597/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1597/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1597/" + scenario); + resourceDir.mkdirs(); + String toolsDir = resourceDir.getAbsolutePath(); + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); - File resourceDirFile = createResourceFile(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + + String[] expectedFiles = resourceDir.list(new FilenameFilter() { public boolean accept(File dir, String name) { return name.endsWith(".java"); @@ -105,7 +106,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1597"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1597"); String[] generatedFiles = packageDir.list(); for (int i = 0; i < generatedFiles.length; i++) { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2008-05-07 20:14:37 UTC (rev 6952) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2008-05-07 20:39:26 UTC (rev 6953) @@ -58,7 +58,7 @@ public void checkServiceEndpointInterface() throws Exception { - String out_dir = "tools/jbws-206/jbossws/" + getBase(); + String out_dir = getResourceFile("tools/jbws-206/jbossws/" + getBase()).getAbsolutePath(); String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getAbsolutePath(); String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase(); @@ -66,36 +66,36 @@ String sei = fixBase + "/sei/" + seiName; // Check the sei // assertExactSourceFiles(createResourceFile(sei), createResourceFile(out_dir + "/client/" + packageDir + "/" + seiName )); - assertExactSourceFiles(createResourceFile(sei), createResourceFile(out_dir + "/" + packageDir + "/" + seiName)); + assertExactSourceFiles(new File(sei), new File(out_dir + "/" + packageDir + "/" + seiName)); } public void checkServiceInterface() throws Exception { - String out_dir = "tools/jbws-206/jbossws/" + getBase(); + String out_dir = getResourceFile("tools/jbws-206/jbossws/" + getBase()).getAbsolutePath(); String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getAbsolutePath(); String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase(); String serviceName = getServiceName(); // Check the Service File - assertExactSourceFiles(createResourceFile(fixBase + "/service/" + serviceName + ".java"), createResourceFile(out_dir + "/" + packageDir + "/" + serviceName + ".java")); + assertExactSourceFiles(new File(fixBase + "/service/" + serviceName + ".java"), new File(out_dir + "/" + packageDir + "/" + serviceName + ".java")); //createResourceFile(out_dir + "/client/" + packageDir + "/" + serviceName + ".java" )); } public final void checkUserType(String name) throws Exception { - String out_dir = "tools/jbws-206/jbossws/" + getBase(); + String out_dir = getResourceFile("tools/jbws-206/jbossws/" + getBase()).getAbsolutePath(); String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getAbsolutePath(); String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase(); // Check User Types - assertExactSourceFiles(createResourceFile(fixBase + "/usertypes/" + name), createResourceFile(out_dir + "/" + packageDir + "/" + name)); + assertExactSourceFiles(new File(fixBase + "/usertypes/" + name), new File(out_dir + "/" + packageDir + "/" + name)); //createResourceFile(out_dir + "/client/" + packageDir + "/" + name )); } protected final void generate() throws Exception { - String out_dir = "tools/jbws-206/jbossws/" + getBase(); + String out_dir = getResourceFile("tools/jbws-206/jbossws/" + getBase()).getAbsolutePath(); String configloc = getResourceFile("tools/jbws-206/jbosswsConfig/" + getBase() + "/" + getBase() + "wsdl2java.xml").getAbsolutePath(); String[] args = new String[] { "-dest", out_dir, "-config", configloc };