Simplified unit tests. Surefire/failsafe correctly sets the current working directory by default, so that we don't need to check the basedir system property. Ensure that we use the default everywhere.

veithen · veithen · commit 9e16c3376ccf · 2012-12-07T17:02:31.000Z
diff --git a/axis-ant/src/test/java/org/apache/axis/tools/ant/wsdl/CustomGeneratorFactoryTest.java b/axis-ant/src/test/java/org/apache/axis/tools/ant/wsdl/CustomGeneratorFactoryTest.java
@@ -26,7 +26,7 @@
 
 public class CustomGeneratorFactoryTest extends TestCase {
     public void test() throws Exception {
-        File file = new File(System.getProperty("basedir", "."), "target/work/com/example/stockquote_wsdl/StockQuoteServiceLocator.java");
+        File file = new File("target/work/com/example/stockquote_wsdl/StockQuoteServiceLocator.java");
         assertTrue(FileUtils.readFileToString(file).contains("My header comment"));
     }
 }
diff --git a/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java b/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
@@ -66,8 +66,7 @@ protected Set mayExist() {
      * The directory containing the files that should exist.
      */
     protected String rootDir() {
-        return System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator + 
+        return "target" + File.separator + "work" + File.separator + 
                 "test" + File.separator + "wsdl" + File.separator +
                 "clash";
     } // rootDir
diff --git a/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java b/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java
@@ -59,8 +59,7 @@ protected Set mayExist() {
      * The directory containing the files that should exist.
      */
     protected String rootDir() {
-        return System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator +
+        return "target" + File.separator + "work" + File.separator +
                 "test" + File.separator + "wsdl" + File.separator +
                 "extra";
     } // rootDir
diff --git a/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java b/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
@@ -48,8 +48,7 @@ protected Set shouldExist() {
      * The directory containing the files that should exist.
      */
     protected String rootDir() {
-        return System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator + 
+        return "target" + File.separator + "work" + File.separator + 
                 "test" + File.separator + "wsdl" + File.separator +
                 "filegenAll";
     } // rootDir
diff --git a/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java b/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
@@ -62,8 +62,7 @@ protected Set mayExist() {
      * The directory containing the files that should exist.
      */
     protected String rootDir() {
-        return System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator + 
+        return "target" + File.separator + "work" + File.separator + 
                 "test" + File.separator + "wsdl" + File.separator +
                 "filegen";
     }
diff --git a/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java b/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java
@@ -56,8 +56,7 @@ protected Set shouldNotExist() {
      * The directory containing the files that should exist.
      */
     protected String rootDir() {
-        return System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator + 
+        return "target" + File.separator + "work" + File.separator + 
                 "test" + File.separator + "wsdl" + File.separator +
                 "groups";
     }
diff --git a/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java b/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
@@ -58,8 +58,7 @@ protected Set shouldExist() {
      * The directory containing the files that should exist.
      */
     protected String rootDir() {
-        return System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator + 
+        return "target" + File.separator + "work" + File.separator + 
                 "test" + File.separator + "wsdl" + File.separator +
                 "header";
     } // rootDir
diff --git a/axis-ant/src/test/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java b/axis-ant/src/test/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java
@@ -54,8 +54,7 @@ public class SalesRankNPrice_ServiceTestCase extends junit.framework.TestCase {
     };
 
     public void testFileGen() throws IOException {
-        String rootDir = System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator + 
+        String rootDir = "target" + File.separator + "work" + File.separator + 
                 "test" + File.separator + "wsdl" + File.separator + "literal";
         // open up the output directory and check what files exist.
         File outputDir = new File(rootDir);
diff --git a/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java b/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
@@ -58,8 +58,7 @@ protected Set shouldExist() {
      * The directory containing the files that should exist.
      */
     protected String rootDir() {
-        return System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator + 
+        return "target" + File.separator + "work" + File.separator + 
                 "test" + File.separator + "wsdl" + File.separator +
                 "multibinding";
     } // rootDir
diff --git a/axis-ant/src/test/java/test/wsdl/schemaImport/SchemaImportTestCase.java b/axis-ant/src/test/java/test/wsdl/schemaImport/SchemaImportTestCase.java
@@ -42,8 +42,7 @@ public SchemaImportTestCase(String name) {
     }
 
     public void testSchemaImport() {
-        String path = System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator +
+        String path = "target" + File.separator + "work" + File.separator +
                 "test" + File.separator + "wsdl" + File.separator +
                 "schemaImport" + File.separator + "foo.wsdl";
         Document doc = null;
diff --git a/axis-ant/src/test/java/test/wsdl/split/SplitTestCase.java b/axis-ant/src/test/java/test/wsdl/split/SplitTestCase.java
@@ -33,8 +33,7 @@
 public class SplitTestCase extends TestCase {
     public void testValidateWSDL() throws Exception {
         WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
-        Definition definition = reader.readWSDL(new File(System.getProperty("basedir", ".")
-                + "/target/work/test/wsdl/split/SplitTestImpl.wsdl").toURI().toString());
+        Definition definition = reader.readWSDL(new File("target/work/test/wsdl/split/SplitTestImpl.wsdl").getAbsoluteFile().toURI().toString());
         Service service = definition.getService(new QName("http://split.wsdl.test", "MyPortTypeService"));
         Port port = service.getPort("SplitTest");
         // This is the critical part: the binding is defined in the imported WSDL
diff --git a/axis-rt-core/src/test/java/test/utils/TestMessages.java b/axis-rt-core/src/test/java/test/utils/TestMessages.java
@@ -125,9 +125,8 @@ public void testTestExtendedMessages() {
      *     matches the excpected number of parameters (in the source code).
      */
     public void testForMissingMessages() {
-        String baseDir = System.getProperty("basedir");
         char sep = File.separatorChar;
-        String srcDirStr = baseDir + sep + "src" + sep + "main" + sep + "java";
+        String srcDirStr = "src" + sep + "main" + sep + "java";
 
         File srcDir = new File(srcDirStr);
         if (srcDir.exists()) {
diff --git a/axis-rt-core/src/test/java/test/utils/TestSrcContent.java b/axis-rt-core/src/test/java/test/utils/TestSrcContent.java
@@ -44,8 +44,7 @@ public class TestSrcContent extends TestCase {
      * tree (xml-axis/java/src), calling checkFile for each file.
      */
     public void testSourceFiles() {
-        String baseDir = System.getProperty("basedir");
-        File   srcDir = new File(baseDir, "src/main/java");
+        File   srcDir = new File("src/main/java");
 
         if (srcDir.exists()) {
             walkTree(srcDir);
diff --git a/axis-rt-core/src/test/java/test/utils/TestXMLUtils.java b/axis-rt-core/src/test/java/test/utils/TestXMLUtils.java
@@ -303,7 +303,7 @@ public void testDOMXXE() throws Exception
 
     String msg = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
         "<!DOCTYPE project [" +
-        "<!ENTITY buildxml SYSTEM \"file:" + System.getProperty("basedir") + "/pom.xml\">" +
+        "<!ENTITY buildxml SYSTEM \"file:pom.xml\">" +
         "]>" +
         "<SOAP-ENV:Envelope " +
         "xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" " +
diff --git a/integration/src/test/java/test/functional/TestAutoTypes.java b/integration/src/test/java/test/functional/TestAutoTypes.java
@@ -32,13 +32,13 @@ public class TestAutoTypes extends TestCase {
 
     protected void setUp() throws java.lang.Exception {
         AxisProperties.setProperty("axis.doAutoTypes", "true");
-        String[] args = { System.getProperty("basedir") + "/src/test/wsdd/functional/auto-deploy.wsdd" };
+        String[] args = { "src/test/wsdd/functional/auto-deploy.wsdd" };
         AdminClient.main(args);
     }
 
     protected void tearDown() throws java.lang.Exception {
         AxisProperties.setProperty("axis.doAutoTypes", "false");
-        String[] args = { System.getProperty("basedir") + "/src/test/wsdd/functional/auto-undeploy.wsdd" };
+        String[] args = { "/src/test/wsdd/functional/auto-undeploy.wsdd" };
         AdminClient.main(args);
     }
 
diff --git a/integration/src/test/java/test/wsdl/query/FileGenWrappedTestCase.java b/integration/src/test/java/test/wsdl/query/FileGenWrappedTestCase.java
@@ -59,8 +59,7 @@ protected Set mayExist() {
      * The directory containing the files that should exist.
      */
     protected String rootDir() {
-        return System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "generated-test-sources" + File.separator +
+        return "target" + File.separator + "generated-test-sources" + File.separator +
                 "wsdl2java" + File.separator +
                 "test" + File.separator + "wsdl" + File.separator +
                 "query";
diff --git a/integration/src/test/java/test/wsdl/types/DynamicProxyTestCase.java b/integration/src/test/java/test/wsdl/types/DynamicProxyTestCase.java
@@ -66,6 +66,8 @@
 import javax.xml.rpc.holders.ShortHolder;
 import javax.xml.rpc.holders.ShortWrapperHolder;
 import javax.xml.rpc.holders.StringHolder;
+
+import java.io.File;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.MalformedURLException;
@@ -81,7 +83,7 @@ public DynamicProxyTestCase(String name) {
     private TypeTest getProxyWithWSDL() {
         try {
             Service service = ServiceFactory.newInstance().createService(
-                new URL("file", "", System.getProperty("basedir", ".") + "/src/test/wsdl/types/ComprehensiveTypes.wsdl"),
+                new File("src/test/wsdl/types/ComprehensiveTypes.wsdl").getAbsoluteFile().toURL(),
                 new QName("urn:comprehensive-service.types.wsdl.test",
                         "TypeTestService"));
             Stub stub = (Stub)service.getPort(
diff --git a/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java b/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java
@@ -31,27 +31,27 @@ protected void setUp() throws Exception {
     }
 
     public void testAttachments1() throws Exception {
-        boolean res = new EchoAttachment(opts).echo(false, System.getProperty("basedir") + "/pom.xml");
+        boolean res = new EchoAttachment(opts).echo(false, "pom.xml");
        assertEquals("Didn't process attachment correctly", res, true) ;
     }
 
     public void testAttachmentsD1() throws Exception {
-        boolean res = new EchoAttachment(opts).echo(true, System.getProperty("basedir") + "/pom.xml");
+        boolean res = new EchoAttachment(opts).echo(true, "pom.xml");
        assertEquals("Didn't process attachment correctly", res, true) ;
     }
     
     public void testAttachmentsDimeLeaveEmpty() throws Exception {
-        boolean res = new EchoAttachment(opts).echo(true, System.getProperty("basedir") + "/src/test/files/leaveempty.txt");
+        boolean res = new EchoAttachment(opts).echo(true, "src/test/files/leaveempty.txt");
        assertEquals("Didn't process attachment correctly", res, true) ;
     }
 
     public void testAttachments2() throws Exception {
-        boolean res = new EchoAttachment(opts).echoDir(false, System.getProperty("basedir") + "/src/main/java/samples/attachments");
+        boolean res = new EchoAttachment(opts).echoDir(false, "src/main/java/samples/attachments");
         assertEquals("Didn't process attachments correctly", res, true);
     }
 
     public void testAttachmentsD2() throws Exception {
-        boolean res = new EchoAttachment(opts).echoDir(true, System.getProperty("basedir") + "/src/main/java/samples/attachments");
+        boolean res = new EchoAttachment(opts).echoDir(true, "src/main/java/samples/attachments");
         assertEquals("Didn't process attachments correctly", res, true);
     }
 
diff --git a/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java b/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java
@@ -43,7 +43,7 @@ public void testEchoService () throws Exception {
         // deploy the echo service
         String[] args = {"-l",
                          "local:///AdminService",
-                         System.getProperty("basedir") + "/src/main/wsdd/deploy.wsdd"};
+                         "src/main/wsdd/deploy.wsdd"};
         AdminClient.main(args);
 
         // define the tests using JUnit assert facilities, and tell client to
diff --git a/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/VerifyFilesTest.java b/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/VerifyFilesTest.java
@@ -26,7 +26,7 @@
 
 public class VerifyFilesTest extends TestCase {
     public void testDeployUseless() throws Exception {
-        File file = new File(System.getProperty("basedir", "."), "target/work/example1/com/examples/www/wsdl/HelloService_wsdl/Hello_Service.lst");
+        File file = new File("target/work/example1/com/examples/www/wsdl/HelloService_wsdl/Hello_Service.lst");
         assertTrue(file.exists());
         assertEquals("Hello_Port", FileUtils.readFileToString(file).trim());
     }
diff --git a/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/VerifyFilesTest.java b/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/VerifyFilesTest.java
@@ -26,7 +26,7 @@
 
 public class VerifyFilesTest extends TestCase {
     public void testDeployUseless() throws Exception {
-        File file = new File(System.getProperty("basedir", "."), "target/work/example2/com/examples/www/wsdl/HelloService_wsdl/deploy.useless");
+        File file = new File("target/work/example2/com/examples/www/wsdl/HelloService_wsdl/deploy.useless");
         assertTrue(file.exists());
         assertEquals("Hi ho!  Hi ho!  It's off to work we go.", FileUtils.readFileToString(file).trim());
     }
diff --git a/samples/transport-sample/pom.xml b/samples/transport-sample/pom.xml
@@ -103,6 +103,24 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>maven-wsdd-plugin</artifactId>
+                <version>${project.version}</version>
+                <executions>
+                    <execution>
+                        <!-- We create a server-config.wsdd file to prevent Axis from creating a default one in the source tree -->
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>generate-wsdd</goal>
+                        </goals>
+                        <configuration>
+                            <type>server</type>
+                            <output>${project.build.directory}/server-config.wsdd</output>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <executions>
@@ -115,9 +133,8 @@
                             <includes>
                                 <include>**/Test*.java</include>
                             </includes>
-                            <!-- Prevent Axis from creating a server-config.wsdd file in the source tree -->
-                            <workingDirectory>${project.build.directory}/work</workingDirectory>
                             <systemPropertyVariables>
+                                <axis.ServerConfigFile>${project.build.directory}/server-config.wsdd</axis.ServerConfigFile>
                                 <test.functional.TCPListenerPort>${test.functional.TCPListenerPort}</test.functional.TCPListenerPort>
                             </systemPropertyVariables>
                         </configuration>
diff --git a/samples/transport-sample/src/test/java/test/functional/TestTCPTransportSample.java b/samples/transport-sample/src/test/java/test/functional/TestTCPTransportSample.java
@@ -48,7 +48,7 @@ public TestTCPTransportSample(String name) {
     }
 
     public void doTestDeploy () throws Exception {
-        String[] args = { "-l" + uri, System.getProperty("basedir", ".") + "/src/main/wsdd/deploy.wsdd" };
+        String[] args = { "-l" + uri, "src/main/wsdd/deploy.wsdd" };
         AdminClient.main(args);
     }
 
diff --git a/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java b/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java
@@ -35,7 +35,7 @@ public TestTransportSample(String name) {
     }
     
     public void doTestDeploy () throws Exception {
-        String[] args = { "-llocal:", System.getProperty("basedir") + "/src/main/wsdd/deploy.wsdd" };
+        String[] args = { "-llocal:", "src/main/wsdd/deploy.wsdd" };
         AdminClient.main(args);
     }
     

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`
`27`	`27`	`public class CustomGeneratorFactoryTest extends TestCase {`
`28`	`28`	`public void test() throws Exception {`
`29`		`- File file = new File(System.getProperty("basedir", "."), "target/work/com/example/stockquote_wsdl/StockQuoteServiceLocator.java");`
	`29`	`+ File file = new File("target/work/com/example/stockquote_wsdl/StockQuoteServiceLocator.java");`
`30`	`30`	`assertTrue(FileUtils.readFileToString(file).contains("My header comment"));`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,7 @@ public SchemaImportTestCase(String name) {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public void testSchemaImport() {`
`45`		`- String path = System.getProperty("basedir", ".") + File.separator +`
`46`		`- "target" + File.separator + "work" + File.separator +`
	`45`	`+ String path = "target" + File.separator + "work" + File.separator +`
`47`	`46`	`"test" + File.separator + "wsdl" + File.separator +`
`48`	`47`	`"schemaImport" + File.separator + "foo.wsdl";`
`49`	`48`	`Document doc = null;`