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 2019/02/15 13:44:19 UTC
svn commit: r1853645 - in
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak:
AbstractSecurityTest.java security/authorization/accesscontrol/ACLTest.java
Author: angela
Date: Fri Feb 15 13:44:19 2019
New Revision: 1853645
URL: http://svn.apache.org/viewvc?rev=1853645&view=rev
Log:
OAK-8049 : AbstractSecurityTest: fix PartialValueFactory field and it's usages
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACLTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java?rev=1853645&r1=1853644&r2=1853645&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java Fri Feb 15 13:44:19 2019
@@ -80,7 +80,6 @@ public abstract class AbstractSecurityTe
private User testUser;
protected NamePathMapper namePathMapper = NamePathMapper.DEFAULT;
- protected PartialValueFactory valueFactory = new PartialValueFactory(namePathMapper);
protected SecurityProvider securityProvider;
protected ContentSession adminSession;
protected Root root;
@@ -185,10 +184,6 @@ public abstract class AbstractSecurityTe
return namePathMapper;
}
- protected PartialValueFactory getPartialValueFactory() {
- return valueFactory;
- }
-
protected UserConfiguration getUserConfiguration() {
return getConfig(UserConfiguration.class);
}
@@ -242,6 +237,10 @@ public abstract class AbstractSecurityTe
return new ValueFactoryImpl(root, getNamePathMapper());
}
+ protected PartialValueFactory getPartialValueFactory() {
+ return new PartialValueFactory(getNamePathMapper());
+ }
+
protected long waitForSystemTimeIncrement(long old) {
while (old == System.currentTimeMillis()) {
// wait for system timer to move
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACLTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACLTest.java?rev=1853645&r1=1853644&r2=1853645&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACLTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACLTest.java Fri Feb 15 13:44:19 2019
@@ -843,7 +843,7 @@ public class ACLTest extends AbstractAcc
RestrictionProvider rp = new TestRestrictionProvider("mandatory", Type.NAME, true);
JackrabbitAccessControlList acl = createACL(TEST_PATH, new ArrayList(), namePathMapper, rp);
- acl.addEntry(testPrincipal, testPrivileges, false, Collections.singletonMap("mandatory", valueFactory.createValue("name", PropertyType.NAME)), Collections.emptyMap());
+ acl.addEntry(testPrincipal, testPrivileges, false, Collections.singletonMap("mandatory", getValueFactory(root).createValue("name", PropertyType.NAME)), Collections.emptyMap());
}
@Test(expected = AccessControlException.class)
@@ -851,7 +851,7 @@ public class ACLTest extends AbstractAcc
RestrictionProvider rp = new TestRestrictionProvider("mandatory", Type.NAME, true);
JackrabbitAccessControlList acl = createACL(TEST_PATH, new ArrayList(), namePathMapper, rp);
- acl.addEntry(testPrincipal, testPrivileges, false, Collections.emptyMap(), Collections.singletonMap("mandatory", new Value[] {valueFactory.createValue("name", PropertyType.NAME)}));
+ acl.addEntry(testPrincipal, testPrivileges, false, Collections.emptyMap(), Collections.singletonMap("mandatory", new Value[] {getValueFactory(root).createValue("name", PropertyType.NAME)}));
}
@Test(expected = AccessControlException.class)
@@ -867,7 +867,7 @@ public class ACLTest extends AbstractAcc
RestrictionProvider rp = new TestRestrictionProvider("mandatory", Type.NAMES, true);
JackrabbitAccessControlList acl = createACL(TEST_PATH, new ArrayList(), namePathMapper, rp);
- acl.addEntry(testPrincipal, testPrivileges, false, Collections.singletonMap("mandatory", valueFactory.createValue("name", PropertyType.NAME)), Collections.emptyMap());
+ acl.addEntry(testPrincipal, testPrivileges, false, Collections.singletonMap("mandatory", getValueFactory(root).createValue("name", PropertyType.NAME)), Collections.emptyMap());
}
@Test
@@ -875,7 +875,7 @@ public class ACLTest extends AbstractAcc
RestrictionProvider rp = new TestRestrictionProvider("mandatory", Type.NAMES, true);
JackrabbitAccessControlList acl = createACL(TEST_PATH, new ArrayList(), namePathMapper, rp);
- acl.addEntry(testPrincipal, testPrivileges, false, Collections.emptyMap(), Collections.singletonMap("mandatory", new Value[] {valueFactory.createValue("name", PropertyType.NAME)}));
+ acl.addEntry(testPrincipal, testPrivileges, false, Collections.emptyMap(), Collections.singletonMap("mandatory", new Value[] {getValueFactory(root).createValue("name", PropertyType.NAME)}));
}
//--------------------------------------------------------------------------