[jboss-svn-commits] JBL Code SVN: r19960 - in labs/jbossesb/trunk/product/services/soapui-client/src: test/java/org/jboss/soa/esb/services/soapui and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu May 15 06:14:31 EDT 2008
Author: tfennelly
Date: 2008-05-15 06:14:31 -0400 (Thu, 15 May 2008)
New Revision: 19960
Modified:
labs/jbossesb/trunk/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java
labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java
labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713.xml
labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/handdator.wsdl
labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/orderprocessing/expected_01.xml
labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/orderprocessing/expected_01_JBESB-1329.xml
Log:
http://jira.jboss.com/jira/browse/JBESB-1726
Modified: labs/jbossesb/trunk/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java 2008-05-15 09:32:52 UTC (rev 19959)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java 2008-05-15 10:14:31 UTC (rev 19960)
@@ -170,16 +170,20 @@
Element docRoot = messageDoc.getDocumentElement();
- expandMessage(docRoot, params);
-
// Purposely not using log levels to output because I want to make
// it as easy as possible for the developer to dump the SOAP during dev. They
// just need to set "dumpSOAP" in the param Map....
boolean dumpSOAP = params.containsKey("dumpSOAP");
if(dumpSOAP) {
- dumpSOAP("SOAP Template:", docRoot);
+ dumpSOAP("SOAP Template (Unexpanded):", docRoot);
}
+ expandMessage(docRoot, params);
+
+ if(dumpSOAP) {
+ dumpSOAP("SOAP Template (Expanded):", docRoot);
+ }
+
injectParameters(docRoot, params, soapNs);
if(smooksResource != null) {
@@ -187,7 +191,7 @@
}
if(dumpSOAP) {
- dumpSOAP("SOAP Message (populated Template):", docRoot);
+ dumpSOAP("SOAP Message (Populated Template):", docRoot);
}
return XmlUtil.serialize(messageDoc.getChildNodes());
@@ -404,7 +408,7 @@
return;
}
- Element nextSibling = YADOMUtil.getNextSiblingElement(element);
+ Node insertPoint = element.getNextSibling();
Node parent = element.getParentNode();
element.setAttributeNS(OGNLUtils.JBOSSESB_SOAP_NS, OGNLUtils.JBOSSESB_SOAP_NS_PREFIX + OGNLUtils.OGNL_ATTRIB, ognl + "[0]");
@@ -413,12 +417,11 @@
clone.setAttributeNS(OGNLUtils.JBOSSESB_SOAP_NS, OGNLUtils.JBOSSESB_SOAP_NS_PREFIX + IS_CLONE_ATTRIB, "true");
clone.setAttributeNS(OGNLUtils.JBOSSESB_SOAP_NS, OGNLUtils.JBOSSESB_SOAP_NS_PREFIX + OGNLUtils.OGNL_ATTRIB, ognl + "[" + Integer.toString(i + 1) + "]");
- if (nextSibling == null) {
+ if (insertPoint == null) {
parent.appendChild(clone);
} else {
- parent.insertBefore(clone, nextSibling);
+ parent.insertBefore(clone, insertPoint);
}
- nextSibling = YADOMUtil.getNextSiblingElement(clone);
}
}
Modified: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java 2008-05-15 09:32:52 UTC (rev 19959)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java 2008-05-15 10:14:31 UTC (rev 19960)
@@ -43,28 +43,37 @@
private class PostBlahMessage1 {
public String arg0 = "argument 0";
public List<String> arg1;
- public boolean arg2 = true;
- public String arg3 = "argument 3";
- public long arg4 = 1;
- public long arg5 = 2;
+ public List<String> arg2;
+ public boolean arg3 = true;
+ public String arg4 = "argument 4";
+ public long arg5 = 1;
+ public long arg6 = 2;
}
private class PostBlahMessage2 {
public String arg0 = "argument 0";
public String[] arg1;
- public boolean arg2 = true;
- public String arg3 = "argument 3";
- public long arg4 = 1;
- public long arg5 = 2;
+ public String[] arg2;
+ public boolean arg3 = true;
+ public String arg4 = "argument 4";
+ public long arg5 = 1;
+ public long arg6 = 2;
}
- private void addBlahs(List<String> blahs) {
- blahs.add(new String("1111"));
- blahs.add(new String("2222"));
- blahs.add(new String("3333"));
- blahs.add(new String("4444"));
+ private void addBlahs(List<String> trains) {
+ trains.add(new String("1111"));
+ trains.add(new String("2222"));
+ trains.add(new String("3333"));
+ trains.add(new String("4444"));
}
+ private void addRoles(List<String> roles) {
+ roles.add(new String("Role 1"));
+ roles.add(new String("Role 2"));
+ roles.add(new String("Role 3"));
+ roles.add(new String("Role 4"));
+ }
+
private static final String WSDL_LOCATAION = "src/test/java/org/jboss/soa/esb/services/soapui";
private Properties properties;
@@ -81,15 +90,22 @@
PostBlahMessage1 postBlahMessage1 = new PostBlahMessage1();
PostBlahMessage2 postBlahMessage2 = new PostBlahMessage2();
+
List<String> blahs1 = new ArrayList<String>();
+ List<String> roles1 = new ArrayList<String>();
String[] blahs2 = new String[4];
+ String[] roles2 = new String[4];
properties.setProperty(HttpClientFactory.TARGET_HOST_URL, wsdlFile.toURI().toString());
addBlahs(blahs1);
+ addRoles(roles1);
postBlahMessage1.arg1 = blahs1;
+ postBlahMessage1.arg2 = roles1;
blahs1.toArray(blahs2);
+ roles1.toArray(roles2);
postBlahMessage2.arg1 = blahs2;
+ postBlahMessage2.arg2 = roles2;
params.put("postBlahMessage", postBlahMessage1);
Modified: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java 2008-05-15 09:32:52 UTC (rev 19959)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java 2008-05-15 10:14:31 UTC (rev 19960)
@@ -120,6 +120,8 @@
Map params = new HashMap();
ArrayList<LineItem> lineItems = new ArrayList<LineItem>();
+ params.put("dumpSOAP", null);
+
properties.setProperty(HttpClientFactory.TARGET_HOST_URL, wsdlFile.toURI().toString());
Order order = new Order();
Modified: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713.xml
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713.xml 2008-05-15 09:32:52 UTC (rev 19959)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713.xml 2008-05-15 10:14:31 UTC (rev 19960)
@@ -7,11 +7,19 @@
<arg0>argument 0</arg0>
<!--Zero or more repetitions: - cloned-->
<arg1>1111</arg1>
- <arg1>2222</arg1><arg1>3333</arg1><arg1>4444</arg1><arg2>true</arg2>
+<arg1>2222</arg1>
+<arg1>3333</arg1>
+<arg1>4444</arg1>
+ <!--Zero or more repetitions: - cloned-->
+ <arg2>Role 1</arg2>
+<arg2>Role 2</arg2>
+<arg2>Role 3</arg2>
+<arg2>Role 4</arg2>
+ <arg3>true</arg3>
<!--Optional:-->
- <arg3>argument 3</arg3>
- <arg4>1</arg4>
- <arg5>2</arg5>
+ <arg4>argument 4</arg4>
+ <arg5>1</arg5>
+ <arg6>2</arg6>
</x:postBlahMessage>
</soapenv:Body>
-</soapenv:Envelope>
\ No newline at end of file
+</soapenv:Envelope>
Modified: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/handdator.wsdl
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/handdator.wsdl 2008-05-15 09:32:52 UTC (rev 19959)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/handdator.wsdl 2008-05-15 10:14:31 UTC (rev 19960)
@@ -7,10 +7,11 @@
<xs:sequence>
<xs:element minOccurs='0' name='arg0' type='xs:string'/>
<xs:element maxOccurs='unbounded' minOccurs='0' name='arg1' type='xs:string'/>
- <xs:element name='arg2' type='xs:boolean'/>
- <xs:element minOccurs='0' name='arg3' type='xs:string'/>
- <xs:element name='arg4' type='xs:long'/>
+ <xs:element maxOccurs='unbounded' minOccurs='0' name='arg2' type='xs:string'/>
+ <xs:element name='arg3' type='xs:boolean'/>
+ <xs:element minOccurs='0' name='arg4' type='xs:string'/>
<xs:element name='arg5' type='xs:long'/>
+ <xs:element name='arg6' type='xs:long'/>
</xs:sequence>
</xs:complexType>
<xs:complexType name='postBlahMessageResponse'>
Modified: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/orderprocessing/expected_01.xml
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/orderprocessing/expected_01.xml 2008-05-15 09:32:52 UTC (rev 19959)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/orderprocessing/expected_01.xml 2008-05-15 10:14:31 UTC (rev 19960)
@@ -14,9 +14,7 @@
<name>item1</name>
<!--Optional:-->
<price>10.99</price>
- </lineItems>
- <!--Optional:-->
- <lineItems>
+ </lineItems><lineItems>
<!--Optional:-->
<id>890</id>
<!--Optional:-->
@@ -30,7 +28,9 @@
<name>item3</name>
<!--Optional:-->
<price>76.34</price>
- </lineItems><shipTo>Skeagh Bridge</shipTo>
+ </lineItems>
+ <!--Optional:-->
+ <shipTo>Skeagh Bridge</shipTo>
</order>
</end:processOrder>
</soapenv:Body>
Modified: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/orderprocessing/expected_01_JBESB-1329.xml
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/orderprocessing/expected_01_JBESB-1329.xml 2008-05-15 09:32:52 UTC (rev 19959)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/orderprocessing/expected_01_JBESB-1329.xml 2008-05-15 10:14:31 UTC (rev 19960)
@@ -12,9 +12,7 @@
<name>item1</name>
<!--Optional:-->
<price>10.99</price>
- </lineItems>
- <!--Optional:-->
- <lineItems>
+ </lineItems><lineItems>
<!--Optional:-->
<id>890</id>
<!--Optional:-->
@@ -28,10 +26,12 @@
<name>item3</name>
<!--Optional:-->
<price>76.34</price>
- </lineItems><id>123</id>
+ </lineItems>
<!--Optional:-->
+ <id>123</id>
+ <!--Optional:-->
<shipTo>Skeagh Bridge</shipTo>
</order>
</end:processOrder>
</soapenv:Body>
-</soapenv:Envelope>
\ No newline at end of file
+</soapenv:Envelope>
More information about the jboss-svn-commits
mailing list