You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2018/11/14 10:23:30 UTC
[sling-org-apache-sling-feature-extension-apiregions] branch master
updated: SLING-8108 : Provide setter methods for optional context info
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-extension-apiregions.git
The following commit(s) were added to refs/heads/master by this push:
new 5ea8cec SLING-8108 : Provide setter methods for optional context info
5ea8cec is described below
commit 5ea8cec2c1c020bc03878cfc0e0a52d7ba97b3ea
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Nov 14 11:23:20 2018 +0100
SLING-8108 : Provide setter methods for optional context info
---
.../BundleArtifactFeatureHandlerTest.java | 21 +++++++------
.../apiregions/BundleMappingHandlerTest.java | 35 +++++++++++-----------
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/test/java/org/apache/sling/feature/extension/apiregions/BundleArtifactFeatureHandlerTest.java b/src/test/java/org/apache/sling/feature/extension/apiregions/BundleArtifactFeatureHandlerTest.java
index 03f8fd6..3c321e8 100644
--- a/src/test/java/org/apache/sling/feature/extension/apiregions/BundleArtifactFeatureHandlerTest.java
+++ b/src/test/java/org/apache/sling/feature/extension/apiregions/BundleArtifactFeatureHandlerTest.java
@@ -16,24 +16,23 @@
*/
package org.apache.sling.feature.extension.apiregions;
+import static org.junit.Assert.assertEquals;
+
+import java.io.FileReader;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Properties;
+
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.KeyValueMap;
import org.apache.sling.feature.builder.ArtifactProvider;
import org.apache.sling.feature.builder.HandlerContext;
import org.junit.Test;
-import java.io.FileReader;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Properties;
-
-import static org.junit.Assert.assertEquals;
-
public class BundleArtifactFeatureHandlerTest {
@Test
public void testBundleToFeatureMap() throws Exception {
@@ -114,7 +113,7 @@ public class BundleArtifactFeatureHandlerTest {
}
private static class TestHandlerContextImpl implements HandlerContext {
- private final Map<String, String> cfg = new HashMap<>();
+ private final KeyValueMap cfg = new KeyValueMap();
@Override
public ArtifactProvider getArtifactProvider() {
@@ -122,7 +121,7 @@ public class BundleArtifactFeatureHandlerTest {
}
@Override
- public Map<String, String> getConfiguration() {
+ public KeyValueMap getConfiguration() {
return cfg;
}
}
diff --git a/src/test/java/org/apache/sling/feature/extension/apiregions/BundleMappingHandlerTest.java b/src/test/java/org/apache/sling/feature/extension/apiregions/BundleMappingHandlerTest.java
index a07b703..953ae8b 100644
--- a/src/test/java/org/apache/sling/feature/extension/apiregions/BundleMappingHandlerTest.java
+++ b/src/test/java/org/apache/sling/feature/extension/apiregions/BundleMappingHandlerTest.java
@@ -16,14 +16,8 @@
*/
package org.apache.sling.feature.extension.apiregions;
-import org.apache.sling.feature.Artifact;
-import org.apache.sling.feature.ArtifactId;
-import org.apache.sling.feature.Extension;
-import org.apache.sling.feature.ExtensionType;
-import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.builder.ArtifactProvider;
-import org.apache.sling.feature.builder.HandlerContext;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.FileInputStream;
@@ -31,12 +25,17 @@ import java.io.FileReader;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.util.Collections;
-import java.util.Map;
import java.util.Properties;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import org.apache.sling.feature.Artifact;
+import org.apache.sling.feature.ArtifactId;
+import org.apache.sling.feature.Extension;
+import org.apache.sling.feature.ExtensionType;
+import org.apache.sling.feature.Feature;
+import org.apache.sling.feature.KeyValueMap;
+import org.apache.sling.feature.builder.ArtifactProvider;
+import org.apache.sling.feature.builder.HandlerContext;
+import org.junit.Test;
public class BundleMappingHandlerTest {
@Test
@@ -100,8 +99,10 @@ public class BundleMappingHandlerTest {
f.getBundles().add(b1);
BundleMappingHandler bmh = new BundleMappingHandler();
+ final KeyValueMap kvm = new KeyValueMap();
+ kvm.put("fileStorage", tempDir.toString());
bmh.postProcess(new TestHandlerContext(ap,
- Collections.singletonMap("fileStorage", tempDir.toString())), f, ex);
+ kvm), f, ex);
File expectedFile = new File(tempDir.toFile(), "idbsnver.properties");
assertTrue(expectedFile.exists());
@@ -133,15 +134,15 @@ public class BundleMappingHandlerTest {
private class TestHandlerContext implements HandlerContext {
private final ArtifactProvider artifactProvider;
- private final Map<String, String> config;
+ private final KeyValueMap config;
- private TestHandlerContext(ArtifactProvider ap, Map<String, String> cfg) {
+ private TestHandlerContext(ArtifactProvider ap, KeyValueMap cfg) {
artifactProvider = ap;
config = cfg;
}
public TestHandlerContext(ArtifactProvider ap) {
- this(ap, Collections.emptyMap());
+ this(ap, new KeyValueMap());
}
@Override
@@ -150,7 +151,7 @@ public class BundleMappingHandlerTest {
}
@Override
- public Map<String, String> getConfiguration() {
+ public KeyValueMap getConfiguration() {
return config;
}
}