Add the ability to save to a Writer so the client code isn't forced to use a file.

jvprat · Jordi Vilalta Prat · commit f7061664cd8b · 2012-10-22T11:53:12.000+02:00
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBPlistParser.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBPlistParser.java
@@ -22,7 +22,9 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
+import java.io.Writer;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -106,11 +108,23 @@ public void save(Plist plist, String projectFile) throws JAXBException
   }
 
   public void save(Plist plist, File projectFile) throws JAXBException
+  {
+    try
+    {
+      save(plist, new FileWriter(projectFile));
+    }
+    catch (IOException ex)
+    {
+      throw new JAXBException(ex);
+    }
+  }
+
+  public void save(Plist plist, Writer projectFile) throws JAXBException
   {
     marshallPlist(plist, projectFile);
   }
 
-  private void marshallPlist(Plist plist, File projectFile) throws JAXBException
+  private void marshallPlist(Plist plist, Writer projectFile) throws JAXBException
   {
     JAXBContext ctx = JAXBContext.newInstance(com.sap.prd.mobile.ios.mios.xcodeprojreader.jaxb.JAXBPlist.class);
     Marshaller marshaller = ctx.createMarshaller();
diff --git a/src/test/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBPlistParserTest.java b/src/test/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBPlistParserTest.java
@@ -22,9 +22,12 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.Writer;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -127,10 +130,28 @@ public void save() throws Exception
     output.deleteOnExit();
     parser.save(plist, output.getAbsolutePath());
 
-    assertXMLEqual(new File(fileName), output);
+    DocumentBuilder db = initDocumentBuilder();
+    Document expected = db.parse(new File(fileName));
+    Document actual = db.parse(output);
+    assertXMLEqual(expected, actual);
   }
 
-  private void assertXMLEqual(File expected, File actual) throws Exception
+  @Test
+  public void saveToWriter() throws Exception
+  {
+    JAXBPlistParser parser = new JAXBPlistParser();
+    Plist plist = parser.load(fileName);
+
+    Writer output = new StringWriter();
+    parser.save(plist, output);
+
+    DocumentBuilder db = initDocumentBuilder();
+    Document expected = db.parse(new File(fileName));
+    Document actual = db.parse(new ByteArrayInputStream(output.toString().getBytes()));
+    assertXMLEqual(expected, actual);
+  }
+
+  private DocumentBuilder initDocumentBuilder() throws Exception
   {
     DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder();
     db.setEntityResolver(new EntityResolver() {
@@ -141,11 +162,13 @@ public InputSource resolveEntity(String publicId, String systemId)
         return new InputSource(new StringReader(""));
       }
     });
+    return db;
+  }
 
-    Document doc1 = db.parse(expected);
-    Document doc2 = db.parse(actual);
+  private void assertXMLEqual(Document expected, Document actual) throws Exception
+  {
     XMLUnit.setIgnoreWhitespace(true);
     XMLUnit.setIgnoreComments(true);
-    XMLAssert.assertXMLEqual(doc1, doc2);
+    XMLAssert.assertXMLEqual(expected, actual);
   }
 }
