You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/10/18 09:46:39 UTC
svn commit: r1185516 - in /incubator/isis/trunk/framework/viewer/json: json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/invoke/ json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ json-viewer/sr...

Author: danhaywood
Date: Tue Oct 18 07:46:39 2011
New Revision: 1185516

URL: http://svn.apache.org/viewvc?rev=1185516&view=rev
Log:
ISIS-109: reinstating test that was temporarily broken in previous commit

Added:
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/JsonApplicationExceptionMapperTest.java
      - copied, changed from r1183616, incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/JsonExceptionMapperTest.java
Removed:
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/JsonExceptionMapperTest.java
Modified:
    incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/invoke/DomainServiceResourceTest_invokeAction.java
    incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelper.java

Modified: incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/invoke/DomainServiceResourceTest_invokeAction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/invoke/DomainServiceResourceTest_invokeAction.java?rev=1185516&r1=1185515&r2=1185516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/invoke/DomainServiceResourceTest_invokeAction.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/resources/service/invoke/DomainServiceResourceTest_invokeAction.java Tue Oct 18 07:46:39 2011
@@ -48,7 +48,6 @@ public class DomainServiceResourceTest_i
     }
 
 
-    @org.junit.Ignore("temporarily broken")
     @Test
     public void invokeQueryOnly_noArg_usingClientFollow() throws Exception {
 

Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelper.java?rev=1185516&r1=1185515&r2=1185516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelper.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelper.java Tue Oct 18 07:46:39 2011
@@ -158,7 +158,14 @@ public class DomainResourceHelper {
 
 
     static JsonRepresentation parseQueryString(ObjectAction action, String argumentsQueryString) {
-        final String urlDecode = UrlEncodingUtils.urlDecode(argumentsQueryString);
+        if(argumentsQueryString == null) {
+            return JsonRepresentation.newMap();
+        }
+        String argumentsTrimmed = argumentsQueryString.trim();
+        if(argumentsTrimmed .isEmpty()) {
+            return JsonRepresentation.newMap();
+        }
+        final String urlDecode = UrlEncodingUtils.urlDecode(argumentsTrimmed);
         try {
             return JsonMapper.instance().read(urlDecode);
         } catch (Exception e) {

Copied: incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/JsonApplicationExceptionMapperTest.java (from r1183616, incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/JsonExceptionMapperTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/JsonApplicationExceptionMapperTest.java?p2=incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/JsonApplicationExceptionMapperTest.java&p1=incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/JsonExceptionMapperTest.java&r1=1183616&r2=1185516&rev=1185516&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/JsonExceptionMapperTest.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/test/java/org/apache/isis/viewer/json/viewer/resources/JsonApplicationExceptionMapperTest.java Tue Oct 18 07:46:39 2011
@@ -16,7 +16,7 @@ import org.apache.isis.viewer.json.viewe
 import org.junit.Before;
 import org.junit.Test;
 
-public class JsonExceptionMapperTest {
+public class JsonApplicationExceptionMapperTest {
 
     private JsonApplicationExceptionMapper exceptionMapper;