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:11 UTC

[4/4] git commit: Removed xml header from assertion.

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) {