[sling-whiteboard] branch master updated: [cp2fm] make sure broken JSON configurations are correctly handled

[si...@apache.org]

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

simonetripodi 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 67672cd  [cp2fm] make sure broken JSON configurations are correctly handled
67672cd is described below

commit 67672cd325136a3b740f8d7188efdd467adc811e
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Wed Mar 13 15:03:02 2019 +0100

    [cp2fm] make sure broken JSON configurations are correctly handled
---
 .../JsonConfigurationEntryHandlerTest.java         | 46 ++++++++++++++++++++++
 ...ing.impl.ServiceUserMapperImpl.INVALID.cfg.json |  1 +
 2 files changed, 47 insertions(+)

diff --git a/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/handlers/JsonConfigurationEntryHandlerTest.java b/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/handlers/JsonConfigurationEntryHandlerTest.java
new file mode 100644
index 0000000..ffc2ea3
--- /dev/null
+++ b/content-package-2-feature-model/src/test/java/org/apache/sling/cp2fm/handlers/JsonConfigurationEntryHandlerTest.java
@@ -0,0 +1,46 @@
+/*
+ * 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.cp2fm.handlers;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+
+import org.apache.jackrabbit.vault.fs.io.Archive;
+import org.apache.jackrabbit.vault.fs.io.Archive.Entry;
+import org.apache.sling.cp2fm.ContentPackage2FeatureModelConverter;
+import org.junit.Test;
+
+public class JsonConfigurationEntryHandlerTest {
+
+    @Test(expected = IOException.class)
+    public void invalidConfigurationThrowsException() throws Exception {
+        String resourceConfiguration = "jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.INVALID.cfg.json";
+
+        Archive archive = mock(Archive.class);
+        Entry entry = mock(Entry.class);
+
+        when(entry.getName()).thenReturn(resourceConfiguration.substring(resourceConfiguration.lastIndexOf('/') + 1));
+        when(archive.openInputStream(entry)).thenReturn(getClass().getResourceAsStream(resourceConfiguration));
+
+        ContentPackage2FeatureModelConverter converter = mock(ContentPackage2FeatureModelConverter.class);
+
+        new JsonConfigurationEntryHandler().handle(resourceConfiguration, archive, entry, converter);
+    }
+
+}
diff --git a/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.INVALID.cfg.json b/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.INVALID.cfg.json
new file mode 100644
index 0000000..fe51488
--- /dev/null
+++ b/content-package-2-feature-model/src/test/resources/org/apache/sling/cp2fm/handlers/jcr_root/apps/asd/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.INVALID.cfg.json
@@ -0,0 +1 @@
+[]