From 29c838253772a7f03ca3832139bab0388c20df03 Mon Sep 17 00:00:00 2001 From: rfeng Date: Mon, 17 Sep 2012 18:10:11 +0000 Subject: Enhance the include/exclude filter processing and fix a NPE git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1386756 13f79535-47bb-0310-9956-ffa450edef68 --- .../wireformat/json/CatalogServiceTestCase.java | 36 ++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) (limited to 'sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache') diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java index c09871241c..7a07c9b5c8 100644 --- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java +++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java @@ -91,15 +91,47 @@ public class CatalogServiceTestCase { } @Test - public void testGetInvocationWithFilter() throws Exception { + public void testGetInvocationWithFilter1() throws Exception { WebConversation wc = new WebConversation(); - WebRequest request = new GetMethodWebRequest(SERVICE_URL + "?excludedFields=price"); + WebRequest request = new GetMethodWebRequest(SERVICE_URL + "?excludedFields=items.price"); request.setHeaderField("Content-Type", "application/json"); WebResponse response = wc.getResource(request); Assert.assertEquals(200, response.getResponseCode()); String json = response.getText(); + System.out.println(json); Assert.assertNotNull(json); + Assert.assertTrue(json.contains("name")); + Assert.assertFalse(json.contains("price")); + } + + @Test + public void testGetInvocationWithFilter2() throws Exception { + WebConversation wc = new WebConversation(); + WebRequest request = new GetMethodWebRequest(SERVICE_URL + "?fields=items,-items.price"); + request.setHeaderField("Content-Type", "application/json"); + WebResponse response = wc.getResource(request); + + Assert.assertEquals(200, response.getResponseCode()); + String json = response.getText(); + System.out.println(json); + Assert.assertNotNull(json); + Assert.assertTrue(json.contains("name")); + Assert.assertFalse(json.contains("price")); + } + + @Test + public void testGetInvocationWithFilter3() throws Exception { + WebConversation wc = new WebConversation(); + WebRequest request = new GetMethodWebRequest(SERVICE_URL + "?includedFields=items.name&excludedFields=items"); + request.setHeaderField("Content-Type", "application/json"); + WebResponse response = wc.getResource(request); + + Assert.assertEquals(200, response.getResponseCode()); + String json = response.getText(); + System.out.println(json); + Assert.assertNotNull(json); + Assert.assertTrue(json.contains("name")); Assert.assertFalse(json.contains("price")); } -- cgit v1.2.3