[jboss-svn-commits] JBL Code SVN: r20274 - in labs/jbossesb/trunk/product/services/soapui-client/src: test/java/org/jboss/soa/esb/services/soapui and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 3 14:06:15 EDT 2008
Author: tfennelly
Date: 2008-06-03 14:06:15 -0400 (Tue, 03 Jun 2008)
New Revision: 20274
Added:
labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_01.xml
labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_02.xml
Removed:
labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713.xml
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
Log:
http://jira.jboss.com/jira/browse/JBESB-1713
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-06-03 16:05:15 UTC (rev 20273)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/main/java/org/jboss/soa/esb/services/soapui/SoapUIClientService.java 2008-06-03 18:06:15 UTC (rev 20274)
@@ -260,6 +260,10 @@
} else if(collectionSize == 1) {
// It's a collection, but no need to clone coz we
// already have an entry for it...
+ if(clonePoint == element) {
+ // If the element itself is the clone point, add the OGNL expression attribute...
+ element.setAttributeNS(OGNLUtils.JBOSSESB_SOAP_NS, OGNLUtils.JBOSSESB_SOAP_NS_PREFIX + OGNLUtils.OGNL_ATTRIB, ognl + "[0]");
+ }
} else {
// It's a collection and we need to do some cloning
if(clonePoint != null) {
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-06-03 16:05:15 UTC (rev 20273)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/JBESB_1713_SoapUIClientServiceMBeanUnitTest.java 2008-06-03 18:06:15 UTC (rev 20274)
@@ -60,18 +60,16 @@
public long arg6 = 2;
}
- 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 addBlahs(List<String> trains, int num) {
+ for(int i = 0; i < num; i++) {
+ trains.add(String.valueOf(i + 1));
+ }
}
- 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 void addRoles(List<String> roles, int num) {
+ for(int i = 0; i < num; i++) {
+ roles.add(new String("Role " + (i + 1)));
+ }
}
private static final String WSDL_LOCATAION = "src/test/java/org/jboss/soa/esb/services/soapui";
@@ -80,8 +78,16 @@
protected void setUp() throws Exception {
properties = new Properties();
}
-
- public void test_JBESB_1713() throws IOException, SAXException, ConfigurationException {
+
+ public void test_JBESB_1713_single() throws IOException, SAXException, ConfigurationException {
+ test_JBESB_1713(1, "expected_JBESB_1713_01.xml");
+ }
+
+ public void test_JBESB_1713_multiple() throws IOException, SAXException, ConfigurationException {
+ test_JBESB_1713(4, "expected_JBESB_1713_02.xml");
+ }
+
+ public void test_JBESB_1713(int num, String expected) throws IOException, SAXException, ConfigurationException {
File wsdlFile = new File(WSDL_LOCATAION + "/handdator.wsdl");
SoapUIClientService mbean = new SoapUIClientService();
Map params = new HashMap();
@@ -93,13 +99,13 @@
List<String> blahs1 = new ArrayList<String>();
List<String> roles1 = new ArrayList<String>();
- String[] blahs2 = new String[4];
- String[] roles2 = new String[4];
+ String[] blahs2 = new String[num];
+ String[] roles2 = new String[num];
properties.setProperty(HttpClientFactory.TARGET_HOST_URL, wsdlFile.toURI().toString());
- addBlahs(blahs1);
- addRoles(roles1);
+ addBlahs(blahs1, num);
+ addRoles(roles1, num);
postBlahMessage1.arg1 = blahs1;
postBlahMessage1.arg2 = roles1;
blahs1.toArray(blahs2);
@@ -110,13 +116,13 @@
params.put("postBlahMessage", postBlahMessage1);
String message = mbean.buildRequest(wsdlFile.toURI().toString(), "postBlahMessage", params, properties, null, null);
- assertTrue("Generated SOAP message not as expected. See expected_JBESB_1713.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_JBESB_1713.xml"), new ByteArrayInputStream(message.getBytes())));
+ assertTrue("Generated SOAP message not as expected. See " + expected + ". Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream(expected), new ByteArrayInputStream(message.getBytes())));
params.put("postBlahMessage", postBlahMessage2);
message = mbean.buildRequest(wsdlFile.toURI().toString(), "postBlahMessage", params, properties, null, null);
- assertTrue("Generated SOAP message not as expected. See expected_JBESB_1713.xml. Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream("expected_JBESB_1713.xml"), new ByteArrayInputStream(message.getBytes())));
+ assertTrue("Generated SOAP message not as expected. See " + expected + ". Generated message: \n" + message, compareCharStreams(getClass().getResourceAsStream(expected), new ByteArrayInputStream(message.getBytes())));
}
// Lifted from milyn commons
Deleted: 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-06-03 16:05:15 UTC (rev 20273)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713.xml 2008-06-03 18:06:15 UTC (rev 20274)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:x="http://x.y.x/">
- <soapenv:Header/>
- <soapenv:Body>
- <x:postBlahMessage>
- <!--Optional:-->
- <arg0>argument 0</arg0>
- <!--Zero or more repetitions: - cloned-->
- <arg1>1111</arg1>
-<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:-->
- <arg4>argument 4</arg4>
- <arg5>1</arg5>
- <arg6>2</arg6>
- </x:postBlahMessage>
- </soapenv:Body>
-</soapenv:Envelope>
Added: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_01.xml
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_01.xml (rev 0)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_01.xml 2008-06-03 18:06:15 UTC (rev 20274)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:x="http://x.y.x/">
+ <soapenv:Header/>
+ <soapenv:Body>
+ <x:postBlahMessage>
+ <!--Optional:-->
+ <arg0>argument 0</arg0>
+ <!--Zero or more repetitions: - cloned-->
+ <arg1>1</arg1>
+ <!--Zero or more repetitions: - cloned-->
+ <arg2>Role 1</arg2>
+ <arg3>true</arg3>
+ <!--Optional:-->
+ <arg4>argument 4</arg4>
+ <arg5>1</arg5>
+ <arg6>2</arg6>
+ </x:postBlahMessage>
+ </soapenv:Body>
+</soapenv:Envelope>
Property changes on: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_01.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Copied: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_02.xml (from rev 20014, 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_02.xml (rev 0)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_02.xml 2008-06-03 18:06:15 UTC (rev 20274)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:x="http://x.y.x/">
+ <soapenv:Header/>
+ <soapenv:Body>
+ <x:postBlahMessage>
+ <!--Optional:-->
+ <arg0>argument 0</arg0>
+ <!--Zero or more repetitions: - cloned-->
+ <arg1>1</arg1>
+<arg1>2</arg1>
+<arg1>3</arg1>
+<arg1>4</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:-->
+ <arg4>argument 4</arg4>
+ <arg5>1</arg5>
+ <arg6>2</arg6>
+ </x:postBlahMessage>
+ </soapenv:Body>
+</soapenv:Envelope>
Property changes on: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/expected_JBESB_1713_02.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
More information about the jboss-svn-commits
mailing list