You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2013/04/10 21:06:07 UTC

svn commit: r1466626 - /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NodeTypeDefinitionManagementTest.java

Author: angela
Date: Wed Apr 10 19:06:07 2013
New Revision: 1466626

URL: http://svn.apache.org/r1466626
Log:
OAK-527: permissions (WIP: include permission related tests)

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NodeTypeDefinitionManagementTest.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NodeTypeDefinitionManagementTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NodeTypeDefinitionManagementTest.java?rev=1466626&r1=1466625&r2=1466626&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NodeTypeDefinitionManagementTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/NodeTypeDefinitionManagementTest.java Wed Apr 10 19:06:07 2013
@@ -24,13 +24,11 @@ import javax.jcr.security.AccessControlP
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * NodeTypeDefinitionManagementTest... TODO
  */
-@Ignore("OAK-51")
 public class NodeTypeDefinitionManagementTest extends AbstractEvaluationTest {
 
     private static final String JCR_NODE_TYPE_DEFINITION_MANAGEMENT = "jcr:nodeTypeDefinitionManagement";
@@ -140,24 +138,20 @@ public class NodeTypeDefinitionManagemen
             try {
                 NodeTypeManager testNtm = testWsp.getNodeTypeManager();
                 testNtm.unregisterNodeType(ntd.getName());
-                fail("Namespace unregistration should be denied.");
+                fail("Node type unregistration should be denied.");
             } catch (AccessDeniedException e) {
                 // success
             }
             try {
                 NodeTypeManager testNtm = testWsp.getNodeTypeManager();
                 testNtm.unregisterNodeTypes(new String[] {ntd.getName()});
-                fail("Namespace unregistration should be denied.");
+                fail("Node type unregistration should be denied.");
             } catch (AccessDeniedException e) {
                 // success
             }
         } finally {
-            // clean up (not supported by jackrabbit-core)
-            try {
-                ntm.unregisterNodeType(ntd.getName());
-            } catch (Exception e) {
-                // ns unregistration is not supported by jackrabbit-core.
-            }
+            // TODO: diff to jr-core where unregisterNt was not supported
+            ntm.unregisterNodeType(ntd.getName());
         }
     }
 }
\ No newline at end of file