Change test dirs to reflect default value in apache jackrabbit oak
diff --git a/src/test/java/org/apache/sling/feature/cpconverter/handlers/GroupEntryHandlerTest.java b/src/test/java/org/apache/sling/feature/cpconverter/handlers/GroupEntryHandlerTest.java
index 116d30e..305d4cf 100644
--- a/src/test/java/org/apache/sling/feature/cpconverter/handlers/GroupEntryHandlerTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/handlers/GroupEntryHandlerTest.java
@@ -73,13 +73,13 @@
@Test
public void parseGroupWithConfig() throws Exception {
- String path = "/jcr_root/system/groups/g/V084LLw1ypl2l9G0e28c/.content.xml";
+ String path = "/jcr_root/rep:security/rep:authorizables/rep:groups/g/V084LLw1ypl2l9G0e28c/.content.xml";
AclManager aclManager = mock(AclManager.class);
TestUtils.createRepoInitExtension(handler, aclManager, path, getClass().getResourceAsStream(path.substring(1)));
verify(aclManager, never()).addGroup(any(Group.class));
- TestUtils.createRepoInitExtension(handler.withConfig("/jcr_root(/system/groups.*/)\\.content.xml"), aclManager, path, getClass().getResourceAsStream(path.substring(1)));
+ TestUtils.createRepoInitExtension(handler.withConfig("/jcr_root(/rep:security/rep:authorizables/rep:groups.*/)\\.content.xml"), aclManager, path, getClass().getResourceAsStream(path.substring(1)));
verify(aclManager, times(1)).addGroup(any(Group.class));
}
}
diff --git a/src/test/java/org/apache/sling/feature/cpconverter/handlers/UsersEntryHandlerTest.java b/src/test/java/org/apache/sling/feature/cpconverter/handlers/UsersEntryHandlerTest.java
index 79f0989..283d63f 100644
--- a/src/test/java/org/apache/sling/feature/cpconverter/handlers/UsersEntryHandlerTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/handlers/UsersEntryHandlerTest.java
@@ -18,7 +18,10 @@
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
-import org.apache.sling.feature.cpconverter.accesscontrol.*;
+import org.apache.sling.feature.cpconverter.accesscontrol.AclManager;
+import org.apache.sling.feature.cpconverter.accesscontrol.DefaultAclManager;
+import org.apache.sling.feature.cpconverter.accesscontrol.SystemUser;
+import org.apache.sling.feature.cpconverter.accesscontrol.User;
import org.apache.sling.repoinit.parser.RepoInitParser;
import org.apache.sling.repoinit.parser.impl.RepoInitParserService;
import org.apache.sling.repoinit.parser.operations.Operation;
@@ -117,13 +120,13 @@
@Test
public void parseUserWithConfig() throws Exception {
- String path = "/jcr_root/system/users/a/author/.content.xml";
+ String path = "/jcr_root/rep:security/rep:authorizables/rep:users/a/author/.content.xml";
AclManager aclManager = mock(AclManager.class);
TestUtils.createRepoInitExtension(usersEntryHandler, aclManager, path, getClass().getResourceAsStream(path.substring(1)));
verify(aclManager, never()).addUser(any(User.class));
- TestUtils.createRepoInitExtension(usersEntryHandler.withConfig("/jcr_root(/system/users.*/)\\.content.xml"), aclManager, path, getClass().getResourceAsStream(path.substring(1)));
+ TestUtils.createRepoInitExtension(usersEntryHandler.withConfig("/jcr_root(/rep:security/rep:authorizables/rep:users.*/)\\.content.xml"), aclManager, path, getClass().getResourceAsStream(path.substring(1)));
verify(aclManager, times(1)).addUser(any(User.class));
}
diff --git a/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/system/groups/g/V084LLw1ypl2l9G0e28c/.content.xml b/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/rep:security/rep:authorizables/rep:groups/g/V084LLw1ypl2l9G0e28c/.content.xml
similarity index 100%
rename from src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/system/groups/g/V084LLw1ypl2l9G0e28c/.content.xml
rename to src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/rep:security/rep:authorizables/rep:groups/g/V084LLw1ypl2l9G0e28c/.content.xml
diff --git a/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/system/groups/g/V084LLw1ypl2l9G0e28c/_rep_policy.xml b/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/rep:security/rep:authorizables/rep:groups/g/V084LLw1ypl2l9G0e28c/_rep_policy.xml
similarity index 100%
rename from src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/system/groups/g/V084LLw1ypl2l9G0e28c/_rep_policy.xml
rename to src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/rep:security/rep:authorizables/rep:groups/g/V084LLw1ypl2l9G0e28c/_rep_policy.xml
diff --git a/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/system/users/a/author/.content.xml b/src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/rep:security/rep:authorizables/rep:users/a/author/.content.xml
similarity index 100%
rename from src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/system/users/a/author/.content.xml
rename to src/test/resources/org/apache/sling/feature/cpconverter/handlers/jcr_root/rep:security/rep:authorizables/rep:users/a/author/.content.xml
