Author: midon
Date: Wed Nov 26 16:27:11 2008
New Revision: 721049
URL: http://svn.apache.org/viewvc?rev=721049&view=rev
Log:
ODE-423: reactivate tests
Modified:
ode/branches/APACHE_ODE_1.X/Rakefile
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTest.java
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/httpbinding/HttpMethodConverterTest.java
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ExecutionPathTest.java
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ProcessManagementTest.java
Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=721049&r1=721048&r2=721049&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Wed Nov 26 16:27:11 2008
@@ -151,8 +151,8 @@
DERBY, GERONIMO.kernel, GERONIMO.transaction, JAVAX.activation,
JAVAX.servlet, JAVAX.stream,
JAVAX.transaction, JENCKS, WSDL4J, WS_COMMONS, XMLBEANS,
AXIS2_MODULES.libs
+ test.exclude 'org.apache.ode.axis2.management.*'
test.with project("tools"), AXIOM, JAVAX.javamail, COMMONS.codec,
COMMONS.httpclient, XERCES, WOODSTOX
- test.exclude '*'
package :jar
end
Modified:
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTest.java?rev=721049&r1=721048&r2=721049&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/SoapMessageConverterTest.java
Wed Nov 26 16:27:11 2008
@@ -141,15 +141,15 @@
odeMsg1.setMessage(odeMsgElmt);
portmapper.parseSoapRequest(odeMsg2, env, op1);
+ System.out.println(DOMUtils.domToString(odeMsg2.getMessage()));
Element params = DOMUtils.findChildByName(odeMsg2.getMessage(), new
QName(null, "parameters"));
assertNotNull(params);
+ // the part 'DocumentumRequestHeader' is bound to a soap:header, it
should be accessible as a header part
assertNotNull(odeMsg2.getHeaderPart("DocumentumRequestHeader"));
Element hdrElmt =
DOMUtils.findChildByName(odeMsg2.getHeaderPart("DocumentumRequestHeader"), new
QName("http://documentum.com/ws/2005/services";,
"DocumentumSecurityToken"));
assertNotNull(hdrElmt);
- Element hdrBdyElmt =
DOMUtils.findChildByName(odeMsg2.getPart("DocumentumRequestHeader"), new
QName("http://documentum.com/ws/2005/services";,
- "DocumentumSecurityToken"));
- assertNotNull(hdrBdyElmt);
+ assertNull(odeMsg2.getPart("DocumentumRequestHeader"));
}
/** Make sure hello world request parses correctly. */
Modified:
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/httpbinding/HttpMethodConverterTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/httpbinding/HttpMethodConverterTest.java?rev=721049&r1=721048&r2=721049&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/httpbinding/HttpMethodConverterTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/httpbinding/HttpMethodConverterTest.java
Wed Nov 26 16:27:11 2008
@@ -24,6 +24,7 @@
import org.apache.commons.httpclient.params.DefaultHttpParams;
import org.apache.commons.httpclient.methods.ByteArrayRequestEntity;
import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
import org.apache.ode.bpel.epr.MutableEndpoint;
import org.apache.ode.bpel.iapi.*;
import org.apache.ode.utils.DOMUtils;
@@ -45,6 +46,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.Collections;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Alexis Midon</a>
@@ -149,8 +151,7 @@
assertTrue("POST".equalsIgnoreCase(httpMethod.getName()));
assertEquals("Generated URI does not match", expectedUri,
httpMethod.getURI().toString());
- byte[] content = ((ByteArrayRequestEntity) ((PostMethod)
httpMethod).getRequestEntity()).getContent();
- String b = new String(content);
+ String b = ((StringRequestEntity) ((PostMethod)
httpMethod).getRequestEntity()).getContent();
assertEquals("Invalid body in generated http query",
DOMUtils.domToString(helloEl), b);
}
@@ -205,7 +206,7 @@
}
public Map<String, Node> getHeaderParts() {
- return null;
+ return Collections.EMPTY_MAP;
}
public Element getPart(String partName) {
Modified:
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ExecutionPathTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ExecutionPathTest.java?rev=721049&r1=721048&r2=721049&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ExecutionPathTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ExecutionPathTest.java
Wed Nov 26 16:27:11 2008
@@ -39,6 +39,9 @@
import java.util.Iterator;
+/**
+ * @deprecated Needs to be migrated in axis2-war and upgraded to the new
Axis2TestBase test fwk.
+ */
public class ExecutionPathTest extends TestCase {
private OMFactory _factory;
Modified:
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ProcessManagementTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ProcessManagementTest.java?rev=721049&r1=721048&r2=721049&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ProcessManagementTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2/src/test/java/org/apache/ode/axis2/management/ProcessManagementTest.java
Wed Nov 26 16:27:11 2008
@@ -39,6 +39,9 @@
import java.util.Calendar;
import java.util.Iterator;
+/**
+ * @deprecated Needs to be migrated in axis2-war and upgraded to the new
Axis2TestBase test fwk.
+ */
public class ProcessManagementTest extends TestCase {
private OMFactory _factory;
