From 66ac4e82a503af71fb664f0b2c3d5099e4337066 Mon Sep 17 00:00:00 2001 From: nash Date: Tue, 30 Nov 2010 18:04:47 +0000 Subject: TUSCANY-3747: Update result comparison code so that it works on JDK 5 and JDK 6 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1040660 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/binding/jsonrpc/BindingTestCase.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'sca-java-1.x') diff --git a/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/BindingTestCase.java b/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/BindingTestCase.java index 4de6e4464c..c9d7ea8123 100644 --- a/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/BindingTestCase.java +++ b/sca-java-1.x/trunk/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/BindingTestCase.java @@ -68,7 +68,9 @@ public class BindingTestCase { JSONObject jsonResp = callService ("http://localhost:8085/HelloWorldComponent/HelloWorldService", jsonRequest); Assert.assertNotNull(jsonResp); - Assert.assertEquals("{\"id\":1,\"result\":\"Hello petra\"}", jsonResp.toString()); + Assert.assertEquals(new JSONObject( + "{\"id\":1,\"result\":\"Hello petra\"}" + ).toString(), jsonResp.toString()); } catch(Exception ex){ ex.printStackTrace(); @@ -83,7 +85,9 @@ public class BindingTestCase { JSONObject jsonResp = callService ("http://localhost:8085/HelloWorldComponent/HelloWorldService", jsonRequest); Assert.assertNotNull(jsonResp); - Assert.assertEquals("{\"id\":1,\"result\":\"Hello petra arnold\"}", jsonResp.toString()); + Assert.assertEquals(new JSONObject( + "{\"id\":1,\"result\":\"Hello petra arnold\"}" + ).toString(), jsonResp.toString()); } catch(Exception ex){ ex.printStackTrace(); @@ -101,7 +105,12 @@ public class BindingTestCase { Assert.assertNotNull(jsonResp); //JabSorb sends class hints with complex parameters/types - Assert.assertEquals("{\"id\":1,\"result\":{\"s\":\"XYZ\",\"b\":true,\"javaClass\":\"helloworld.BeanA\",\"y\":5,\"x\":2}}", jsonResp.toString()); + String temp = new JSONObject( + "{\"x\":2,\"s\":\"XYZ\",\"b\":true,\"y\":5,\"javaClass\":\"helloworld.BeanA\"}" + ).toString(); + Assert.assertEquals(new JSONObject( + "{\"id\":1,\"result\":" + temp + "}" + ).toString(), jsonResp.toString()); } catch(Exception ex){ ex.printStackTrace(); @@ -117,7 +126,9 @@ public class BindingTestCase { JSONObject jsonResp = callService ("http://localhost:8085/HelloWorldComponent/HelloWorldService", jsonRequest); Assert.assertNotNull(jsonResp); - Assert.assertEquals("{\"id\":1,\"result\":[\"Hello Fred Bloggs\"]}", jsonResp.toString()); + Assert.assertEquals(new JSONObject( + "{\"id\":1,\"result\":[\"Hello Fred Bloggs\"]}" + ).toString(), jsonResp.toString()); } catch(Exception ex){ ex.printStackTrace(); -- cgit v1.2.3