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 2014/01/20 17:14:08 UTC
[1/4] git commit: Added test for KARAF-2696.
Updated Branches:
refs/heads/master a54690873 -> 477d35ca9
Added test for KARAF-2696.
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a808519f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a808519f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a808519f
Branch: refs/heads/master
Commit: a808519fb1f254f11bde6db44ec7ec6c7097805b
Parents: a546908
Author: Achim Finke <ac...@opitz-consulting.com>
Authored: Mon Jan 20 16:30:51 2014 +0100
Committer: Achim Finke <ac...@opitz-consulting.com>
Committed: Mon Jan 20 16:38:24 2014 +0100
----------------------------------------------------------------------
.../features/FeatureMetaDataExporterTest.java | 59 ++++++++++++++++++++
1 file changed, 59 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/a808519f/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java
new file mode 100644
index 0000000..968eee8
--- /dev/null
+++ b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java
@@ -0,0 +1,59 @@
+package org.apache.karaf.tooling.features;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayOutputStream;
+
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.karaf.tooling.features.model.BundleRef;
+import org.apache.karaf.tooling.features.model.ConfigFileRef;
+import org.apache.karaf.tooling.features.model.Feature;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.DefaultArtifact;
+import org.apache.maven.artifact.handler.DefaultArtifactHandler;
+import org.junit.Test;
+
+public class FeatureMetaDataExporterTest {
+
+ @Test
+ public void testWriteFeature() throws XMLStreamException {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ FeatureMetaDataExporter featureMetaDataExporter = new FeatureMetaDataExporter(baos);
+
+ BundleRef bundle = new BundleRef("mvn:org.apache.example/example/1.0.0", 10);
+ Artifact bundleArtifact = new DefaultArtifact("org.apache.example", "example", "1.0.0",
+ null, "jar", null,
+ new DefaultArtifactHandler());
+ bundle.setArtifact(bundleArtifact);
+
+ ConfigFileRef configFile = new ConfigFileRef("mvn:org.apache.example/example/1.0.0/cfg");
+ Artifact configFileArtifact = new DefaultArtifact("org.apache.example", "example", "1.0.0",
+ null, "xml", "exampleconfig",
+ new DefaultArtifactHandler());
+ configFile.setArtifact(configFileArtifact);
+
+ Feature feature = new Feature("example");
+ feature.addBundle(bundle);
+ feature.addConfigFile(configFile);
+
+ featureMetaDataExporter.writeFeature(feature);
+ featureMetaDataExporter.close();
+
+ assertEquals(formatString(expectedValue()), formatString(baos.toString()));
+ }
+
+ private String expectedValue() {
+ return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+ "<features>" +
+ "<feature name=\"example\">" +
+ "<bundle start-level=\"10\" name=\"example-1.0.0.jar\" groupId=\"org.apache.example\" artifactId=\"example\" type=\"jar\" version=\"1.0.0\">mvn:org.apache.example/example/1.0.0</bundle>" +
+ "<config name=\"example-1.0.0-exampleconfig.xml\" groupId=\"org.apache.example\" artifactId=\"example\" type=\"xml\" classifier=\"exampleconfig\" version=\"1.0.0\">mvn:org.apache.example/example/1.0.0/cfg</config>" +
+ "</feature>" +
+ "</features>";
+ }
+
+ private String formatString(String string) {
+ return string.replaceAll("\n", "").replaceAll("\r", "");
+ }
+}
[4/4] git commit: Removed xml header from assertion.
Posted by cs...@apache.org.
Removed xml header from assertion.
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/477d35ca
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/477d35ca
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/477d35ca
Branch: refs/heads/master
Commit: 477d35ca98100229e3da37a2dd156e41b2f42ae3
Parents: a392c29
Author: Achim Finke <ac...@opitz-consulting.com>
Authored: Mon Jan 20 17:08:20 2014 +0100
Committer: Achim Finke <ac...@opitz-consulting.com>
Committed: Mon Jan 20 17:08:20 2014 +0100
----------------------------------------------------------------------
.../tooling/features/FeatureMetaDataExporterTest.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/477d35ca/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java
index 5d0bae5..3de0fcc 100644
--- a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java
+++ b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java
@@ -18,9 +18,10 @@
*/
package org.apache.karaf.tooling.features;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.io.ByteArrayOutputStream;
+import java.io.UnsupportedEncodingException;
import javax.xml.stream.XMLStreamException;
@@ -35,7 +36,7 @@ import org.junit.Test;
public class FeatureMetaDataExporterTest {
@Test
- public void testWriteFeature() throws XMLStreamException {
+ public void testWriteFeature() throws XMLStreamException, UnsupportedEncodingException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
FeatureMetaDataExporter featureMetaDataExporter = new FeatureMetaDataExporter(baos);
@@ -58,17 +59,17 @@ public class FeatureMetaDataExporterTest {
featureMetaDataExporter.writeFeature(feature);
featureMetaDataExporter.close();
- assertEquals(formatString(expectedValue()), formatString(baos.toString()));
+ assertTrue(formatString(baos.toString("UTF-8")).contains(expectedValue()));
}
private String expectedValue() {
- return "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<features>" +
+ return formatString(
+ "<features>" +
"<feature name=\"example\">" +
"<bundle start-level=\"10\" name=\"example-1.0.0.jar\" groupId=\"org.apache.example\" artifactId=\"example\" type=\"jar\" version=\"1.0.0\">mvn:org.apache.example/example/1.0.0</bundle>" +
"<config name=\"example-1.0.0-exampleconfig.xml\" groupId=\"org.apache.example\" artifactId=\"example\" type=\"xml\" classifier=\"exampleconfig\" version=\"1.0.0\">mvn:org.apache.example/example/1.0.0/cfg</config>" +
"</feature>" +
- "</features>";
+ "</features>");
}
private String formatString(String string) {
[2/4] git commit: Adapted test to changes in model.
Posted by cs...@apache.org.
Adapted test to changes in model.
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a3d3a836
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a3d3a836
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a3d3a836
Branch: refs/heads/master
Commit: a3d3a8368e1a4e44ddac76821e000c8d775b64cd
Parents: a808519
Author: Achim Finke <ac...@opitz-consulting.com>
Authored: Mon Jan 20 16:40:30 2014 +0100
Committer: Achim Finke <ac...@opitz-consulting.com>
Committed: Mon Jan 20 16:40:30 2014 +0100
----------------------------------------------------------------------
.../karaf/tooling/features/FeatureMetaDataExporterTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/a3d3a836/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java
index 968eee8..c356dd1 100644
--- a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java
+++ b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java
@@ -6,8 +6,8 @@ import java.io.ByteArrayOutputStream;
import javax.xml.stream.XMLStreamException;
+import org.apache.karaf.tooling.features.model.ArtifactRef;
import org.apache.karaf.tooling.features.model.BundleRef;
-import org.apache.karaf.tooling.features.model.ConfigFileRef;
import org.apache.karaf.tooling.features.model.Feature;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
@@ -27,7 +27,7 @@ public class FeatureMetaDataExporterTest {
new DefaultArtifactHandler());
bundle.setArtifact(bundleArtifact);
- ConfigFileRef configFile = new ConfigFileRef("mvn:org.apache.example/example/1.0.0/cfg");
+ ArtifactRef configFile = new ArtifactRef("mvn:org.apache.example/example/1.0.0/cfg");
Artifact configFileArtifact = new DefaultArtifact("org.apache.example", "example", "1.0.0",
null, "xml", "exampleconfig",
new DefaultArtifactHandler());
[3/4] git commit: Added Apache Header.
Posted by cs...@apache.org.
Added Apache Header.
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a392c29d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a392c29d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a392c29d
Branch: refs/heads/master
Commit: a392c29d6e20b0c5a8793d606b1a2ce4d340d84e
Parents: a3d3a83
Author: Achim Finke <ac...@opitz-consulting.com>
Authored: Mon Jan 20 16:51:04 2014 +0100
Committer: Achim Finke <ac...@opitz-consulting.com>
Committed: Mon Jan 20 16:51:04 2014 +0100
----------------------------------------------------------------------
.../features/FeatureMetaDataExporterTest.java | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/a392c29d/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java
index c356dd1..5d0bae5 100644
--- a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java
+++ b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/FeatureMetaDataExporterTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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.karaf.tooling.features;
import static org.junit.Assert.assertEquals;