Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B3A56F0D5 for ; Wed, 10 Apr 2013 18:54:07 +0000 (UTC) Received: (qmail 16214 invoked by uid 500); 10 Apr 2013 18:54:07 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 16175 invoked by uid 500); 10 Apr 2013 18:54:07 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 16163 invoked by uid 99); 10 Apr 2013 18:54:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Apr 2013 18:54:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Apr 2013 18:54:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4EA9F23888CD; Wed, 10 Apr 2013 18:53:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1466618 - in /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization: ObservationTest.java PrivilegeManagementTest.java Date: Wed, 10 Apr 2013 18:53:43 -0000 To: oak-commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130410185343.4EA9F23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Wed Apr 10 18:53:42 2013 New Revision: 1466618 URL: http://svn.apache.org/r1466618 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/ObservationTest.java jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/PrivilegeManagementTest.java Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ObservationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ObservationTest.java?rev=1466618&r1=1466617&r2=1466618&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ObservationTest.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ObservationTest.java Wed Apr 10 18:53:42 2013 @@ -20,13 +20,11 @@ import javax.jcr.observation.Event; import javax.jcr.observation.ObservationManager; import org.apache.jackrabbit.test.api.observation.EventResult; -import org.junit.Ignore; import org.junit.Test; /** * ObservationTest... TODO */ -@Ignore("OAK-51") public class ObservationTest extends AbstractEvaluationTest { private static final long DEFAULT_WAIT_TIMEOUT = 5000; Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/PrivilegeManagementTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/PrivilegeManagementTest.java?rev=1466618&r1=1466617&r2=1466618&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/PrivilegeManagementTest.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/PrivilegeManagementTest.java Wed Apr 10 18:53:42 2013 @@ -25,13 +25,11 @@ import javax.jcr.security.Privilege; import org.apache.jackrabbit.api.JackrabbitWorkspace; import org.apache.jackrabbit.test.NotExecutableException; -import org.junit.Ignore; import org.junit.Test; /** * PrivilegeManagementTest... TODO */ -@Ignore("OAK-51") public class PrivilegeManagementTest extends AbstractEvaluationTest { private static final String REP_PRIVILEGE_MANAGEMENT = "rep:privilegeManagement"; @@ -86,16 +84,22 @@ public class PrivilegeManagementTest ext } @Test - public void testRegisterPrivilegeWithPrivilege() throws Exception { + public void testModifyPrivilegeMgtPrivilege() throws Exception { modify(null, REP_PRIVILEGE_MANAGEMENT, true); assertHasPrivilege(null, REP_PRIVILEGE_MANAGEMENT, true); + modify(null, REP_PRIVILEGE_MANAGEMENT, false); + assertHasPrivilege(null, REP_PRIVILEGE_MANAGEMENT, false); + } + + @Test + public void testRegisterPrivilegeWithPrivilege() throws Exception { + modify(null, REP_PRIVILEGE_MANAGEMENT, true); try { Workspace testWsp = testSession.getWorkspace(); - ((JackrabbitWorkspace) testWsp).getPrivilegeManager().registerPrivilege(getNewPrivilegeName(testWsp), false, new String[0]); } finally { + ((JackrabbitWorkspace) testWsp).getPrivilegeManager().registerPrivilege(getNewPrivilegeName(testWsp), false, new String[0]); + } finally { modify(null, REP_PRIVILEGE_MANAGEMENT, false); } - - assertHasPrivilege(null, REP_PRIVILEGE_MANAGEMENT, false); } } \ No newline at end of file