jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1378514 - /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/privilege/PrivilegeManagerImplTest.java
Date Wed, 29 Aug 2012 12:09:30 GMT
Author: mduerig
Date: Wed Aug 29 12:09:30 2012
New Revision: 1378514

URL: http://svn.apache.org/viewvc?rev=1378514&view=rev
Log:
OAK-287: PrivilegeManagerImplTest.testJcrAll assumes that there are no custom privileges
resolve merge conflict with changes from OAK-285

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/privilege/PrivilegeManagerImplTest.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/privilege/PrivilegeManagerImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/privilege/PrivilegeManagerImplTest.java?rev=1378514&r1=1378513&r2=1378514&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/privilege/PrivilegeManagerImplTest.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/privilege/PrivilegeManagerImplTest.java
Wed Aug 29 12:09:30 2012
@@ -16,13 +16,6 @@
  */
 package org.apache.jackrabbit.oak.jcr.security.privilege;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static org.apache.jackrabbit.oak.jcr.RepositoryTestUtils.buildDefaultCommitEditor;
-import static org.junit.Assert.fail;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -54,6 +47,13 @@ import org.apache.jackrabbit.oak.securit
 import org.junit.Before;
 import org.junit.Test;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertTrue;
+import static org.apache.jackrabbit.oak.jcr.RepositoryTestUtils.buildDefaultCommitHook;
+import static org.junit.Assert.fail;
+
 /**
  * PrivilegeManagerTest...
  *
@@ -71,7 +71,7 @@ public class PrivilegeManagerImplTest im
     @Before
     public void setUp() throws Exception {
         ContentRepository contentRepository = new ContentRepositoryImpl(
-                new MicroKernelImpl(), null, buildDefaultCommitEditor());
+                new MicroKernelImpl(), null, buildDefaultCommitHook());
         repository = new RepositoryImpl(
                 contentRepository, Executors.newScheduledThreadPool(1));
 



Mime
View raw message