Author: midon
Date: Wed May 27 20:46:48 2009
New Revision: 779305
URL: http://svn.apache.org/viewvc?rev=779305&view=rev
Log:
ODE-613: make wsdl compliant with the service response
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
ode/branches/APACHE_ODE_1.X/axis2/src/main/wsdl/pmapi.wsdl
Modified:
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java?rev=779305&r1=779304&r2=779305&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/axis2-war/src/test/java/org/apache/ode/axis2/management/InstanceManagementTest.java
Wed May 27 20:46:48 2009
@@ -183,15 +183,18 @@
assertTrue(result.toString().split("element").length > 10);
}
- // disable while ODE-613 is not fixed
- @Test(enabled = false)
+ @Test
public void testDeleteInstances() throws Exception {
OMElement root = _client.buildMessage("listAllInstancesWithLimit", new
String[] {"limit"}, new String[] {"1"});
OMElement result = sendToIM(root);
- String iid = result.getFirstElement().getFirstElement().getText();
- System.out.println("=> " +
result.getFirstElement().getFirstElement().getText());
- OMElement response = _client.buildMessage("delete", new
String[]{"piid"}, new String[]{iid});
- assertTrue(response.toString().indexOf("deleteResponse") >= 0 &&
response.toString().indexOf("iids") >= 0);
+ String iid = instances(result).get(0).getFirstElement().getText();
+ System.out.println("=> " + iid);
+ OMElement msg= _client.buildMessage("delete", new String[]{"filter"},
new String[]{"iid="+iid});
+ OMElement response = sendToIM(msg);
+ System.out.println(response);
+ List<OMElement> elements =
IteratorUtils.toList(response.getFirstElement().getChildrenWithName(new
QName("", "element")));
+ assertTrue("Must delete only one instance", elements.size()==1);
+ assertTrue(iid.equals(elements.get(0).getText()));
}
@BeforeMethod
Modified: ode/branches/APACHE_ODE_1.X/axis2/src/main/wsdl/pmapi.wsdl
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/wsdl/pmapi.wsdl?rev=779305&r1=779304&r2=779305&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/axis2/src/main/wsdl/pmapi.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/axis2/src/main/wsdl/pmapi.wsdl Wed May 27
20:46:48 2009
@@ -41,11 +41,6 @@
<xsd:element name="element" type="xsd:string"/>
</xsd:all>
</xsd:complexType>
- <xsd:complexType name="iidsType">
- <xsd:all>
- <xsd:element name="iid" type="xsd:long"/>
- </xsd:all>
- </xsd:complexType>
<xsd:element name="ManagementFault" type="xsd:string"/>
</xsd:schema>
</types>
@@ -212,7 +207,7 @@
<part name="filter" type="xsd:string"/>
</message>
<message name="deleteOutput">
- <part name="iids" type="tns:iidsType"/>
+ <part name="list" type="tns:listType"/>
</message>
<message name="recoverActivityInput">
<part name="iid" type="xsd:long"/>
