svn commit: r1669363 - in /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization: AbstractEvaluationTest.java ReadTest.java

[angela]

Author: angela
Date: Thu Mar 26 16:10:00 2015
New Revision: 1669363

URL: http://svn.apache.org/r1669363
Log:
OAK-2661 : Glob restriction test failures on Jenkins

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

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AbstractEvaluationTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AbstractEvaluationTest.java?rev=1669363&r1=1669362&r2=1669363&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AbstractEvaluationTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AbstractEvaluationTest.java
 Thu Mar 26 16:10:00 2015
@@ -96,12 +96,12 @@ public abstract class AbstractEvaluation
 
         UserManager uMgr = getUserManager(superuser);
         // create the testUser
-        String uid = "testUser" + UUID.randomUUID();
+        String uid = generateId("testUser");
         creds = new SimpleCredentials(uid, uid.toCharArray());
         testUser = uMgr.createUser(uid, uid);
 
         UserManager umgr = getUserManager(superuser);
-        testGroup = umgr.createGroup("testGroup" + UUID.randomUUID());
+        testGroup = umgr.createGroup(generateId("testGroup"));
         testGroup.addMember(testUser);
 
         // create some nodes below the test root in order to apply ac-stuff
@@ -173,6 +173,10 @@ public abstract class AbstractEvaluation
         }
     }
 
+    protected static String generateId(@Nonnull String hint) {
+        return hint + UUID.randomUUID();
+    }
+
     protected Group getTestGroup() throws Exception {
         return testGroup;
     }

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadTest.java?rev=1669363&r1=1669362&r2=1669363&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/ReadTest.java
 Thu Mar 26 16:10:00 2015
@@ -375,8 +375,8 @@ public class ReadTest extends AbstractEv
 
     @Test
     public void testGlobRestriction2() throws Exception {
-        Group group2 = getUserManager(superuser).createGroup("group2");
-        Group group3 = getUserManager(superuser).createGroup("group3");
+        Group group2 = 
getUserManager(superuser).createGroup(generateId("group2_"));
+        Group group3 = 
getUserManager(superuser).createGroup(generateId("group3_"));
         superuser.save();
 
         try {
@@ -402,8 +402,8 @@ public class ReadTest extends AbstractEv
 
     @Test
     public void testGlobRestriction3() throws Exception {
-        Group group2 = getUserManager(superuser).createGroup("group2");
-        Group group3 = getUserManager(superuser).createGroup("group3");
+        Group group2 = 
getUserManager(superuser).createGroup(generateId("group2_"));
+        Group group3 = 
getUserManager(superuser).createGroup(generateId("group3_"));
         superuser.save();
 
         try {
@@ -530,12 +530,12 @@ public class ReadTest extends AbstractEv
      */
     @Test
     public void testEmptyGlobRestriction3() throws Exception {
+        Group group1 = getTestGroup();
+        Group group2 = 
getUserManager(superuser).createGroup(generateId("group2_"));
+        group2.addMember(testUser);
+        Group group3 = 
getUserManager(superuser).createGroup(generateId("group3_"));
+        superuser.save();
         try {
-            Group group1 = getTestGroup();
-            Group group2 = getUserManager(superuser).createGroup("group2");
-            group2.addMember(testUser);
-            Group group3 = getUserManager(superuser).createGroup("group3");
-            superuser.save();
 
             assertTrue(group1.isDeclaredMember(testUser));
             assertTrue(group2.isDeclaredMember(testUser));
@@ -557,14 +557,9 @@ public class ReadTest extends AbstractEv
             assertTrue(canReadNode(userSession, childNPath));
             assertFalse(canReadNode(userSession, childNPath2));
         } finally {
-            Authorizable g2 = 
getUserManager(superuser).getAuthorizable("group2");
-            if (g2 != null) {
-                g2.remove();
-            }
-            Authorizable g3 = 
getUserManager(superuser).getAuthorizable("group3");
-            if (g3 != null) {
-                g3.remove();
-            }
+            group2.remove();
+            group3.remove();
+            superuser.save();
         }
     }