svn commit: r1822609 - in /jackrabbit/commons/filevault/trunk/vault-core/src/test: java/org/apache/jackrabbit/vault/packaging/integration/ resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/

[tr...@apache.org]

Author: tripod
Date: Tue Jan 30 05:15:08 2018
New Revision: 1822609

URL: http://svn.apache.org/viewvc?rev=1822609&view=rev
Log:
JCRVLT-264 installing a newer version of a "multi-package" might fail with extracted sub-packages

Added:
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/multipackage-a-1.0.zip
    jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/multipackage-a-2.0.zip
Modified:
    jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSubPackages.java

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSubPackages.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSubPackages.java?rev=1822609&r1=1822608&r2=1822609&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSubPackages.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSubPackages.java Tue Jan 30 05:15:08 2018
@@ -30,6 +30,7 @@ import javax.jcr.RepositoryException;
 
 import org.apache.jackrabbit.vault.fs.io.ImportOptions;
 import org.apache.jackrabbit.vault.packaging.Dependency;
+import org.apache.jackrabbit.vault.packaging.DependencyHandling;
 import org.apache.jackrabbit.vault.packaging.JcrPackage;
 import org.apache.jackrabbit.vault.packaging.PackageException;
 import org.apache.jackrabbit.vault.packaging.PackageId;
@@ -699,4 +700,33 @@ public class TestSubPackages extends Int
                 "jcr_root/etc/packages/my_packages/sub_b.zip.dir/_jcr_content/_vlt_definition/\n" +
                 "jcr_root/etc/packages/my_packages/sub_b.zip.dir/_jcr_content/_vlt_definition/.content.xml\n", result.toString());
     }
+
+    /**
+     * Test extracts a multipackage-a-1.0 which contains content and a subpackage. The subpackage will add a dependency
+     * on the parent package. later installs newer version multi-package-a-2.0 which will try to reinstall the subpackage,
+     * but the dependency needs to update. see JCRVLT-264
+     */
+    @Test
+    public void testMixedPackageUpdatesCorrectly() throws Exception {
+       // install 1.0
+        JcrPackage pack = packMgr.upload(getStream("testpackages/multipackage-a-1.0.zip"), false);
+        assertNotNull(pack);
+
+        ImportOptions opts = getDefaultOptions();
+        pack.install(opts);
+
+        assertNodeExists("/tmp/testroot/sub");
+        assertProperty("/apps/test/version","1.0");
+
+        // install 2.0
+        pack = packMgr.upload(getStream("testpackages/multipackage-a-2.0.zip"), false);
+        assertNotNull(pack);
+        opts = getDefaultOptions();
+        opts.setDependencyHandling(DependencyHandling.REQUIRED);
+        pack.install(opts);
+
+        assertNodeExists("/tmp/testroot/sub");
+        assertProperty("/apps/test/version","2.0");
+
+    }
 }
\ No newline at end of file

Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/multipackage-a-1.0.zip
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/multipackage-a-1.0.zip?rev=1822609&view=auto
==============================================================================
Binary files jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/multipackage-a-1.0.zip (added) and jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/multipackage-a-1.0.zip Tue Jan 30 05:15:08 2018 differ

Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/multipackage-a-2.0.zip
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/multipackage-a-2.0.zip?rev=1822609&view=auto
==============================================================================
Binary files jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/multipackage-a-2.0.zip (added) and jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/multipackage-a-2.0.zip Tue Jan 30 05:15:08 2018 differ