[sling-org-apache-sling-distribution-journal] branch master updated: SLING-10095 - Add negative test cases (#94)

[tm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tmaret pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git


The following commit(s) were added to refs/heads/master by this push:
     new 1f0fac9  SLING-10095 - Add negative test cases (#94)
1f0fac9 is described below

commit 1f0fac987f71631b3698903336410a03d982dffa
Author: Timothee Maret <tm...@apache.org>
AuthorDate: Sat Dec 18 00:43:00 2021 +0100

    SLING-10095 - Add negative test cases (#94)
---
 .../bookkeeper/ContentPackageExtractorTest.java    | 37 ++++++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/apache/sling/distribution/journal/bookkeeper/ContentPackageExtractorTest.java b/src/test/java/org/apache/sling/distribution/journal/bookkeeper/ContentPackageExtractorTest.java
index ace5025..ecb416f 100644
--- a/src/test/java/org/apache/sling/distribution/journal/bookkeeper/ContentPackageExtractorTest.java
+++ b/src/test/java/org/apache/sling/distribution/journal/bookkeeper/ContentPackageExtractorTest.java
@@ -19,7 +19,9 @@
 package org.apache.sling.distribution.journal.bookkeeper;
 
 import static java.util.Collections.singletonList;
+import static org.apache.sling.api.resource.ResourceUtil.getOrCreateResource;
 import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -149,11 +151,40 @@ public class ContentPackageExtractorTest {
         extractor.handle(resourceResolver, singletonList(node.getPath()));
     }
 
+    @Test
+    public void testNotContentPackagePath() throws Exception {
+
+        Resource packageRoot = getOrCreateResource(resourceResolver, "/tmp/packages", "package", "package", true);
+        Resource node = createImportedPackage(packageRoot);
+
+        ContentPackageExtractor extractor = new ContentPackageExtractor(packaging, PackageHandling.Install);
+        extractor.handle(resourceResolver, singletonList(node.getPath()));
+
+        verify(pkg, never()).install(Mockito.any(ImportOptions.class));
+    }
+
+    @Test
+    public void testNotContentPackage() throws Exception {
+        Resource packageRoot = createEtcPackages();
+        Resource node = createImportedPackage(packageRoot, NodeType.NT_FOLDER);
+
+        ContentPackageExtractor extractor = new ContentPackageExtractor(packaging, PackageHandling.Install);
+        extractor.handle(resourceResolver, singletonList(node.getPath()));
+
+        verify(pkg, never()).install(Mockito.any(ImportOptions.class));
+    }
 
     private Resource createImportedPackage() throws PersistenceException {
-        Resource packages = createEtcPackages();
-        Resource node1 = createNode(packages, "my_packages", NodeType.NT_UNSTRUCTURED);
-        return createNode(node1, "test-1.zip", NodeType.NT_FILE);
+        return createImportedPackage(createEtcPackages());
+    }
+
+    private Resource createImportedPackage(Resource packageRoot) throws PersistenceException {
+        return createImportedPackage(packageRoot, NodeType.NT_FILE);
+    }
+
+    private Resource createImportedPackage(Resource packageRoot, String packageNodeType) throws PersistenceException {
+        Resource node1 = createNode(packageRoot, "my_packages", NodeType.NT_UNSTRUCTURED);
+        return createNode(node1, "test-1.zip", packageNodeType);
     }
 
     private Resource createNode(Resource parent, String name, String nodeType) throws PersistenceException {