svn commit: r1540733 - /sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/ModifyAceTest.java

[bdelacretaz]

Author: bdelacretaz
Date: Mon Nov 11 14:05:43 2013
New Revision: 1540733

URL: http://svn.apache.org/r1540733
Log:
SLING-3225 - All ModifyAceTest tests pass with Oak 0.10

Modified:
    
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/ModifyAceTest.java

Modified: 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/ModifyAceTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/ModifyAceTest.java?rev=1540733&r1=1540732&r2=1540733&view=diff
==============================================================================
--- 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/ModifyAceTest.java
 (original)
+++ 
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/ModifyAceTest.java
 Mon Nov 11 14:05:43 2013
@@ -36,7 +36,6 @@ import org.apache.sling.commons.json.JSO
 import org.apache.sling.commons.json.JSONException;
 import org.apache.sling.commons.json.JSONObject;
 import org.apache.sling.commons.testing.integration.HttpTest;
-import org.apache.sling.commons.testing.junit.categories.JackrabbitOnly;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -962,7 +961,6 @@ public class ModifyAceTest {
         * Test for SLING-3010
         */
        @Test 
-    @Category(JackrabbitOnly.class) // TODO: fails on Oak
        public void 
testMergeAceForUserGrantAggregatePrivilegePartsAfterDenyAggregatePrivilege() 
throws IOException, JSONException {
                testUserId = H.createTestUser();