You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2013/10/02 15:26:21 UTC

svn commit: r1528465 - /sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java

Author: bdelacretaz
Date: Wed Oct  2 13:26:21 2013
New Revision: 1528465

URL: http://svn.apache.org/r1528465
Log:
SLING-2788 - Oak returns an empty jcr:mixinTypes array instead of removing the property, that's fine as well

Modified:
    sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java

Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java?rev=1528465&r1=1528464&r2=1528465&view=diff
==============================================================================
--- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java (original)
+++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java Wed Oct  2 13:26:21 2013
@@ -182,7 +182,8 @@ public void testPostPathIsUnique() throw
 
         content = getContent(location + ".json", CONTENT_TYPE_JSON);
         json = new JSONObject(content);
-        assertTrue("no jcr:mixinTypes expected after clearing it", !json.has("jcr:mixinTypes"));
+        final boolean noMixins = !json.has("jcr:mixinTypes") || json.getJSONArray("jcr:mixinTypes").length() == 0;
+        assertTrue("no jcr:mixinTypes expected after clearing it", noMixins);
     }
 
     public void testUpdatingNodetype() throws IOException, JSONException {