This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new d54a829 SLING-9658 Support binary archives in .far files
d54a829 is described below
commit d54a829725ac8da3209d0335c6ebf8eb2e4bc9ab
Author: David Bosschaert <[email protected]>
AuthorDate: Tue Aug 18 17:23:41 2020 +0100
SLING-9658 Support binary archives in .far files
Additional unit tests
---
.../unpack/impl/InstallUnpackArchiveTask.java | 2 +-
.../unpack/impl/InstallUnpackArchiveTaskTest.java | 77 ++++++++++++++++++++++
.../impl/UnpackArchiveInstallerPluginTest.java | 33 ++++++++++
3 files changed, 111 insertions(+), 1 deletion(-)
diff --git
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/InstallUnpackArchiveTask.java
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/InstallUnpackArchiveTask.java
index 7d0ed8b..a7ea946 100644
---
a/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/InstallUnpackArchiveTask.java
+++
b/featuremodel-unpack-extension/src/main/java/org/apache/sling/feature/extension/unpack/impl/InstallUnpackArchiveTask.java
@@ -30,7 +30,7 @@ import java.util.Map;
public class InstallUnpackArchiveTask extends InstallTask {
private final Logger logger;
- private final Unpack unpack;
+ final Unpack unpack;
public InstallUnpackArchiveTask(TaskResourceGroup erl, Unpack unpack,
Logger logger) {
super(erl);
diff --git
a/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/InstallUnpackArchiveTaskTest.java
b/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/InstallUnpackArchiveTaskTest.java
new file mode 100644
index 0000000..a9dfc2c
--- /dev/null
+++
b/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/InstallUnpackArchiveTaskTest.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.feature.extension.unpack.impl;
+
+import org.apache.sling.feature.extension.unpack.Unpack;
+import org.apache.sling.installer.api.tasks.TaskResource;
+import org.apache.sling.installer.api.tasks.TaskResourceGroup;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertNotNull;
+
+public class InstallUnpackArchiveTaskTest {
+ @Test
+ public void testTaskIgnoresNoContext() {
+ TaskResource tr = Mockito.mock(TaskResource.class);
+ Mockito.when(tr.getEntityId()).thenReturn("1234");
+
+ TaskResourceGroup trg = Mockito.mock(TaskResourceGroup.class);
+ Mockito.when(trg.getActiveResource()).thenReturn(tr);
+
+ Unpack unpack = Mockito.mock(Unpack.class);
+
+ InstallUnpackArchiveTask iuat = new InstallUnpackArchiveTask(trg,
unpack, null);
+
+ Mockito.verifyZeroInteractions(unpack); // precondition
+ iuat.execute(null);
+
+ // Should have done nothing
+ Mockito.verifyZeroInteractions(unpack);
+
+ assertNotNull(iuat.getSortKey());
+ }
+
+ @Test
+ public void testTask() throws Exception {
+ Map<String,Object> context = new HashMap<>();
+ InputStream bais = new ByteArrayInputStream("".getBytes());
+
+ TaskResource tr = Mockito.mock(TaskResource.class);
+ Mockito.when(tr.getAttribute("context")).thenReturn(context);
+ Mockito.when(tr.getInputStream()).thenReturn(bais);
+
+ TaskResourceGroup trg = Mockito.mock(TaskResourceGroup.class);
+ Mockito.when(trg.getActiveResource()).thenReturn(tr);
+
+ Unpack unpack = Mockito.mock(Unpack.class);
+
+ InstallUnpackArchiveTask iuat = new InstallUnpackArchiveTask(trg,
unpack, null);
+
+ Mockito.verifyZeroInteractions(unpack); // precondition
+ iuat.execute(null);
+
+ Mockito.verify(unpack).unpack(bais, context);
+ }
+}
diff --git
a/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveInstallerPluginTest.java
b/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveInstallerPluginTest.java
index 32034dd..105dd27 100644
---
a/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveInstallerPluginTest.java
+++
b/featuremodel-unpack-extension/src/test/java/org/apache/sling/feature/extension/unpack/impl/UnpackArchiveInstallerPluginTest.java
@@ -22,6 +22,9 @@ import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.extension.unpack.Unpack;
import org.apache.sling.installer.api.InstallableResource;
import org.apache.sling.installer.api.tasks.RegisteredResource;
+import org.apache.sling.installer.api.tasks.ResourceState;
+import org.apache.sling.installer.api.tasks.TaskResource;
+import org.apache.sling.installer.api.tasks.TaskResourceGroup;
import org.apache.sling.installer.api.tasks.TransformationResult;
import org.junit.Test;
import org.mockito.Mockito;
@@ -133,4 +136,34 @@ public class UnpackArchiveInstallerPluginTest {
Map<String,Object> ctx = tr.getAttributes();
assertSame(ctx, ctx.get("context"));
}
+
+ @Test
+ public void testCreateTask() {
+ Unpack unpack = Mockito.mock(Unpack.class);
+ UnpackArchiveInstallerPlugin aeip = new
UnpackArchiveInstallerPlugin(unpack);
+
+ TaskResource tr1 = Mockito.mock(TaskResource.class);
+ TaskResourceGroup gr1 = Mockito.mock(TaskResourceGroup.class);
+ Mockito.when(gr1.getActiveResource()).thenReturn(tr1);
+ assertNull(aeip.createTask(gr1));
+
+ TaskResource tr2 = Mockito.mock(TaskResource.class);
+ Mockito.when(tr2.getType())
+ .thenReturn(UnpackArchiveInstallerPlugin.TYPE_UNPACK_ARCHIVE);
+ Mockito.when(tr2.getState()).thenReturn(ResourceState.UNINSTALL);
+ TaskResourceGroup gr2 = Mockito.mock(TaskResourceGroup.class);
+ Mockito.when(gr2.getActiveResource()).thenReturn(tr2);
+ assertNull(aeip.createTask(gr2));
+
+ TaskResource tr3 = Mockito.mock(TaskResource.class);
+ Mockito.when(tr3.getType())
+ .thenReturn(UnpackArchiveInstallerPlugin.TYPE_UNPACK_ARCHIVE);
+ Mockito.when(tr3.getState()).thenReturn(ResourceState.INSTALL);
+ TaskResourceGroup gr3 = Mockito.mock(TaskResourceGroup.class);
+ Mockito.when(gr3.getActiveResource()).thenReturn(tr3);
+ InstallUnpackArchiveTask task =
+ (InstallUnpackArchiveTask) aeip.createTask(gr3);
+
+ assertSame(unpack, task.unpack);
+ }
}
