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 2014/10/28 01:55:50 UTC
svn commit: r1634757 - 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 Oct 28 00:55:49 2014
New Revision: 1634757
URL: http://svn.apache.org/r1634757
Log:
Adding test cases for JCRVLT-64 and JCRVLT-65
Added:
jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/test_user_a_profile.zip
Modified:
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java
jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/test_user_a.zip
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java?rev=1634757&r1=1634756&r2=1634757&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java Tue Oct 28 00:55:49 2014
@@ -206,6 +206,10 @@ public class IntegrationTestBase {
assertEquals(path + " should contain " + value, value, admin.getProperty(path).getString());
}
+ public void assertPropertyMissing(String path) throws RepositoryException {
+ assertFalse(path + " should not exist", admin.propertyExists(path));
+ }
+
public void createNodes(Node parent, int maxDepth, int nodesPerFolder) throws RepositoryException {
for (int i=0; i<nodesPerFolder; i++) {
Node n = parent.addNode("n" + i, "nt:folder");
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java?rev=1634757&r1=1634756&r2=1634757&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java Tue Oct 28 00:55:49 2014
@@ -48,6 +48,8 @@ public class TestUserContentPackage exte
private static final String PARENT_PATH_TEST_USER_A = "/home/users/test";
private static final String ID_TEST_USER_A = "test-user-a";
private static final String NAME_USER_PROPERTY = "userProperty";
+ private static final String NAME_PROFILE_FULLNAME = "profile/fullname";
+ private static final String NAME_PROFILE_PROPERTY = "profile/profileProperty";
private static final String NAME_PROFILE_NODE = "profile";
private static final String NAME_PROFILE_PRIVATE_NODE = "profile_private";
@@ -107,6 +109,42 @@ public class TestUserContentPackage exte
installUserA(ImportMode.REPLACE, true, true);
}
+ @Test
+ @Ignore("JCRVLT-64")
+ public void installUserA_Profile() throws RepositoryException, IOException, PackageException {
+ // install default user at package path
+ User userA = installUserA(ImportMode.REPLACE, true, true);
+ String authPath = userA.getPath();
+
+ assertPropertyMissing(authPath + "/" + NAME_PROFILE_PROPERTY);
+
+ // install updated profile
+ JcrPackage pack = packMgr.upload(getStream("testpackages/test_user_a_profile.zip"), false);
+ assertNotNull(pack);
+ pack.install(getDefaultOptions());
+
+ assertProperty(authPath + "/" + NAME_PROFILE_FULLNAME, "Test User");
+ assertProperty(authPath + "/" + NAME_PROFILE_PROPERTY, "a");
+ }
+
+ @Test
+ @Ignore("JCRVLT-65")
+ public void installUserA_Profile_Moved() throws RepositoryException, IOException, PackageException {
+ // install default user at package path
+ User userA = installUserA(ImportMode.UPDATE, false, false);
+ String authPath = userA.getPath();
+
+ assertPropertyMissing(authPath + "/" + NAME_PROFILE_PROPERTY);
+
+ // install updated profile
+ JcrPackage pack = packMgr.upload(getStream("testpackages/test_user_a_profile.zip"), false);
+ assertNotNull(pack);
+ pack.install(getDefaultOptions());
+
+ assertProperty(authPath + "/" + NAME_PROFILE_FULLNAME, "Test User");
+ assertProperty(authPath + "/" + NAME_PROFILE_PROPERTY, "a");
+ }
+
private User installUserA(ImportMode mode, boolean usePkgPath, boolean expectPkgPath) throws RepositoryException, IOException, PackageException {
UserManager mgr = ((JackrabbitSession) admin).getUserManager();
assertNull("test-user-a must not exist", mgr.getAuthorizable(ID_TEST_USER_A));
@@ -152,14 +190,17 @@ public class TestUserContentPackage exte
// check import mode dependent stuff
if (mode == null || mode == ImportMode.REPLACE) {
assertProperty(userA.getPath() + "/" + NAME_USER_PROPERTY, "a");
+ assertProperty(userA.getPath() + "/" + NAME_PROFILE_FULLNAME, "Test User");
assertNodeExists(userA.getPath() + "/" + NAME_PROFILE_NODE);
assertNodeMissing(userA.getPath() + "/" + NAME_PROFILE_PRIVATE_NODE);
} else if (mode == ImportMode.UPDATE) {
assertProperty(userA.getPath() + "/" + NAME_USER_PROPERTY, "a");
+ assertProperty(userA.getPath() + "/" + NAME_PROFILE_FULLNAME, "Test User");
assertNodeExists(userA.getPath() + "/" + NAME_PROFILE_NODE);
assertNodeExists(userA.getPath() + "/" + NAME_PROFILE_PRIVATE_NODE);
} else if (mode == ImportMode.MERGE) {
assertProperty(userA.getPath() + "/" + NAME_USER_PROPERTY, "initial");
+ assertProperty(userA.getPath() + "/" + NAME_PROFILE_FULLNAME, "Test User");
assertNodeExists(userA.getPath() + "/" + NAME_PROFILE_NODE);
assertNodeExists(userA.getPath() + "/" + NAME_PROFILE_PRIVATE_NODE);
}
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/test_user_a.zip
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/test_user_a.zip?rev=1634757&r1=1634756&r2=1634757&view=diff
==============================================================================
Files jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/test_user_a.zip (original) and jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/test_user_a.zip Tue Oct 28 00:55:49 2014 differ
Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/test_user_a_profile.zip
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/test_user_a_profile.zip?rev=1634757&view=auto
==============================================================================
Files jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/test_user_a_profile.zip (added) and jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/test_user_a_profile.zip Tue Oct 28 00:55:49 2014 differ