You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2015/03/31 19:24:16 UTC
svn commit: r1670400 - in
/jackrabbit/commons/filevault/trunk/vault-core/src/test:
java/org/apache/jackrabbit/vault/packaging/integration/
resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/
Author: tripod
Date: Tue Mar 31 17:24:15 2015
New Revision: 1670400
URL: http://svn.apache.org/r1670400
Log:
JCRVLT-86 Unable to merge group-member if the member node name is different from its authorizable id
- adding test
Added:
jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/group_with_a_moved.zip
Modified:
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestGroupMergePackage.java
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestGroupMergePackage.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestGroupMergePackage.java?rev=1670400&r1=1670399&r2=1670400&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestGroupMergePackage.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestGroupMergePackage.java Tue Mar 31 17:24:15 2015
@@ -28,6 +28,7 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.vault.packaging.JcrPackage;
import org.apache.jackrabbit.vault.packaging.PackageException;
+import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
@@ -99,7 +100,35 @@ public class TestGroupMergePackage exten
pack = packMgr.upload(getStream("testpackages/group_with_bc.zip"), false);
assertNotNull(pack);
pack.install(getDefaultOptions());
+ assertABC(mgr);
+ }
+ /**
+ * Installs 2 packages with "test-group" that contain test-user-a and test-user-b,test-user-c respectively.
+ * since the import mode is merge, the memberships should be merged. this variant uses a renamed authorizable node name
+ */
+ @Test
+ @Ignore("JCRVLT-86")
+ public void installGroupABC_renamed() throws RepositoryException, IOException, PackageException {
+ // ensure that test users don't exist yet (proper setup)
+ UserManager mgr = ((JackrabbitSession) admin).getUserManager();
+ assertNull("test-group must not exist", mgr.getAuthorizable("test-group"));
+ assertNull("test-user-a must not exist", mgr.getAuthorizable("test-user-a"));
+ assertNull("test-user-b must not exist", mgr.getAuthorizable("test-user-b"));
+ assertNull("test-user-c must not exist", mgr.getAuthorizable("test-user-c"));
+
+ JcrPackage pack = packMgr.upload(getStream("testpackages/group_with_bc.zip"), false);
+ assertNotNull(pack);
+ pack.install(getDefaultOptions());
+
+ pack = packMgr.upload(getStream("testpackages/group_with_a_moved.zip"), false);
+ assertNotNull(pack);
+ pack.install(getDefaultOptions());
+ assertABC(mgr);
+ }
+
+
+ private void assertABC(UserManager mgr) throws RepositoryException {
// check if group exists
Group grp = (Group) mgr.getAuthorizable("test-group");
assertNotNull("test-group must exist", grp);
@@ -115,5 +144,4 @@ public class TestGroupMergePackage exten
assertTrue("test-user-c is member of test-group", grp.isMember(userC));
}
-
}
\ No newline at end of file
Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/group_with_a_moved.zip
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/group_with_a_moved.zip?rev=1670400&view=auto
==============================================================================
Binary files jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/group_with_a_moved.zip (added) and jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/group_with_a_moved.zip Tue Mar 31 17:24:15 2015 differ