Author: angela
Date: Tue Oct 7 12:52:05 2014
New Revision: 1629876
URL: http://svn.apache.org/r1629876
Log:
minor improvement
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AccessControlImporterTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/JackrabbitAccessControlListTest.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AccessControlImporterTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AccessControlImporterTest.java?rev=1629876&r1=1629875&r2=1629876&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AccessControlImporterTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/AccessControlImporterTest.java
Tue Oct 7 12:52:05 2014
@@ -41,6 +41,8 @@ import org.apache.jackrabbit.test.Abstra
public class AccessControlImporterTest extends AbstractJCRTest {
+ private static final String VALID_PRINCIPAL_NAME = "anonymous";
+
public static final String XML_POLICY_TREE = "<?xml version=\"1.0\"
encoding=\"UTF-8\"?>" +
"<sv:node sv:name=\"test\"
xmlns:mix=\"http://www.jcp.org/jcr/mix/1.0\";
xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\";
xmlns:fn_old=\"http://www.w3.org/2004/10/xpath-functions\";
xmlns:fn=\"http://www.w3.org/2005/xpath-functions\";
xmlns:xs=\"http://www.w3.org/2001/XMLSchema\";
xmlns:sv=\"http://www.jcp.org/jcr/sv/1.0\"; xmlns:rep=\"internal\"
xmlns:jcr=\"http://www.jcp.org/jcr/1.0\";>" +
" <sv:property sv:name=\"jcr:primaryType\"
sv:type=\"Name\"><sv:value>nt:unstructured</sv:value></sv:property>" +
@@ -54,7 +56,7 @@ public class AccessControlImporterTest e
" <sv:value>rep:GrantACE</sv:value>" +
" </sv:property>" +
" <sv:property sv:name=\"rep:principalName\"
sv:type=\"String\">" +
- " <sv:value>everyone</sv:value>" +
+ " <sv:value>"+EveryonePrincipal.NAME+"</sv:value>" +
" </sv:property>" +
" <sv:property sv:name=\"rep:privileges\"
sv:type=\"Name\">" +
" <sv:value>jcr:write</sv:value>" +
@@ -74,7 +76,7 @@ public class AccessControlImporterTest e
"<sv:value>rep:GrantACE</sv:value>" +
"</sv:property>" +
"<sv:property sv:name=\"rep:principalName\" sv:type=\"String\">" +
- "<sv:value>everyone</sv:value>" +
+ "<sv:value>"+EveryonePrincipal.NAME+"</sv:value>" +
"</sv:property>" +
"<sv:property sv:name=\"rep:privileges\" sv:type=\"Name\">" +
"<sv:value>jcr:write</sv:value>" +
@@ -93,7 +95,7 @@ public class AccessControlImporterTest e
"<sv:value>rep:GrantACE</sv:value>" +
"</sv:property>" +
"<sv:property sv:name=\"rep:principalName\" sv:type=\"String\">" +
- "<sv:value>everyone</sv:value>" +
+ "<sv:value>"+EveryonePrincipal.NAME+"</sv:value>" +
"</sv:property>" +
"<sv:property sv:name=\"rep:privileges\" sv:type=\"Name\">" +
"<sv:value>jcr:write</sv:value>" +
@@ -104,7 +106,7 @@ public class AccessControlImporterTest e
"<sv:value>rep:GrantACE</sv:value>" +
"</sv:property>" +
"<sv:property sv:name=\"rep:principalName\" sv:type=\"String\">" +
- "<sv:value>admin</sv:value>" +
+ "<sv:value>"+VALID_PRINCIPAL_NAME+"</sv:value>" +
"</sv:property>" +
"<sv:property sv:name=\"rep:privileges\" sv:type=\"Name\">" +
"<sv:value>jcr:write</sv:value>" +
@@ -123,7 +125,7 @@ public class AccessControlImporterTest e
"<sv:value>rep:GrantACE</sv:value>" +
"</sv:property>" +
"<sv:property sv:name=\"rep:principalName\" sv:type=\"String\">" +
- "<sv:value>admin</sv:value>" +
+ "<sv:value>"+VALID_PRINCIPAL_NAME+"</sv:value>" +
"</sv:property>" +
"<sv:property sv:name=\"rep:privileges\" sv:type=\"Name\">" +
"<sv:value>jcr:write</sv:value>" +
@@ -142,7 +144,7 @@ public class AccessControlImporterTest e
"<sv:value>rep:GrantACE</sv:value>" +
"</sv:property>" +
"<sv:property sv:name=\"rep:principalName\" sv:type=\"String\">" +
- "<sv:value>admin</sv:value>" +
+ "<sv:value>"+VALID_PRINCIPAL_NAME+"</sv:value>" +
"</sv:property>" +
"<sv:property sv:name=\"rep:privileges\" sv:type=\"Name\">" +
"<sv:value>jcr:workspaceManagement</sv:value>" +
@@ -226,7 +228,7 @@ public class AccessControlImporterTest e
assertEquals(1, entries.length);
AccessControlEntry entry = entries[0];
- assertEquals("everyone", entry.getPrincipal().getName());
+ assertEquals(EveryonePrincipal.NAME,
entry.getPrincipal().getName());
assertEquals(1, entry.getPrivileges().length);
assertEquals(acMgr.privilegeFromName(Privilege.JCR_WRITE),
entry.getPrivileges()[0]);
@@ -257,12 +259,12 @@ public class AccessControlImporterTest e
assertEquals(2, entries.length);
AccessControlEntry entry = entries[0];
- assertEquals("everyone", entry.getPrincipal().getName());
+ assertEquals(EveryonePrincipal.NAME,
entry.getPrincipal().getName());
assertEquals(1, entry.getPrivileges().length);
assertEquals(acMgr.privilegeFromName(Privilege.JCR_WRITE),
entry.getPrivileges()[0]);
entry = entries[1];
- assertEquals("admin", entry.getPrincipal().getName());
+ assertEquals(VALID_PRINCIPAL_NAME, entry.getPrincipal().getName());
assertEquals(1, entry.getPrivileges().length);
assertEquals(acMgr.privilegeFromName(Privilege.JCR_WRITE),
entry.getPrivileges()[0]);
@@ -293,7 +295,7 @@ public class AccessControlImporterTest e
assertEquals(1, entries.length);
AccessControlEntry entry = entries[0];
- assertEquals("admin", entry.getPrincipal().getName());
+ assertEquals(VALID_PRINCIPAL_NAME, entry.getPrincipal().getName());
assertEquals(1, entry.getPrivileges().length);
assertEquals(acMgr.privilegeFromName(Privilege.JCR_WRITE),
entry.getPrivileges()[0]);
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/JackrabbitAccessControlListTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/JackrabbitAccessControlListTest.java?rev=1629876&r1=1629875&r2=1629876&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/JackrabbitAccessControlListTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/JackrabbitAccessControlListTest.java
Tue Oct 7 12:52:05 2014
@@ -31,7 +31,6 @@ import javax.jcr.security.Privilege;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlList;
-import org.apache.jackrabbit.api.security.principal.PrincipalIterator;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
import
org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
import org.apache.jackrabbit.test.NotExecutableException;
@@ -85,12 +84,7 @@ public class JackrabbitAccessControlList
}
PrincipalManager pMgr = ((JackrabbitSession)
superuser).getPrincipalManager();
- PrincipalIterator it =
pMgr.getPrincipals(PrincipalManager.SEARCH_TYPE_NOT_GROUP);
- if (it.hasNext()) {
- return it.nextPrincipal();
- } else {
- throw new NotExecutableException();
- }
+ return pMgr.getEveryone();
}
@Test
