Author: heiko.braun(a)jboss.com Date: 2008-05-08 04:49:39 -0400 (Thu, 08 May 2008) New Revision: 6956 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/globalconfig/GlobalConfigTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.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/jbws1253/JBWS1253TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java Log: Fix remaining wstools tests Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/globalconfig/GlobalConfigTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/globalconfig/GlobalConfigTestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/globalconfig/GlobalConfigTestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -49,21 +49,27 @@ public void testJavaToWSDL() throws IOException { - String[] args = new String[] { "-dest", "tools/globalconfig", "-config", getResourceFile("tools/config/java2wsdlglobal.xml").getPath() }; + File dir = createResourceFile("tools/globalconfig"); + dir.mkdirs(); + + String[] args = new String[] { "-dest", dir.getAbsolutePath(), "-config", getResourceFile("tools/config/java2wsdlglobal.xml").getAbsolutePath() }; WSTools tools = new WSTools(); tools.generate(args); - WSDLDefinitions wsdl = getWSDLDefinitions(createResourceFile("tools/globalconfig/wsdl/MarshallService.wsdl")); + WSDLDefinitions wsdl = getWSDLDefinitions(getResourceFile("tools/globalconfig/wsdl/MarshallService.wsdl")); JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); assertNotNull(xsmodel.getNamespaceItem("http://jboss.org/types")); } public void testWSDLToJava() throws IOException, ClassNotFoundException { - String[] args = new String[] { "-dest", "tools/globalconfig", "-config", getResourceFile("tools/config/wsdl2javaglobal.xml").getPath() }; + File dir = createResourceFile("tools/globalconfig"); + dir.mkdirs(); + + String[] args = new String[] { "-dest", dir.getAbsolutePath(), "-config", getResourceFile("tools/config/wsdl2javaglobal.xml").getPath() }; WSTools tools = new WSTools(); tools.generate(args); - File file = createResourceFile("tools/globalconfig/org/jboss/test/ws/StandardJavaTypes.java"); + File file = getResourceFile("tools/globalconfig/org/jboss/test/ws/StandardJavaTypes.java"); assertTrue(file.exists()); checkGeneratedClass(file); } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -46,7 +46,7 @@ public void testTrivialCase() throws Exception { Class seiClass = TrivialService.class; - String wsdlDir = "tools/"; + String wsdlDir = createResourceFile("tools/").getAbsolutePath(); String sname = "SampleService"; String wsdlPath = wsdlDir+ "/" + sname + ".wsdl"; JavaToWSDL jwsdl = new JavaToWSDL(Constants.NS_WSDL11); @@ -57,15 +57,15 @@ jwsdl.addFeature(WSToolsConstants.WSTOOLS_FEATURE_RESTRICT_TO_TARGET_NS, true); WSDLDefinitions wsdl = jwsdl.generate(seiClass); - Writer fw = IOUtils.getCharsetFileWriter(createResourceFile(wsdlPath), Constants.DEFAULT_XML_CHARSET); + Writer fw = IOUtils.getCharsetFileWriter(new File(wsdlPath), Constants.DEFAULT_XML_CHARSET); new WSDLWriter(wsdl).write(fw, Constants.DEFAULT_XML_CHARSET); fw.close(); String fixturefile = getResourceFile("tools/doc-lit/trivial/wsdl/SampleService.wsdl").getAbsolutePath(); //Validate the generated WSDL - File wsdlfix = createResourceFile(fixturefile); + File wsdlfix = new File(fixturefile); Element exp = DOMUtils.parse(wsdlfix.toURL().openStream()); - File wsdlFile = createResourceFile(wsdlPath); + File wsdlFile = new File(wsdlPath); 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/holders/StandardHoldersTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -61,7 +61,7 @@ //Now validate the SEI String fname="HoldersServiceInterface.java"; File file1 = getResourceFile("tools/holders/java/org/jboss/test/"+ fname); - File file2 = createResourceFile("tools/org/jboss/test/" + fname); + File file2 = getResourceFile("tools/org/jboss/test/" + fname); try { @@ -83,9 +83,11 @@ WSDLDefinitions wsdl = jwsdl.generate(HoldersServiceInterface.class); //Generate the wsdl - String wsdlDir = "tools/"; - String wsdlPath = wsdlDir+ "/HolderService.wsdl"; - Writer fw = IOUtils.getCharsetFileWriter(createResourceFile(wsdlPath), Constants.DEFAULT_XML_CHARSET); + File wsdlDir = createResourceFile("tools/"); + wsdlDir.mkdirs(); + + String wsdlPath = wsdlDir.getAbsolutePath()+ "/HolderService.wsdl"; + Writer fw = IOUtils.getCharsetFileWriter(new File(wsdlPath), Constants.DEFAULT_XML_CHARSET); new WSDLWriter(wsdl).write(fw, Constants.DEFAULT_XML_CHARSET); fw.close(); @@ -94,12 +96,13 @@ try { String fixturefile = getResourceFile("tools/holders/wsdl/HolderService.wsdl").getAbsolutePath(); - File wsdlfix = createResourceFile(fixturefile); + File wsdlfix = new File(fixturefile); Element exp = DOMUtils.parse(wsdlfix.toURL().openStream()); - File wsdlFile = createResourceFile(wsdlPath); + File wsdlFile = getResourceFile(wsdlPath); assertNotNull("Generated WSDL File exists?", wsdlFile); Element was = DOMUtils.parse(wsdlFile.toURL().openStream()); assertEquals(exp,was); + //Now that we have figured out that the wsdl files are well formed, //lets do the semantic wsdl validation WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); @@ -144,14 +147,15 @@ private void generateSEI(WSDLDefinitions wsdl) { - String seidir = "tools"; + File seidir = createResourceFile("tools"); + seidir.mkdirs(); WSDLToJavaIntf wsdljava = new WSDLToJava(); //Generate the SEI try { wsdljava.setTypeMapping(new LiteralTypeMapping()); - wsdljava.generateSEI(wsdl, createResourceFile(seidir)); + wsdljava.generateSEI(wsdl, seidir); } catch (Exception e) { 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-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -42,7 +42,7 @@ public void testWebServicesAppend() throws Exception { // create output dir - File resourceDir = createResourceFile("tools/jbws1090"); + File resourceDir = createResourceFile("tools/jbws1090"); resourceDir.mkdirs(); // copy webservices.xml fixture to output folder Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -38,23 +38,23 @@ { public final void testPortTypePort() throws Exception { - String resourceDir = createResourceFile("tools/jbws1253").getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1253"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1253"); + String toolsDir = resourceDir.getAbsolutePath(); + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/myporttype-mapping.xml", toolsDir + "/myporttype-mapping.xml"); + mappingValidator.validate(resourceDir.getAbsolutePath() + "/myporttype-mapping.xml", toolsDir + "/myporttype-mapping.xml"); - File expSEI = createResourceFile(resourceDir + "/My.java"); - File wasSEI = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1253/My.java"); + File expSEI = getResourceFile(resourceDir + "/My.java"); + File wasSEI = getResourceFile(toolsDir + "/org/jboss/test/ws/jbws1253/My.java"); JBossSourceComparator sc = new JBossSourceComparator(expSEI, wasSEI); sc.validate(); sc.validateImports(); - File expService = createResourceFile(resourceDir + "/TestSEIService.java"); - File wasService = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1253/TestSEIService.java"); + File expService = new File(resourceDir.getAbsolutePath() + "/TestSEIService.java"); + File wasService = new File(toolsDir + "/org/jboss/test/ws/jbws1253/TestSEIService.java"); sc = new JBossSourceComparator(expService, wasService); sc.validate(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -122,13 +122,12 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1450/scenario_" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1450/scenario_" + scenario); + 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"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -47,13 +47,15 @@ */ public void testGenerate() throws Exception { - String resourceDir = createResourceFile("tools/jbws1453").getAbsolutePath(); - String toolsDir = resourceDir; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1453"); + 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"); @@ -74,7 +76,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1453"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1453"); 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/jbws1534/JBWS1534TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -61,13 +61,12 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1534/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1534/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1534/" + scenario); + 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"); @@ -88,7 +87,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1534"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1534"); 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/jbws1607/JBWS1607TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -49,13 +49,14 @@ */ public void testGenerate() throws Exception { - String resourceDir = createResourceFile("tools/jbws1607").getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1607"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1607"); + 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"); @@ -76,7 +77,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1607"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1607"); 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/jbws1627/JBWS1627TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -48,13 +48,14 @@ */ public void testGenerate() throws Exception { - String resourceDir = createResourceFile("tools/jbws1627").getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1627"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1627"); + 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"); @@ -75,7 +76,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1627"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1627"); 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/jbws1691/JBWS1691TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -48,12 +48,13 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1691/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1691/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1691/" + 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"); @@ -74,7 +75,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1691"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1691"); 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/jbws1698/JBWS1698TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -59,12 +59,13 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1698/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1698/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1698/" + scenario); + 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"); @@ -85,7 +86,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1698"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1698"); 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/jbws1723/JBWS1723TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -51,12 +51,14 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1723/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1723/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1723/" + 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"); @@ -77,7 +79,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1723"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1723"); 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/jbws1801/JBWS1801TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -51,12 +51,13 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1801/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1801/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1801/" + scenario); + 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"); @@ -77,7 +78,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1801"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1801"); 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/jbws1873/JBWS1873TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -47,12 +47,14 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws1873/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws1873/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1873/" + 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 +75,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1873"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1873"); 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/jbws2019/JBWS2019TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -47,12 +47,12 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws2019/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws2019/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws2019/" + scenario); + 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 +73,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws2019"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws2019"); 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/jbws429/JBWS429TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -75,12 +75,14 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = createResourceFile("tools/jbws429/" + scenario).getAbsolutePath(); - String toolsDir = resourceDir; //"tools/jbws429/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws429/" + 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"); @@ -101,7 +103,7 @@ } } - File packageDir = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws429"); + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws429"); 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/jbws810/JBWS810TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -35,9 +35,17 @@ */ public class JBWS810TestCase extends JBossWSTest { - private String resourceDir = createResourceFile("tools/jbws810").getAbsolutePath(); - private String toolsDir = resourceDir; //"tools/jbws810"; + private File resourceDir; + private String toolsDir; + + protected void setUp() throws Exception + { + resourceDir = createResourceFile("tools/jbws810"); + resourceDir.mkdirs(); + toolsDir = resourceDir.getAbsolutePath(); + } + public void testDocument() throws Exception { runTest("document"); @@ -51,7 +59,7 @@ public void runTest(final String type) throws Exception { String testToolsDir = toolsDir + "/" + type; - String testResourceDir = resourceDir + "/" + type; + String testResourceDir = resourceDir.getAbsolutePath() + "/" + type; String[] args = new String[] { "-dest", testToolsDir, "-config", testResourceDir + "/wstools-config.xml" }; new WSTools().generate(args); @@ -64,8 +72,8 @@ private void compareSource(final String type, final String fileName) throws Exception { - File expected = createResourceFile(resourceDir + "/" + type + "/" + fileName); - File generated = createResourceFile(toolsDir + "/" + type + "/org/jboss/test/ws/jbws810/" + fileName); + File expected = new File(resourceDir + "/" + type + "/" + fileName); + File generated = new File(toolsDir + "/" + type + "/org/jboss/test/ws/jbws810/" + fileName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2008-05-08 08:36:21 UTC (rev 6955) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2008-05-08 08:49:39 UTC (rev 6956) @@ -34,7 +34,7 @@ */ public class ScriptTestCase extends JBossWSTest { - private String TOOLS_CONFIG = getResourceFile("tools/scripts/wstools-config.xml").getPath(); + private String TOOLS_CONFIG = getResourceFile("tools/scripts/wstools-config.xml").getAbsolutePath(); private String JBOSS_HOME; private String JDK_HOME; @@ -58,17 +58,17 @@ fail("This test has not been verified on windows"); } - // use absolute path for the output to be re-usable - String absToolsConfig = createResourceFile(TOOLS_CONFIG).getAbsolutePath(); - String absOutput = createResourceFile("wstools/java").getAbsolutePath(); + // use absolute path for the output to be re-usable + File dest = createResourceFile("wstools/java"); + dest.mkdirs(); - String command = JBOSS_HOME + "/bin/wstools.sh -config " + TOOLS_CONFIG + " -dest wstools/java"; + String command = JBOSS_HOME + "/bin/wstools.sh -config " + TOOLS_CONFIG + " -dest "+ dest.getAbsolutePath(); Process p = executeCommand(command); // check status code assertStatusCode(p, "wstools"); - File javaSource = createResourceFile("wstools/java/org/jboss/test/ws/jbws810/PhoneBookService.java"); + File javaSource = getResourceFile("wstools/java/org/jboss/test/ws/jbws810/PhoneBookService.java"); assertTrue("Service endpoint interface not generated", javaSource.exists()); }