You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by th...@apache.org on 2006/09/05 08:53:52 UTC
svn commit: r440281 - in /webservices/axis2/trunk/java/modules/integration:
./ test-resources/mtom/ test/org/apache/axis2/mtom/
Author: thilina
Date: Mon Sep 4 23:53:51 2006
New Revision: 440281
URL: http://svn.apache.org/viewvc?view=rev&rev=440281
Log:
Fixed the MTOM tests. Included back to the test suit.
Moved the MTOM test-resources to it's correct home
Added:
webservices/axis2/trunk/java/modules/integration/test-resources/mtom/
webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-enabled-axis2.xml
- copied unchanged from r440265, webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MTOM-enabled-axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/mtom/MTOM-fileCache-enabled-axis2.xml
- copied unchanged from r440265, webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MTOM-fileCache-enabled-axis2.xml
webservices/axis2/trunk/java/modules/integration/test-resources/mtom/test.jpg
- copied unchanged from r440265, webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/test.jpg
webservices/axis2/trunk/java/modules/integration/test-resources/mtom/wmtom.bin
- copied unchanged from r440265, webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/wmtom.bin
Removed:
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MTOM-enabled-axis2.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MTOM-fileCache-enabled-axis2.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/test.jpg
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/wmtom.bin
Modified:
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/project.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/maven.xml?view=diff&rev=440281&r1=440280&r2=440281
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Mon Sep 4 23:53:51 2006
@@ -466,7 +466,7 @@
<!-- MTOM enabled Repository -->
<mkdir dir="target/test-resources/MTOM-enabledRepository"/>
<mkdir dir="target/test-resources/MTOM-enabledRepository/conf"/>
- <copy file="test/org/apache/axis2/mtom/MTOM-enabled-axis2.xml"
+ <copy file="test-resources/mtom/MTOM-enabled-axis2.xml"
tofile="target/test-resources/MTOM-enabledRepository/conf/axis2.xml"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/MTOM-enabledRepository/modules/addressing-${addressing_version}.mar"/>
@@ -474,7 +474,7 @@
<!-- MTOM file cache enabled Repository -->
<mkdir dir="target/test-resources/MTOM-fileCache-enabledRepository"/>
<mkdir dir="target/test-resources/MTOM-fileCache-enabledRepository/conf"/>
- <copy file="test/org/apache/axis2/mtom/MTOM-fileCache-enabled-axis2.xml"
+ <copy file="test-resources/mtom/MTOM-fileCache-enabled-axis2.xml"
tofile="target/test-resources/MTOM-fileCache-enabledRepository/conf/axis2.xml"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/test-resources/MTOM-fileCache-enabledRepository/modules/addressing-${addressing_version}.mar"/>
Modified: webservices/axis2/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/project.xml?view=diff&rev=440281&r1=440280&r2=440281
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/project.xml Mon Sep 4 23:53:51 2006
@@ -390,7 +390,6 @@
</includes>
<excludes>
<exclude>**/*Abstract*.class</exclude>
- <exclude>**/*MTOM*.class</exclude>
<exclude>**/*Util*.class</exclude>
<exclude>**/*InteropStubTest.class</exclude>
<exclude>**org/apache/axis2/mail/*.class</exclude>
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java?view=diff&rev=440281&r1=440280&r2=440281
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java Mon Sep 4 23:53:51 2006
@@ -47,7 +47,7 @@
public class EchoRawMTOMCommonsChunkingTest extends UtilServerBasedTestCase implements TestConstants {
private OMElement data;
- private String fileName = "src/org/apache/axis2/mtom/test.jpg";
+ private String fileName = "test-resources/mtom/test.jpg";
public EchoRawMTOMCommonsChunkingTest() {
super(EchoRawMTOMCommonsChunkingTest.class.getName());
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java?view=diff&rev=440281&r1=440280&r2=440281
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java Mon Sep 4 23:53:51 2006
@@ -36,6 +36,8 @@
import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
+
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -102,7 +104,7 @@
httppost.getParams().setParameter(HttpMethodParams.RETRY_HANDLER,
myretryhandler);
httppost.setRequestEntity(new InputStreamRequestEntity(
- this.getResourceAsStream("/org/apache/axis2/mtom/wmtom.bin")));
+ new FileInputStream("test-resources/mtom/wmtom.bin")));
httppost.setRequestHeader("Content-Type",
"multipart/related; boundary=--MIMEBoundary258DE2D105298B756D; type=\"application/xop+xml\"; start=\"<0....@apache.org>\"; start-info=\"application/soap+xml\"");
@@ -118,9 +120,5 @@
} finally {
httppost.releaseConnection();
}
- }
-
- private InputStream getResourceAsStream(String path) {
- return this.getClass().getResourceAsStream(path);
}
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java?view=diff&rev=440281&r1=440280&r2=440281
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java Mon Sep 4 23:53:51 2006
@@ -95,7 +95,7 @@
OMNamespace omNs = fac.createOMNamespace("http://localhost/my", "my");
OMElement rpcWrapEle = fac.createOMElement("echoOMElement", omNs);
OMElement data = fac.createOMElement("data", omNs);
- FileDataSource fileDataSource = new FileDataSource("src/org/apache/axis2/mtom/test.jpg");
+ FileDataSource fileDataSource = new FileDataSource("test-resources/mtom/test.jpg");
expectedDH = new DataHandler(fileDataSource);
expectedTextData = new OMTextImpl(expectedDH, true, fac);
data.addChild(expectedTextData);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org