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

Author: heiko.braun(a)jboss.com Date: 2008-05-07 16:04:18 -0400 (Wed, 07 May 2008) New Revision: 6950 Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.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/enums/EnumTestCase.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/jbws1079/JBWS1079TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.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/jbws1259/JBWS1259TestCase.java 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/jbws1428/JBWS1428TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.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/jbws1455/JBWS1455TestCase.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/jbws1536/JBWS1536TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.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/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/jbws1645/JBWS1645TestCase.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/jbws1697/JBWS1697TestCase.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/jbws1725/JBWS1725TestCase.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/jbws2018/JBWS2018TestCase.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/jbws818/JBWS818TestCase.java 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_211/tests/JBWS211Test.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java Log: Moving on with tools tests fixes Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -55,7 +55,7 @@ public void testPrimitiveTypes() throws Exception { Class seiClass = PrimitiveTypes.class; - String fixturefile = getResourceFile("tools/wsdlfixture/PrimitiveTypesService_RPC_11.wsdl").getPath(); + String fixturefile = getResourceFile("tools/wsdlfixture/PrimitiveTypesService_RPC_11.wsdl").getAbsolutePath(); doWSDLTest(seiClass, fixturefile); } @@ -63,7 +63,7 @@ public void testStandardJavaTypes() throws Exception { Class seiClass = StandardJavaTypes.class; - String fixturefile = getResourceFile("tools/wsdlfixture/StandardJavaTypesService_RPC_11.wsdl").getPath(); + String fixturefile = getResourceFile("tools/wsdlfixture/StandardJavaTypesService_RPC_11.wsdl").getAbsolutePath(); doWSDLTest(seiClass, fixturefile); } @@ -71,7 +71,7 @@ public void testCustomTypes() throws Exception { Class seiClass = CustomInterface.class; - String fixturefile = getResourceFile("tools/wsdlfixture/CustomInterfaceService_RPC_11.wsdl").getPath(); + String fixturefile = getResourceFile("tools/wsdlfixture/CustomInterfaceService_RPC_11.wsdl").getAbsolutePath(); doWSDLTest(seiClass, fixturefile); } @@ -79,7 +79,7 @@ public void testExceptionTypes() throws Exception { Class seiClass = ServiceException.class; - String fixturefile = getResourceFile("tools/wsdlfixture/ServiceExceptionService_RPC_11.wsdl").getPath(); + String fixturefile = getResourceFile("tools/wsdlfixture/ServiceExceptionService_RPC_11.wsdl").getAbsolutePath(); doWSDLTest(seiClass, fixturefile); } @@ -87,7 +87,7 @@ public void testComplexTypes() throws Exception { Class seiClass = ComplexTypes.class; - String fixturefile = getResourceFile("tools/wsdlfixture/ComplexTypesService_RPC_11.wsdl").getPath(); + String fixturefile = getResourceFile("tools/wsdlfixture/ComplexTypesService_RPC_11.wsdl").getAbsolutePath(); doWSDLTest(seiClass, fixturefile); } @@ -95,8 +95,8 @@ public void testArrayTypes() throws Exception { Class seiClass = ArrayInterface.class; - // String fixturefile = getResourceFile("tools/wsdlfixture/ArrayInterfaceService_RPC_11.wsdl").getPath(); - String fixturefile = getResourceFile("tools/wsdlfixture/arrays/ArrayInterfaceService_RPC_11.wsdl").getPath(); + // String fixturefile = getResourceFile("tools/wsdlfixture/ArrayInterfaceService_RPC_11.wsdl").getAbsolutePath(); + String fixturefile = getResourceFile("tools/wsdlfixture/arrays/ArrayInterfaceService_RPC_11.wsdl").getAbsolutePath(); doWSDLTest(seiClass, fixturefile); } @@ -104,7 +104,7 @@ public void testPrimitiveArrayTypes() throws Exception { Class seiClass = PrimitiveArrayTypes.class; - String fixturefile = getResourceFile("tools/wsdlfixture/arrays/PrimitiveArrayTypesService_RPC_11.wsdl").getPath(); + String fixturefile = getResourceFile("tools/wsdlfixture/arrays/PrimitiveArrayTypesService_RPC_11.wsdl").getAbsolutePath(); doWSDLTest(seiClass, fixturefile); } @@ -112,7 +112,7 @@ public void testInterfaceInheritence() throws Exception { Class seiClass = InheritenceChildInterface.class; - String fixturefile = getResourceFile("tools/wsdlfixture/InheritenceChildInterfaceService_RPC.wsdl").getPath(); + String fixturefile = getResourceFile("tools/wsdlfixture/InheritenceChildInterfaceService_RPC.wsdl").getAbsolutePath(); doWSDLTest(seiClass, fixturefile); } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/assertions/WSDL20AssertionsTestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -62,7 +62,7 @@ private void doWSDLTest(String wsdlname) { // System property passed through the ant build script - String wsdldir = System.getProperty("wsdl.dir", getResourceFile("tools").getPath()); + String wsdldir = System.getProperty("wsdl.dir", getResourceFile("tools").getAbsolutePath()); File wsdlFile = createResourceFile(wsdldir + "/wsdl20assertions/" + wsdlname); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/clientside/ClientSideArtifactsTestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -187,7 +187,7 @@ }*/ //Compare mapping files - String fix = getResourceFile("tools/jbws-160/wscompile/custom/mapping/jaxrpc-mapping.xml").getPath(); + String fix = getResourceFile("tools/jbws-160/wscompile/custom/mapping/jaxrpc-mapping.xml").getAbsolutePath(); String gen = "tools/jbws-160/jbossws/custom/mapping/jaxrpc-mapping.xml"; JaxrpcMappingValidator mv = new JaxrpcMappingValidator(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/config/ToolsSchemaConfigReaderTestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -42,7 +42,7 @@ { public void testJavaToWSDL() throws Exception { - String j2wConfigFile = getResourceFile("tools/config/java2wsdl.xml").getPath(); + String j2wConfigFile = getResourceFile("tools/config/java2wsdl.xml").getAbsolutePath(); ToolsSchemaConfigReader configReader = new ToolsSchemaConfigReader(); Configuration config = configReader.readConfig(j2wConfigFile); assertNotNull("config is null?", config); @@ -51,7 +51,7 @@ public void testWSDLToJava() throws Exception { - String w2jConfigFile = getResourceFile("tools/config/wsdl2java.xml").getPath(); + String w2jConfigFile = getResourceFile("tools/config/wsdl2java.xml").getAbsolutePath(); ToolsSchemaConfigReader configReader = new ToolsSchemaConfigReader(); Configuration config = configReader.readConfig(w2jConfigFile); assertNotNull("config is null?", config); @@ -61,7 +61,7 @@ // [JBWS-719] Enable schema validation on wstools config public void testInvalidConfig() throws IOException, ClassNotFoundException { - String[] args = new String[] { "-dest", "tools/globalconfig", "-config", getResourceFile("tools/config/invalidConfig.xml").getPath() }; + String[] args = new String[] { "-dest", "tools/globalconfig", "-config", getResourceFile("tools/config/invalidConfig.xml").getAbsolutePath() }; WSTools tools = new WSTools(); try { 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-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/doclit/ToolsDocLitTestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -61,7 +61,7 @@ new WSDLWriter(wsdl).write(fw, Constants.DEFAULT_XML_CHARSET); fw.close(); - String fixturefile = getResourceFile("tools/doc-lit/trivial/wsdl/SampleService.wsdl").getPath(); + String fixturefile = getResourceFile("tools/doc-lit/trivial/wsdl/SampleService.wsdl").getAbsolutePath(); //Validate the generated WSDL File wsdlfix = createResourceFile(fixturefile); Element exp = DOMUtils.parse(wsdlfix.toURL().openStream()); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/enums/EnumTestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -37,10 +37,10 @@ { public final void testEnumWsdl() throws Exception { - String config = getResourceFile("tools/enums/wstools-config.xml").getPath(); + String config = getResourceFile("tools/enums/wstools-config.xml").getAbsolutePath(); new WSTools().generate(new String[] {"-dest", "tools/enums", "-config", config}); - Element exp = DOMUtils.parse(new FileInputStream(getResourceFile("tools/enums/EnumService15.wsdl").getPath())); + Element exp = DOMUtils.parse(new FileInputStream(getResourceFile("tools/enums/EnumService15.wsdl").getAbsolutePath())); Element was = DOMUtils.parse(new FileInputStream("tools/enums/wsdl/EnumService.wsdl")); 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-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -93,7 +93,7 @@ //First check if the wsdl files are well formed try { - String fixturefile = getResourceFile("tools/holders/wsdl/HolderService.wsdl").getPath(); + String fixturefile = getResourceFile("tools/holders/wsdl/HolderService.wsdl").getAbsolutePath(); File wsdlfix = createResourceFile(fixturefile); Element exp = DOMUtils.parse(wsdlfix.toURL().openStream()); File wsdlFile = createResourceFile(wsdlPath); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1079/JBWS1079TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -38,8 +38,9 @@ public void testAnonymousType() throws Exception { - String resourceDir = getResourceFile("tools/jbws1079").getPath(); - String toolsDir = "tools/jbws1079"; + File resourceFile = createResourceFile("tools/jbws1079"); + String resourceDir = resourceFile.getAbsolutePath(); + String toolsDir = resourceDir; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); @@ -54,8 +55,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1080/JBWS1080TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -36,8 +36,8 @@ public final void testNoNamespaceElement() throws Exception { - String resourceDir = getResourceFile("tools/jbws1080").getPath(); - String toolsDir = "tools/jbws1080"; + String resourceDir = createResourceFile("tools/jbws1080").getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1080"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; try Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1170/JBWS1170TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -37,8 +37,8 @@ { public final void testHyphenatedElement() throws Exception { - String resourceDir = getResourceFile("tools/jbws1170").getPath(); - String toolsDir = "tools/jbws1170"; + String resourceDir = createResourceFile("tools/jbws1170").getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1170"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -76,8 +76,9 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = getResourceFile("tools/jbws1184/scenario_" + scenario).getPath(); - String toolsDir = "tools/jbws1184/scenario_" + scenario; + File resourceFile = createResourceFile("tools/jbws1184/scenario_" + scenario); + String resourceDir = resourceFile.getAbsolutePath(); + String toolsDir = resourceDir; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); @@ -90,8 +91,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1217/JBWS1217TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -39,8 +39,8 @@ { public final void testMultiplePackageNameSpace() throws Exception { - String resourceDir = getResourceFile("tools/jbws1217").getPath(); - String toolsDir = "tools/jbws1217"; + String resourceDir = createResourceFile("tools/jbws1217").getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1217"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); @@ -54,8 +54,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1231/JBWS1231TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -35,8 +35,8 @@ public final void testGenerate() throws Exception { - String resourceDir = getResourceFile("tools/jbws1231").getPath(); - String toolsDir = "tools/jbws1231"; + String resourceDir = createResourceFile("tools/jbws1231").getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1231"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); 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-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1253/JBWS1253TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -38,8 +38,8 @@ { public final void testPortTypePort() throws Exception { - String resourceDir = getResourceFile("tools/jbws1253").getPath(); - String toolsDir = "tools/jbws1253"; + String resourceDir = createResourceFile("tools/jbws1253").getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1253"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -129,8 +129,8 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = getResourceFile("tools/jbws1259/scenario_" + scenario).getPath(); - String toolsDir = "tools/jbws1259/scenario_" + scenario; + String resourceDir = createResourceFile("tools/jbws1259/scenario_" + scenario).getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1259/scenario_" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); @@ -176,8 +176,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); 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 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1278/JBWS1278TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -47,8 +47,8 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = getResourceFile("tools/jbws1278/" + scenario).getPath(); - String toolsDir = "tools/jbws1278/" + scenario; + String resourceDir = createResourceFile("tools/jbws1278/" + scenario).getAbsolutePath(); + String toolsDir = resourceDir; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); File resourceDirFile = createResourceFile(resourceDir); @@ -93,8 +93,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1428/JBWS1428TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -37,8 +37,8 @@ public void testGenerate() throws Exception { - String resourceDir = getResourceFile("tools/jbws1428").getPath(); - String toolsDir = "tools/jbws1428"; + String resourceDir = createResourceFile("tools/jbws1428").getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1428"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -35,8 +35,8 @@ */ public class JBWS1441TestCase extends JBossWSTest { - private String resourceDir = getResourceFile("tools/jbws1441").getPath(); - private String toolsDir = "tools/jbws1441"; + private String resourceDir = createResourceFile("tools/jbws1441").getAbsolutePath(); + private String toolsDir = resourceDir; public void testGenerate() throws Exception { @@ -54,8 +54,8 @@ private void compareSource(final String fileName) throws Exception { - File expected = createResourceFile(resourceDir + "/" + fileName); - File generated = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1441/" + fileName); + File expected = new File(resourceDir + "/" + fileName); + File generated = new File(toolsDir + "/org/jboss/test/ws/jbws1441/" + 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/jbws1450/JBWS1450TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1450/JBWS1450TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -122,8 +122,8 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = getResourceFile("tools/jbws1450/scenario_" + scenario).getPath(); - String toolsDir = "tools/jbws1450/scenario_" + scenario; + String resourceDir = createResourceFile("tools/jbws1450/scenario_" + scenario).getAbsolutePath(); + String toolsDir = resourceDir; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); @@ -155,8 +155,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); 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-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1453/JBWS1453TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -47,8 +47,8 @@ */ public void testGenerate() throws Exception { - String resourceDir = getResourceFile("tools/jbws1453").getPath(); - String toolsDir = "tools/jbws1453"; + String resourceDir = createResourceFile("tools/jbws1453").getAbsolutePath(); + String toolsDir = resourceDir; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); @@ -95,8 +95,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -36,8 +36,8 @@ public class JBWS1455TestCase extends JBossWSTest { - private String resourceDir = getResourceFile("tools/jbws1455").getPath(); - private String toolsDir = "tools/jbws1455"; + private String resourceDir = createResourceFile("tools/jbws1455").getAbsolutePath(); + private String toolsDir = resourceDir; //"tools/jbws1455"; public void testGenerate() throws Exception { @@ -53,8 +53,8 @@ private void compareSource(final String fileName) throws Exception { - File expected = createResourceFile(resourceDir + "/" + fileName); - File generated = createResourceFile(toolsDir + "/org/jboss/test/ws/jbws1455/" + fileName); + File expected = new File(resourceDir + "/" + fileName); + File generated = new File(toolsDir + "/org/jboss/test/ws/jbws1455/" + 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/jbws1534/JBWS1534TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1534/JBWS1534TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -61,8 +61,8 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = getResourceFile("tools/jbws1534/" + scenario).getPath(); - String toolsDir = "tools/jbws1534/" + scenario; + String resourceDir = createResourceFile("tools/jbws1534/" + scenario).getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1534/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); @@ -108,8 +108,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1536/JBWS1536TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -41,13 +41,13 @@ public final void testGenerate() throws Exception { - String resourceDir = getResourceFile("tools/jbws1536").getPath(); - String toolsDir = "tools/jbws1536"; + String resourceDir = createResourceFile("tools/jbws1536").getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1536"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); - Element expected = DOMUtils.parse(new FileInputStream(getResourceFile("tools/jbws1536/webservices.xml").getPath())); + Element expected = DOMUtils.parse(new FileInputStream(getResourceFile("tools/jbws1536/webservices.xml").getAbsolutePath())); Element was = DOMUtils.parse(new FileInputStream("tools/jbws1536/webservices.xml")); assertEquals(expected, was); } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1538/JBWS1538TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -35,8 +35,8 @@ public final void testGenerate() throws Exception { - String resourceDir = getResourceFile("tools/jbws1538").getPath(); - String toolsDir = "tools/jbws1538"; + String resourceDir = createResourceFile("tools/jbws1538").getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1538"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); 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 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1597/JBWS1597TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -79,8 +79,8 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = getResourceFile("tools/jbws1597/" + scenario).getPath(); - String toolsDir = "tools/jbws1597/" + scenario; + String resourceDir = createResourceFile("tools/jbws1597/" + scenario).getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1597/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); File resourceDirFile = createResourceFile(resourceDir); @@ -125,8 +125,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); 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-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1607/JBWS1607TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -49,8 +49,8 @@ */ public void testGenerate() throws Exception { - String resourceDir = getResourceFile("tools/jbws1607").getPath(); - String toolsDir = "tools/jbws1607"; + String resourceDir = createResourceFile("tools/jbws1607").getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1607"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); @@ -97,8 +97,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); 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-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1627/JBWS1627TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -48,8 +48,8 @@ */ public void testGenerate() throws Exception { - String resourceDir = getResourceFile("tools/jbws1627").getPath(); - String toolsDir = "tools/jbws1627"; + String resourceDir = createResourceFile("tools/jbws1627").getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1627"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); @@ -96,8 +96,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1645/JBWS1645TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -78,7 +78,7 @@ public void testWSDLGeneratorWithPolicies() throws Exception { Class seiClass = StandardJavaTypes.class; - String fixturefile = getResourceFile("tools/jbws1645/StandardJavaTypesServiceJBWS1645.wsdl").getPath(); + String fixturefile = getResourceFile("tools/jbws1645/StandardJavaTypesServiceJBWS1645.wsdl").getAbsolutePath(); File wsdlDir = createResourceFile("./tools/jbws1645"); wsdlDir.mkdirs(); @@ -129,7 +129,7 @@ public void testWSDLGeneratorWithMultiplePolicies() throws Exception { Class seiClass = StandardJavaTypes.class; - String fixturefile = getResourceFile("tools/jbws1645/StandardJavaTypesServiceJBWS1645-Multiple.wsdl").getPath(); + String fixturefile = getResourceFile("tools/jbws1645/StandardJavaTypesServiceJBWS1645-Multiple.wsdl").getAbsolutePath(); File wsdlDir = createResourceFile("./tools/jbws1645"); wsdlDir.mkdirs(); 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-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1691/JBWS1691TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -48,8 +48,8 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = getResourceFile("tools/jbws1691/" + scenario).getPath(); - String toolsDir = "tools/jbws1691/" + scenario; + String resourceDir = createResourceFile("tools/jbws1691/" + scenario).getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1691/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); File resourceDirFile = createResourceFile(resourceDir); @@ -94,8 +94,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); 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 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1697/JBWS1697TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -64,8 +64,8 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = getResourceFile("tools/jbws1697/" + scenario).getPath(); - String toolsDir = "tools/jbws1697/" + scenario; + String resourceDir = createResourceFile("tools/jbws1697/" + scenario).getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1697/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); File resourceDirFile = createResourceFile(resourceDir); @@ -110,8 +110,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); 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-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1698/JBWS1698TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -59,8 +59,8 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = getResourceFile("tools/jbws1698/" + scenario).getPath(); - String toolsDir = "tools/jbws1698/" + scenario; + String resourceDir = createResourceFile("tools/jbws1698/" + scenario).getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1698/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); File resourceDirFile = createResourceFile(resourceDir); @@ -105,8 +105,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); 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-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -51,8 +51,8 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = getResourceFile("tools/jbws1723/" + scenario).getPath(); - String toolsDir = "tools/jbws1723/" + scenario; + String resourceDir = createResourceFile("tools/jbws1723/" + scenario).getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1723/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); File resourceDirFile = createResourceFile(resourceDir); @@ -97,8 +97,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1725/JBWS1725TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -41,9 +41,11 @@ public void testExtensionType() throws Exception { - String resourceDir = getResourceFile("tools/jbws1725").getPath(); - String toolsDir = "tools/jbws1725"; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + File resourceDir = createResourceFile("tools/jbws1725"); + resourceDir.mkdirs(); + + String toolsDir = resourceDir.getAbsolutePath(); + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir.getAbsolutePath() + "/wstools-config.xml" }; new WSTools().generate(args); compareSource(resourceDir + "/PasswordType.java", toolsDir + "/org/jboss/test/ws/jbws1725/PasswordType.java"); @@ -51,8 +53,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); 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-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1801/JBWS1801TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -51,8 +51,8 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = getResourceFile("tools/jbws1801/" + scenario).getPath(); - String toolsDir = "tools/jbws1801/" + scenario; + String resourceDir = createResourceFile("tools/jbws1801/" + scenario).getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1801/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); File resourceDirFile = createResourceFile(resourceDir); @@ -97,8 +97,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); 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-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws1873/JBWS1873TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -47,8 +47,8 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = getResourceFile("tools/jbws1873/" + scenario).getPath(); - String toolsDir = "tools/jbws1873/" + scenario; + String resourceDir = createResourceFile("tools/jbws1873/" + scenario).getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws1873/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); File resourceDirFile = createResourceFile(resourceDir); @@ -93,8 +93,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2018/JBWS2018TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -36,8 +36,8 @@ { public final void testMultiplePackageNameSpace() throws Exception { - String resourceDir = getResourceFile("tools/jbws2018").getPath(); - String toolsDir = "tools/jbws2018"; + String resourceDir = createResourceFile("tools/jbws2018").getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws2018"; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); 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-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws2019/JBWS2019TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -47,8 +47,8 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = getResourceFile("tools/jbws2019/" + scenario).getPath(); - String toolsDir = "tools/jbws2019/" + scenario; + String resourceDir = createResourceFile("tools/jbws2019/" + scenario).getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws2019/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); File resourceDirFile = createResourceFile(resourceDir); @@ -93,8 +93,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); 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-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws429/JBWS429TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -75,8 +75,8 @@ protected void generateScenario(final String scenario) throws Exception { - String resourceDir = getResourceFile("tools/jbws429/" + scenario).getPath(); - String toolsDir = "tools/jbws429/" + scenario; + String resourceDir = createResourceFile("tools/jbws429/" + scenario).getAbsolutePath(); + String toolsDir = resourceDir; //"tools/jbws429/" + scenario; String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; new WSTools().generate(args); File resourceDirFile = createResourceFile(resourceDir); @@ -121,8 +121,8 @@ private static void compareSource(final String expectedName, final String generatedName) throws Exception { - File expected = createResourceFile(expectedName); - File generated = createResourceFile(generatedName); + File expected = new File(expectedName); + File generated = new File(generatedName); JBossSourceComparator sc = new JBossSourceComparator(expected, generated); sc.validate(); 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-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws810/JBWS810TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -35,8 +35,8 @@ */ public class JBWS810TestCase extends JBossWSTest { - private String resourceDir = getResourceFile("tools/jbws810").getPath(); - private String toolsDir = "tools/jbws810"; + private String resourceDir = createResourceFile("tools/jbws810").getAbsolutePath(); + private String toolsDir = resourceDir; //"tools/jbws810"; public void testDocument() throws Exception { Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws818/JBWS818TestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -44,11 +44,11 @@ public final void testEnumWsdl() throws Exception { - String config = getResourceFile("tools/jbws818/wstools-config.xml").getPath(); + String config = getResourceFile("tools/jbws818/wstools-config.xml").getAbsolutePath(); String[] args= new String[]{"-dest", "tools/jbws818", "-config", config}; new WSTools().generate(args); - Element exp = DOMUtils.parse(new FileInputStream(getResourceFile("tools/jbws818/CrossPackageInheritenceService.wsdl").getPath())); + Element exp = DOMUtils.parse(new FileInputStream(getResourceFile("tools/jbws818/CrossPackageInheritenceService.wsdl").getAbsolutePath())); Element was = DOMUtils.parse(new FileInputStream("tools/jbws818/wsdl/CrossPackageInheritenceService.wsdl")); assertEquals(exp, was); } 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 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_206/JBWS206Test.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -59,7 +59,7 @@ public void checkServiceEndpointInterface() throws Exception { String out_dir = "tools/jbws-206/jbossws/" + getBase(); - String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getPath(); + String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getAbsolutePath(); String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase(); String seiName = getSEIName() + ".java"; @@ -72,7 +72,7 @@ public void checkServiceInterface() throws Exception { String out_dir = "tools/jbws-206/jbossws/" + getBase(); - String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getPath(); + String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getAbsolutePath(); String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase(); String serviceName = getServiceName(); @@ -85,7 +85,7 @@ public final void checkUserType(String name) throws Exception { String out_dir = "tools/jbws-206/jbossws/" + getBase(); - String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getPath(); + String fixBase = getResourceFile("tools/jbws-206/wscompileArtifacts/" + getBase()).getAbsolutePath(); String packageDir = "org/jboss/test/webservice/" + getBase().toLowerCase(); // Check User Types @@ -96,7 +96,7 @@ protected final void generate() throws Exception { String out_dir = "tools/jbws-206/jbossws/" + getBase(); - String configloc = getResourceFile("tools/jbws-206/jbosswsConfig/" + getBase() + "/" + getBase() + "wsdl2java.xml").getPath(); + String configloc = getResourceFile("tools/jbws-206/jbosswsConfig/" + getBase() + "/" + getBase() + "wsdl2java.xml").getAbsolutePath(); String[] args = new String[] { "-dest", out_dir, "-config", configloc }; WSTools tools = new WSTools(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/jbws_211/tests/JBWS211Test.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -55,9 +55,9 @@ return; } String out_dir = "tools/jbws-211/jbossws/" + getBase(); - String wsdlFix = getResourceFile("tools/jbws-211/wsdlFixture/" + getBase() + "/" + getWSDLName()).getPath(); + String wsdlFix = getResourceFile("tools/jbws-211/wsdlFixture/" + getBase() + "/" + getWSDLName()).getAbsolutePath(); String configStr = getBase().replaceAll("/", ""); - String configloc = getResourceFile("tools/jbws-211/jbosswsConfig/" + getBase() + "/" + configStr + "Config.xml").getPath(); + String configloc = getResourceFile("tools/jbws-211/jbosswsConfig/" + getBase() + "/" + configStr + "Config.xml").getAbsolutePath(); String[] args = new String[] { "-dest", out_dir, "-config", configloc }; WSTools tools = new WSTools(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xmlschema/XercesSchemaParserTestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -90,7 +90,7 @@ { String typeNS = "http://org.jboss.ws/types"; XSLoader xsloader = SchemaUtils.getInstance().getXSLoader(); - XSModel xsmodel = xsloader.loadURI(getResourceFile("tools/wsdlfixture/CustomInterface20.xsd").getPath()); + XSModel xsmodel = xsloader.loadURI(getResourceFile("tools/wsdlfixture/CustomInterface20.xsd").getAbsolutePath()); assertNotNull("XSModel is null?", xsmodel); XSNamedMap xsnamedmap = getXSNamedMap(xsmodel, typeNS); @@ -137,7 +137,7 @@ assertEquals("HelloObj", name); //Test the case when the schema files are parsed one by one - XSModel newxsmodel = utils.parseSchema(getResourceFile("tools/wsdlfixture/customtype/CustomTypeObj.xsd").getPath()); + XSModel newxsmodel = utils.parseSchema(getResourceFile("tools/wsdlfixture/customtype/CustomTypeObj.xsd").getAbsolutePath()); assertNotNull("XSModel is null?", newxsmodel); xsnamedmap = getXSNamedMap(newxsmodel, typeNS); assertNotNull("XSNamedMap is null?", xsnamedmap); @@ -146,7 +146,7 @@ assertEquals("HelloObj", xobj.getName()); assertTrue("HelloObj is a complex type?",xobj instanceof XSComplexTypeDefinition); - newxsmodel = utils.parseSchema(getResourceFile("tools/wsdlfixture/customtype/CustomTypeArrays.xsd").getPath()); + newxsmodel = utils.parseSchema(getResourceFile("tools/wsdlfixture/customtype/CustomTypeArrays.xsd").getAbsolutePath()); assertNotNull("XSModel is null?", newxsmodel); xsnamedmap = getXSNamedMap(newxsmodel, arrTypeNS); assertNotNull("XSNamedMap is null?", xsnamedmap); @@ -173,8 +173,8 @@ SchemaUtils utils = SchemaUtils.getInstance(); String typeNS = "http://org.jboss/types"; String arrTypeNS = "http://org.jboss/types/arrays/org/jboss/test/ws/tools/jbws_161/custom"; - String arr[] = {getResourceFile("tools/wsdlfixture/customtype/CustomTypeObj.xsd").getPath(), - getResourceFile("tools/wsdlfixture/customtype/CustomTypeArrays.xsd").getPath()}; + String arr[] = {getResourceFile("tools/wsdlfixture/customtype/CustomTypeObj.xsd").getAbsolutePath(), + getResourceFile("tools/wsdlfixture/customtype/CustomTypeArrays.xsd").getAbsolutePath()}; XSLoader xsloader = utils.getXSLoader(); Map map = new HashMap(); map.put(typeNS,getResourceURL("/tools/wsdlfixture/customtype/CustomTypeObj.xsd")); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/AnonymousTypesTestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -49,7 +49,7 @@ { String filename = "AnonTypes.xsd"; String packagename = "org.jboss.ws.types"; - String schemaFile = getResourceFile("tools/xsd/anontypes/" + filename).getPath(); + String schemaFile = getResourceFile("tools/xsd/anontypes/" + filename).getAbsolutePath(); String genPath = "tools/xsd-java-checker/jbossws/anontypes/"; this.mkdirs(genPath); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ComplexTypesTestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -48,7 +48,7 @@ { String filename = "ComplexType_ElementsOnly.xsd"; String packagename = "org.jboss.ws.types"; - String schemaFile = getResourceFile("tools/xsd/complextypes/ComplexType_ElementsOnly.xsd").getPath(); + String schemaFile = getResourceFile("tools/xsd/complextypes/ComplexType_ElementsOnly.xsd").getAbsolutePath(); this.mkdirs(genPath); File dir = createResourceFile(genPath); @@ -80,7 +80,7 @@ { String filename = "ComplexType_ElementsAttrib.xsd"; String packagename = "org.jboss.ws.types"; - String schemaFile = getResourceFile("tools/xsd/complextypes/ComplexType_ElementsAttrib.xsd").getPath(); + String schemaFile = getResourceFile("tools/xsd/complextypes/ComplexType_ElementsAttrib.xsd").getAbsolutePath(); this.mkdirs(genPath); File dir = createResourceFile(genPath); @@ -102,7 +102,7 @@ */ public void testXSComplexType_FromSimpleType() throws Exception { - String filename = getResourceFile("tools/xsd/complextypes/ComplexTypeFromSimpleType.xsd").getPath(); + String filename = getResourceFile("tools/xsd/complextypes/ComplexTypeFromSimpleType.xsd").getAbsolutePath(); String packagename = "org.jboss.ws.types"; this.mkdirs(genPath); @@ -125,7 +125,7 @@ */ public void testXSComplexType_EmptyContent() throws Exception { - String filename = getResourceFile("tools/xsd/complextypes/CT_EmptyContent.xsd").getPath(); + String filename = getResourceFile("tools/xsd/complextypes/CT_EmptyContent.xsd").getAbsolutePath(); String packagename = "org.jboss.ws.types"; this.mkdirs(genPath); @@ -147,7 +147,7 @@ */ public void testXSComplexTypeOccurrence() throws Exception { - String filename = getResourceFile("tools/xsd/complextypes/ComplexTypesOccurence.xsd").getPath(); + String filename = getResourceFile("tools/xsd/complextypes/ComplexTypesOccurence.xsd").getAbsolutePath(); String packagename = "org.jboss.ws.types"; this.mkdirs(genPath); @@ -170,7 +170,7 @@ */ public void testXSComplexType_Inheritance() throws Exception { - String filename = getResourceFile("tools/xsd/complextypes/CT_ExtensionRestriction.xsd").getPath(); + String filename = getResourceFile("tools/xsd/complextypes/CT_ExtensionRestriction.xsd").getAbsolutePath(); String packagename = "org.jboss.ws.types"; this.mkdirs(genPath); @@ -204,7 +204,7 @@ /** * wscompile does not support element groups */ - String filename = getResourceFile("tools/xsd/complextypes/CT_SequenceGroups.xsd").getPath(); + String filename = getResourceFile("tools/xsd/complextypes/CT_SequenceGroups.xsd").getAbsolutePath(); //This testcase will pass because wscompile does not support xsd:group String packagename = "org.jboss.ws.types"; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/NillableTypesTestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -51,7 +51,7 @@ * wscompile has a bug. It does not generate accessors for 'byte' * and getBoolean */ - String filename = getResourceFile("tools/xsd/nillabletypes/Nillable.xsd").getPath(); + String filename = getResourceFile("tools/xsd/nillabletypes/Nillable.xsd").getAbsolutePath(); String packagename = "org.jboss.ws.types"; this.mkdirs(genPath); File dir = createResourceFile(genPath); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/ReferencesTestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -48,7 +48,7 @@ public void testXSElemAttribReferences() throws Exception { - String filename = getResourceFile("tools/xsd/references/ElemAttribReferences.xsd").getPath(); + String filename = getResourceFile("tools/xsd/references/ElemAttribReferences.xsd").getAbsolutePath(); String packagename = "org.jboss.ws.types"; this.mkdirs(genPath); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2008-05-07 19:50:34 UTC (rev 6949) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/xsdjava/SimpleTypesTestCase.java 2008-05-07 20:04:18 UTC (rev 6950) @@ -48,7 +48,7 @@ */ public void testXSSimpleTypes() throws Exception { - String filename = getResourceFile("tools/xsd/simpletypes/SimpleType.xsd").getPath(); + String filename = getResourceFile("tools/xsd/simpletypes/SimpleType.xsd").getAbsolutePath(); String packagename = "org.jboss.ws.types"; mkdirs(genPath);