Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2217C103EA for ; Tue, 18 Feb 2014 06:32:20 +0000 (UTC) Received: (qmail 87794 invoked by uid 500); 18 Feb 2014 06:32:19 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 87707 invoked by uid 500); 18 Feb 2014 06:32:18 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 87698 invoked by uid 99); 18 Feb 2014 06:32:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Feb 2014 06:32:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Feb 2014 06:32:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 040592388860; Tue, 18 Feb 2014 06:31:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1569212 - in /jackrabbit/commons/filevault/trunk/vault-core/src/test: java/org/apache/jackrabbit/vault/packaging/integration/TestSubPackages.java resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/subtest_add_a.zip Date: Tue, 18 Feb 2014 06:31:55 -0000 To: commits@jackrabbit.apache.org From: tripod@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140218063156.040592388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tripod Date: Tue Feb 18 06:31:55 2014 New Revision: 1569212 URL: http://svn.apache.org/r1569212 Log: JCRVLT-30 Allow package definition to specify recursive install behavior - adding 1 more test Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/subtest_add_a.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=1569212&r1=1569211&r2=1569212&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 Feb 18 06:31:55 2014 @@ -81,6 +81,27 @@ public class TestSubPackages extends Int } /** + * Installs a package that contains sub packages recursive but has a sub package handling that ignores A + */ + @Test + public void testRecursiveAddA() throws RepositoryException, IOException, PackageException { + JcrPackage pack = packMgr.upload(getStream("testpackages/subtest_add_a.zip"), false); + assertNotNull(pack); + + // install + ImportOptions opts = getDefaultOptions(); + opts.setNonRecursive(false); + pack.install(opts); + + // check for sub packages + assertNodeExists("/etc/packages/my_packages/sub_a.zip"); + assertNodeExists("/etc/packages/my_packages/sub_b.zip"); + + assertNodeMissing("/tmp/a"); + assertNodeExists("/tmp/b"); + } + + /** * Installs a package that contains sub packages recursive but has a sub package handling that only extracts A */ @Test Added: jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/subtest_add_a.zip URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/subtest_add_a.zip?rev=1569212&view=auto ============================================================================== Files jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/subtest_add_a.zip (added) and jackrabbit/commons/filevault/trunk/vault-core/src/test/resources/org/apache/jackrabbit/vault/packaging/integration/testpackages/subtest_add_a.zip Tue Feb 18 06:31:55 2014 differ