Author: veithen
Date: Fri Dec 7 17:02:31 2012
New Revision: 1418394
URL: http://svn.apache.org/viewvc?rev=1418394&view=rev
Log:
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.
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/org/apache/axis/tools/ant/wsdl/CustomGeneratorFactoryTest.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/schemaImport/SchemaImportTestCase.java
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/split/SplitTestCase.java
axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestMessages.java
axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestSrcContent.java
axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestXMLUtils.java
axis/axis1/java/trunk/integration/src/test/java/test/functional/TestAutoTypes.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/FileGenWrappedTestCase.java
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/types/DynamicProxyTestCase.java
axis/axis1/java/trunk/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java
axis/axis1/java/trunk/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java
axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/VerifyFilesTest.java
axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/VerifyFilesTest.java
axis/axis1/java/trunk/samples/transport-sample/pom.xml
axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/functional/TestTCPTransportSample.java
axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/org/apache/axis/tools/ant/wsdl/CustomGeneratorFactoryTest.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/org/apache/axis/tools/ant/wsdl/CustomGeneratorFactoryTest.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-ant/src/test/java/org/apache/axis/tools/ant/wsdl/CustomGeneratorFactoryTest.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/org/apache/axis/tools/ant/wsdl/CustomGeneratorFactoryTest.java
Fri Dec 7 17:02:31 2012
@@ -26,7 +26,7 @@ import org.apache.commons.io.FileUtils;
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"));
}
}
\ No newline at end of file
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
Fri Dec 7 17:02:31 2012
@@ -66,8 +66,7 @@ public class VerifyFilesTestCase extends
* 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
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java
Fri Dec 7 17:02:31 2012
@@ -59,8 +59,7 @@ public class ExtraClassesTestCase exten
* 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
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
Fri Dec 7 17:02:31 2012
@@ -48,8 +48,7 @@ public class AllOptionTestCase extends F
* 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
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
Fri Dec 7 17:02:31 2012
@@ -62,8 +62,7 @@ public class FileGenTestCase extends Axi
* 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";
}
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java
Fri Dec 7 17:02:31 2012
@@ -56,8 +56,7 @@ public class GroupsTestCase extends juni
* 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";
}
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
Fri Dec 7 17:02:31 2012
@@ -58,8 +58,7 @@ public class VerifyFilesTestCase extends
* 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
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java
Fri Dec 7 17:02:31 2012
@@ -54,8 +54,7 @@ public class SalesRankNPrice_ServiceTest
};
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);
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
Fri Dec 7 17:02:31 2012
@@ -58,8 +58,7 @@ public class VerifyFilesTestCase extends
* 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
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/schemaImport/SchemaImportTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/schemaImport/SchemaImportTestCase.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/schemaImport/SchemaImportTestCase.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/schemaImport/SchemaImportTestCase.java
Fri Dec 7 17:02:31 2012
@@ -42,8 +42,7 @@ public class SchemaImportTestCase extend
}
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;
Modified:
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/split/SplitTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/split/SplitTestCase.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/split/SplitTestCase.java
(original)
+++
axis/axis1/java/trunk/axis-ant/src/test/java/test/wsdl/split/SplitTestCase.java
Fri Dec 7 17:02:31 2012
@@ -33,8 +33,7 @@ import junit.framework.TestCase;
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
Modified:
axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestMessages.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestMessages.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestMessages.java
(original)
+++
axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestMessages.java
Fri Dec 7 17:02:31 2012
@@ -125,9 +125,8 @@ public class TestMessages extends TestCa
* 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()) {
Modified:
axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestSrcContent.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestSrcContent.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestSrcContent.java
(original)
+++
axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestSrcContent.java
Fri Dec 7 17:02:31 2012
@@ -44,8 +44,7 @@ public class TestSrcContent extends Test
* 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);
Modified:
axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestXMLUtils.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestXMLUtils.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestXMLUtils.java
(original)
+++
axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestXMLUtils.java
Fri Dec 7 17:02:31 2012
@@ -303,7 +303,7 @@ public class TestXMLUtils extends AxisTe
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/\"; " +
Modified:
axis/axis1/java/trunk/integration/src/test/java/test/functional/TestAutoTypes.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/functional/TestAutoTypes.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/integration/src/test/java/test/functional/TestAutoTypes.java
(original)
+++
axis/axis1/java/trunk/integration/src/test/java/test/functional/TestAutoTypes.java
Fri Dec 7 17:02:31 2012
@@ -32,13 +32,13 @@ public class TestAutoTypes extends TestC
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);
}
Modified:
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/FileGenWrappedTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/FileGenWrappedTestCase.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/FileGenWrappedTestCase.java
(original)
+++
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/query/FileGenWrappedTestCase.java
Fri Dec 7 17:02:31 2012
@@ -59,8 +59,7 @@ public class FileGenWrappedTestCase exte
* 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";
Modified:
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/types/DynamicProxyTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/wsdl/types/DynamicProxyTestCase.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/types/DynamicProxyTestCase.java
(original)
+++
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/types/DynamicProxyTestCase.java
Fri Dec 7 17:02:31 2012
@@ -66,6 +66,8 @@ import javax.xml.rpc.holders.QNameHolder
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 class DynamicProxyTestCase extend
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(
Modified:
axis/axis1/java/trunk/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java
(original)
+++
axis/axis1/java/trunk/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java
Fri Dec 7 17:02:31 2012
@@ -31,27 +31,27 @@ public class TestAttachmentsSample exten
}
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);
}
Modified:
axis/axis1/java/trunk/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java
(original)
+++
axis/axis1/java/trunk/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java
Fri Dec 7 17:02:31 2012
@@ -43,7 +43,7 @@ public class TestEchoSample extends Test
// 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
Modified:
axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/VerifyFilesTest.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/VerifyFilesTest.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/VerifyFilesTest.java
(original)
+++
axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/VerifyFilesTest.java
Fri Dec 7 17:02:31 2012
@@ -26,7 +26,7 @@ import org.apache.commons.io.FileUtils;
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());
}
Modified:
axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/VerifyFilesTest.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/VerifyFilesTest.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/VerifyFilesTest.java
(original)
+++
axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/VerifyFilesTest.java
Fri Dec 7 17:02:31 2012
@@ -26,7 +26,7 @@ import org.apache.commons.io.FileUtils;
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());
}
Modified: axis/axis1/java/trunk/samples/transport-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/transport-sample/pom.xml?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/transport-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/transport-sample/pom.xml Fri Dec 7 17:02:31
2012
@@ -104,6 +104,24 @@
</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>
<execution>
@@ -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>
Modified:
axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/functional/TestTCPTransportSample.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/functional/TestTCPTransportSample.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/functional/TestTCPTransportSample.java
(original)
+++
axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/functional/TestTCPTransportSample.java
Fri Dec 7 17:02:31 2012
@@ -48,7 +48,7 @@ public class TestTCPTransportSample exte
}
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);
}
Modified:
axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java?rev=1418394&r1=1418393&r2=1418394&view=diff
==============================================================================
---
axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java
(original)
+++
axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java
Fri Dec 7 17:02:31 2012
@@ -35,7 +35,7 @@ public class TestTransportSample extends
}
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);
}
