Author: keith Date: Wed Jun 25 23:46:11 2008 New Revision: 18646 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18646
Log: Final fixes for Mashup-886 Modified: trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/E4XTest.java trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/SchemaIntegrationTest.java Modified: trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/E4XTest.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/E4XTest.java?rev=18646&r1=18645&r2=18646&view=diff ============================================================================== --- trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/E4XTest.java (original) +++ trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/E4XTest.java Wed Jun 25 23:46:11 2008 @@ -17,10 +17,15 @@ import junit.framework.TestCase; import org.apache.axiom.om.OMElement; +import org.apache.axiom.om.OMFactory; +import org.apache.axiom.om.OMNamespace; +import org.apache.axiom.om.OMAbstractFactory; import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.client.Options; import org.apache.axis2.client.ServiceClient; +import javax.xml.namespace.QName; + /** * This test tests out the axiom E4X implementation. This test intends to cover all E4X operations * that we permit in the mashup server @@ -33,6 +38,10 @@ // The instance of service client that we use to invoke each operation private ServiceClient sender; + private OMFactory omFactory; + private OMNamespace xsiNamespace, jsNamespace; + private QName xsiQName, jsQName; + public void setUp() throws java.lang.Exception { super.setUp(); @@ -41,7 +50,11 @@ endpointReference = new EndpointReference(host + ":" + port + "/" + serviceRoot + "/system/E4XTest"); - // Tests weather the server has started + omFactory = OMAbstractFactory.getOMFactory(); + xsiNamespace = omFactory.createOMNamespace("http://www.w3.org/2001/XMLSchema-instance";, "xsi"); + jsNamespace = omFactory.createOMNamespace("http://www.wso2.org/ns/jstype";, "js"); + xsiQName = new QName("http://www.w3.org/2001/XMLSchema-instance";, "type"); + jsQName = new QName("http://www.wso2.org/ns/jstype";, "type"); } @@ -141,15 +154,19 @@ "http://services.mashup.wso2.org/E4XTest/ServiceInterface/child2Request";); sender.setOptions(options); OMElement result = sender.sendReceive(null); - // Test weather the correct element was returned correctly - TestCase.assertEquals( - "<return xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"; " + - "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; " + - "xmlns:js=\"http://www.wso2.org/ns/jstype\"; js:type=\"xmlList\" " + - "xsi:type=\"xs:anyType\">" + - "<employee id=\"0\"><name>Jim</name><age>25</age></employee>" + - "<employee id=\"1\"><name>Joe</name><age>20</age></employee></return>", - result.getFirstElement().toString()); + + OMElement innerElement = result.getFirstElement(); + TestCase.assertTrue(innerElement.getAttribute(jsQName).equals( + omFactory.createOMAttribute("type", jsNamespace, "xmlList"))); + TestCase.assertTrue(innerElement.getAttribute(xsiQName).equals( + omFactory.createOMAttribute("type", xsiNamespace, "xs:anyType"))); + + OMElement element = innerElement.getFirstElement(); + TestCase.assertEquals(element.toString(), + "<employee id=\"0\"><name>Jim</name><age>25</age></employee>"); + element = (OMElement) element.getNextOMSibling(); + TestCase.assertEquals(element.toString(), + "<employee id=\"1\"><name>Joe</name><age>20</age></employee>"); } /** @@ -178,12 +195,18 @@ "http://services.mashup.wso2.org/E4XTest/ServiceInterface/childrenRequest";); sender.setOptions(options); OMElement result = sender.sendReceive(null); - // Test weather the index of the element was returned correctly - TestCase.assertEquals("<return xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"; " + - "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; " + - "xmlns:js=\"http://www.wso2.org/ns/jstype\"; js:type=\"xmlList\" " + - "xsi:type=\"xs:anyType\"><name>Jim</name><age>25</age></return>", - result.getFirstElement().toString()); + + OMElement innerElement = result.getFirstElement(); + TestCase.assertTrue(innerElement.getAttribute(jsQName).equals( + omFactory.createOMAttribute("type", jsNamespace, "xmlList"))); + TestCase.assertTrue(innerElement.getAttribute(xsiQName).equals( + omFactory.createOMAttribute("type", xsiNamespace, "xs:anyType"))); + + OMElement element = innerElement.getFirstElement(); + TestCase.assertEquals(element.toString(), + "<name>Jim</name>"); + TestCase.assertEquals(element.getNextOMSibling().toString(), + "<age>25</age>"); } /** @@ -198,13 +221,19 @@ "http://services.mashup.wso2.org/E4XTest/ServiceInterface/elements1Request";); sender.setOptions(options); OMElement result = sender.sendReceive(null); - // Test weather the index of the element was returned correctly - TestCase.assertEquals("<return xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"; " + - "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; " + - "xmlns:js=\"http://www.wso2.org/ns/jstype\"; js:type=\"xmlList\" " + - "xsi:type=\"xs:anyType\"><employee id=\"0\"><name>Jim</name><age>25</age></employee>" + - "<employee id=\"1\"><name>Joe</name><age>20</age></employee></return>", - result.getFirstElement().toString()); + + OMElement innerElement = result.getFirstElement(); + TestCase.assertTrue(innerElement.getAttribute(jsQName).equals( + omFactory.createOMAttribute("type", jsNamespace, "xmlList"))); + TestCase.assertTrue(innerElement.getAttribute(xsiQName).equals( + omFactory.createOMAttribute("type", xsiNamespace, "xs:anyType"))); + + OMElement element = innerElement.getFirstElement(); + TestCase.assertEquals(element.toString(), + "<employee id=\"0\"><name>Jim</name><age>25</age></employee>"); + element = (OMElement) element.getNextOMSibling(); + TestCase.assertEquals(element.toString(), + "<employee id=\"1\"><name>Joe</name><age>20</age></employee>"); } /** @@ -220,12 +249,15 @@ "http://services.mashup.wso2.org/E4XTest/ServiceInterface/elements2Request";); sender.setOptions(options); OMElement result = sender.sendReceive(null); - // Test weather the index of the element was returned correctly - TestCase.assertEquals("<return xmlns:xs=\"http://www.w3.org/2001/XMLSchema\"; " + - "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; " + - "xmlns:js=\"http://www.wso2.org/ns/jstype\"; js:type=\"xmlList\" " + - "xsi:type=\"xs:anyType\"><name>Jim</name></return>", - result.getFirstElement().toString()); + + OMElement innerElement = result.getFirstElement(); + TestCase.assertTrue(innerElement.getAttribute(jsQName).equals( + omFactory.createOMAttribute("type", jsNamespace, "xmlList"))); + TestCase.assertTrue(innerElement.getAttribute(xsiQName).equals( + omFactory.createOMAttribute("type", xsiNamespace, "xs:anyType"))); + + TestCase.assertEquals(innerElement.getFirstElement().toString(), + "<name>Jim</name>"); } /** Modified: trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/SchemaIntegrationTest.java URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/SchemaIntegrationTest.java?rev=18646&r1=18645&r2=18646&view=diff ============================================================================== --- trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/SchemaIntegrationTest.java (original) +++ trunk/mashup/java/modules/integration/test/org/wso2/mashup/integration/SchemaIntegrationTest.java Wed Jun 25 23:46:11 2008 @@ -41,9 +41,9 @@ implements IntegrationTestConstants { private EndpointReference schemaTestEPR; - OMFactory omFactory; - OMNamespace xsiNamespace, jsNamespace; - QName xsiQName, jsQName; + private OMFactory omFactory; + private OMNamespace xsiNamespace, jsNamespace; + private QName xsiQName, jsQName; private ServiceClient sender; _______________________________________________ Mashup-dev mailing list [email protected] http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
