You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2017/05/19 15:08:06 UTC
[2/6] karaf git commit: Small improvement of test
Small improvement of test
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f857f1f2
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f857f1f2
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f857f1f2
Branch: refs/heads/master
Commit: f857f1f2208dbecfe48b6296ce673140f069b189
Parents: 256fe82
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Fri May 19 13:51:05 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Fri May 19 13:51:05 2017 +0200
----------------------------------------------------------------------
.../apache/karaf/itests/ExternalConfigTest.java | 54 +++++++++-----------
1 file changed, 24 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f857f1f2/itests/src/test/java/org/apache/karaf/itests/ExternalConfigTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/ExternalConfigTest.java b/itests/src/test/java/org/apache/karaf/itests/ExternalConfigTest.java
index 468a92f..c2c00b7 100644
--- a/itests/src/test/java/org/apache/karaf/itests/ExternalConfigTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/ExternalConfigTest.java
@@ -13,32 +13,23 @@
*/
package org.apache.karaf.itests;
-import org.apache.karaf.features.FeaturesService;
-import org.apache.sshd.common.util.io.IoUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
import java.io.BufferedWriter;
-import java.io.InputStream;
-import java.io.Writer;
-import java.lang.management.ManagementFactory;
+import java.io.IOException;
import java.net.URI;
-import java.net.URL;
import java.nio.file.Files;
-import java.nio.file.OpenOption;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.List;
-import java.util.Map;
+import static java.nio.file.StandardOpenOption.CREATE;
+import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
+import static java.nio.file.StandardOpenOption.WRITE;
import static org.junit.Assert.*;
@RunWith(PaxExam.class)
@@ -49,31 +40,34 @@ public class ExternalConfigTest extends KarafTestSupport {
public void externalConfigTest() throws Exception {
Path dir = Paths.get(System.getProperty("karaf.base"), "system/org/foo/bar/1.0-SNAPSHOT");
Files.createDirectories(dir);
- try (BufferedWriter w = Files.newBufferedWriter(dir.resolve("bar-1.0-SNAPSHOT.properties"), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE)) {
- w.write("key=value");
- }
- try (BufferedWriter w = Files.newBufferedWriter(dir.resolve("bar-1.0-SNAPSHOT-features.xml"), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE)) {
- w.write("<features name='org.foo'>\n" +
- " <feature name='bar' version='1.0-SNAPSHOT'>\n" +
- " <config name='org.foo' external='true'>\n" +
- " mvn:org.foo/bar/1.0-SNAPSHOT/properties" +
- " </config>\n" +
- " </feature>\n" +
- "</features>\n");
- }
+
+ writeTo(dir.resolve("bar-1.0-SNAPSHOT.properties"), //
+ "key=value");
- ConfigurationAdmin ca = getOsgiService(ConfigurationAdmin.class);
+ writeTo(dir.resolve("bar-1.0-SNAPSHOT-features.xml"), //
+ "<features name='org.foo'>\n" +
+ " <feature name='bar' version='1.0-SNAPSHOT'>\n" +
+ " <config name='org.foo' external='true'>\n" +
+ " mvn:org.foo/bar/1.0-SNAPSHOT/properties" +
+ " </config>\n" +
+ " </feature>\n" +
+ "</features>\n");
- Configuration[] cfgs = ca.listConfigurations("(service.pid=org.foo)");
+ Configuration[] cfgs = configurationAdmin.listConfigurations("(service.pid=org.foo)");
assertNull(cfgs);
- getOsgiService(FeaturesService.class)
- .addRepository(URI.create("mvn:org.foo/bar/1.0-SNAPSHOT/xml/features"), true);
+ featureService.addRepository(URI.create("mvn:org.foo/bar/1.0-SNAPSHOT/xml/features"), true);
- cfgs = ca.listConfigurations("(service.pid=org.foo)");
+ cfgs = configurationAdmin.listConfigurations("(service.pid=org.foo)");
assertNotNull(cfgs);
assertEquals(1, cfgs.length);
assertEquals("value", cfgs[0].getProperties().get("key"));
}
+ private void writeTo(Path file, String content) throws IOException {
+ try (BufferedWriter w = Files.newBufferedWriter(file, CREATE, TRUNCATE_EXISTING, WRITE)) {
+ w.write(content);
+ }
+ }
+
}