Author: heiko.braun(a)jboss.com Date: 2008-05-07 16:14:37 -0400 (Wed, 07 May 2008) New Revision: 6952 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java Log: Fix jbws1679 tests Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-05-07 20:08:21 UTC (rev 6951) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-05-07 20:14:37 UTC (rev 6952) @@ -47,12 +47,13 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1278/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1278/" + 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"); @@ -73,7 +74,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1278"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1278"); 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/jbws1697/JBWS1697TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-05-07 20:08:21 UTC (rev 6951) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-05-07 20:14:37 UTC (rev 6952) @@ -64,12 +64,13 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1697/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1697/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1697/" + scenario); + resourceDir.mkdirs(); + String toolsDir = resourceDir.getAbsolutePath(); //"tools/jbws1697/" + scenario; + 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"); @@ -90,7 +91,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1697"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1697"); String[] generatedFiles = packageDir.list(); for (int i = 0; i < generatedFiles.length; i++) {