You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2011/12/30 22:48:15 UTC
svn commit: r1225937 - in /axis/axis1/java/trunk: axis/
axis/src/test/java/test/ axis/src/test/java/test/saaj/
axis/src/test/java/test/servicedesc/ axis/src/test/java/test/typedesc/
axis/src/test/java/test/types/ axis/src/test/java/test/utils/ axis/src...
Author: veithen
Date: Fri Dec 30 21:48:14 2011
New Revision: 1225937
URL: http://svn.apache.org/viewvc?rev=1225937&view=rev
Log:
More mavenized unit tests.
Added:
axis/axis1/java/trunk/axis/src/test/java/test/AxisTestBase.java
- copied unchanged from r1225919, axis/axis1/java/trunk/test/AxisTestBase.java
axis/axis1/java/trunk/axis/src/test/java/test/saaj/
- copied from r1225919, axis/axis1/java/trunk/test/saaj/
axis/axis1/java/trunk/axis/src/test/java/test/servicedesc/
- copied from r1225929, axis/axis1/java/trunk/test/servicedesc/
axis/axis1/java/trunk/axis/src/test/java/test/typedesc/
- copied from r1225929, axis/axis1/java/trunk/test/typedesc/
axis/axis1/java/trunk/axis/src/test/java/test/types/
- copied from r1225929, axis/axis1/java/trunk/test/types/
axis/axis1/java/trunk/axis/src/test/java/test/utils/
- copied from r1225919, axis/axis1/java/trunk/test/utils/
axis/axis1/java/trunk/axis/src/test/resources/
axis/axis1/java/trunk/axis/src/test/resources/test/
axis/axis1/java/trunk/axis/src/test/resources/test/utils/
axis/axis1/java/trunk/axis/src/test/resources/test/utils/resource.properties
- copied unchanged from r1225919, axis/axis1/java/trunk/test/utils/resource.properties
Removed:
axis/axis1/java/trunk/axis/src/test/java/test/saaj/PackageTests.java
axis/axis1/java/trunk/axis/src/test/java/test/saaj/build.xml
axis/axis1/java/trunk/axis/src/test/java/test/servicedesc/PackageTests.java
axis/axis1/java/trunk/axis/src/test/java/test/servicedesc/build.xml
axis/axis1/java/trunk/axis/src/test/java/test/typedesc/PackageTests.java
axis/axis1/java/trunk/axis/src/test/java/test/typedesc/build.xml
axis/axis1/java/trunk/axis/src/test/java/test/types/PackageTests.java
axis/axis1/java/trunk/axis/src/test/java/test/types/build.xml
axis/axis1/java/trunk/axis/src/test/java/test/utils/PackageTests.java
axis/axis1/java/trunk/axis/src/test/java/test/utils/build.xml
axis/axis1/java/trunk/axis/src/test/java/test/utils/resource.properties
axis/axis1/java/trunk/test/saaj/
axis/axis1/java/trunk/test/servicedesc/
axis/axis1/java/trunk/test/typedesc/
axis/axis1/java/trunk/test/types/
axis/axis1/java/trunk/test/utils/
Modified:
axis/axis1/java/trunk/axis/pom.xml
axis/axis1/java/trunk/axis/src/test/java/test/saaj/TestAttachmentSerialization.java
axis/axis1/java/trunk/axis/src/test/java/test/utils/TestMessages.java
axis/axis1/java/trunk/axis/src/test/java/test/utils/TestSrcContent.java
axis/axis1/java/trunk/axis/src/test/java/test/utils/TestXMLUtils.java
Modified: axis/axis1/java/trunk/axis/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/pom.xml?rev=1225937&r1=1225936&r2=1225937&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis/pom.xml (original)
+++ axis/axis1/java/trunk/axis/pom.xml Fri Dec 30 21:48:14 2011
@@ -97,6 +97,19 @@
<groupId>bsf</groupId>
<artifactId>bsf</artifactId>
<version>2.3.0</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.6</version>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
@@ -175,9 +188,13 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
+ <!-- Quote: "comment out for now - this class is a mess" -->
+ <exclude>test/utils/TestOptions.java</exclude>
<!-- This is actually not a unit test -->
<exclude>test/concurrency/TestService.java</exclude>
</excludes>
+ <!-- TODO: this is bad; it could mean that Axis is not working properly on modern JREs -->
+ <argLine>-Xbootclasspath/p:${project.build.directory}/endorsed/xmlParserAPIs.jar</argLine>
</configuration>
</plugin>
<plugin>
Modified: axis/axis1/java/trunk/axis/src/test/java/test/saaj/TestAttachmentSerialization.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/src/test/java/test/saaj/TestAttachmentSerialization.java?rev=1225937&r1=1225919&r2=1225937&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis/src/test/java/test/saaj/TestAttachmentSerialization.java (original)
+++ axis/axis1/java/trunk/axis/src/test/java/test/saaj/TestAttachmentSerialization.java Fri Dec 30 21:48:14 2011
@@ -21,7 +21,6 @@ import org.apache.axis.components.logger
import org.apache.commons.logging.Log;
import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
import javax.xml.soap.AttachmentPart;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.MimeHeaders;
@@ -33,7 +32,6 @@ import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
@@ -93,12 +91,9 @@ public class TestAttachmentSerialization
ap.setContent("some attachment text...", "text/plain");
msg.addAttachmentPart(ap);
- String jpgfilename = "docs/images/axis.jpg";
- File myfile = new File(jpgfilename);
- FileDataSource fds = new FileDataSource(myfile);
- DataHandler dh = new DataHandler(fds);
+ DataHandler dh = new DataHandler("test content", "text/plain");
AttachmentPart ap2 = msg.createAttachmentPart(dh);
- ap2.setContentType("image/jpg");
+ ap2.setContentType("text/plain");
msg.addAttachmentPart(ap2);
// Test for Bug #17664
Modified: axis/axis1/java/trunk/axis/src/test/java/test/utils/TestMessages.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/src/test/java/test/utils/TestMessages.java?rev=1225937&r1=1225919&r2=1225937&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis/src/test/java/test/utils/TestMessages.java (original)
+++ axis/axis1/java/trunk/axis/src/test/java/test/utils/TestMessages.java Fri Dec 30 21:48:14 2011
@@ -136,9 +136,9 @@ public class TestMessages extends TestCa
* matches the excpected number of parameters (in the source code).
*/
public void testForMissingMessages() {
- String baseDir = System.getProperty("user.dir");
+ String baseDir = System.getProperty("basedir");
char sep = File.separatorChar;
- String srcDirStr = baseDir + sep + "src";
+ String srcDirStr = baseDir + sep + "src" + sep + "main" + sep + "java";
File srcDir = new File(srcDirStr);
if (srcDir.exists()) {
Modified: axis/axis1/java/trunk/axis/src/test/java/test/utils/TestSrcContent.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/src/test/java/test/utils/TestSrcContent.java?rev=1225937&r1=1225919&r2=1225937&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis/src/test/java/test/utils/TestSrcContent.java (original)
+++ axis/axis1/java/trunk/axis/src/test/java/test/utils/TestSrcContent.java Fri Dec 30 21:48:14 2011
@@ -54,8 +54,8 @@ public class TestSrcContent extends Test
* tree (xml-axis/java/src), calling checkFile for each file.
*/
public void testSourceFiles() {
- String baseDir = System.getProperty("user.dir");
- File srcDir = new File(baseDir, "src");
+ String baseDir = System.getProperty("basedir");
+ File srcDir = new File(baseDir, "src/main/java");
if (srcDir.exists()) {
walkTree(srcDir);
Modified: axis/axis1/java/trunk/axis/src/test/java/test/utils/TestXMLUtils.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/src/test/java/test/utils/TestXMLUtils.java?rev=1225937&r1=1225919&r2=1225937&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis/src/test/java/test/utils/TestXMLUtils.java (original)
+++ axis/axis1/java/trunk/axis/src/test/java/test/utils/TestXMLUtils.java Fri Dec 30 21:48:14 2011
@@ -317,7 +317,7 @@ public class TestXMLUtils extends AxisTe
String msg = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
"<!DOCTYPE project [" +
- "<!ENTITY buildxml SYSTEM \"file:build.xml\">" +
+ "<!ENTITY buildxml SYSTEM \"file:" + System.getProperty("basedir") + "/pom.xml\">" +
"]>" +
"<SOAP-ENV:Envelope " +
"xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" " +