Merge pull request #50 from chrisloy/master

Fix default namespace in PrettyPrinter.formatNodes

Author: adriaanm

src/main/scala/scala/xml/PrettyPrinter.scala

@@ -203,7 +203,7 @@ class PrettyPrinter(width: Int, step: Int) {
    * @param sb   the stringbuffer to append to
    */
   def format(n: Node, sb: StringBuilder) { // entry point
-    format(n, null, sb)
+    format(n, TopScope, sb)
   }
 
   def format(n: Node, pscope: NamespaceBinding, sb: StringBuilder) { // entry point
@@ -253,7 +253,7 @@ class PrettyPrinter(width: Int, step: Int) {
    *  @param nodes  the sequence of nodes to be serialized
    *  @param pscope the namespace to prefix mapping
    */
-  def formatNodes(nodes: Seq[Node], pscope: NamespaceBinding = null): String =
+  def formatNodes(nodes: Seq[Node], pscope: NamespaceBinding = TopScope): String =
     sbToString(formatNodes(nodes, pscope, _))
 
   /**

src/test/scala/scala/xml/XMLTest.scala

@@ -836,4 +836,25 @@ expected closing tag of foo
     assertEquals("""<x:foo xmlns:x="gaga"/>""", pp.format(x))
   }
 
+  @UnitTest
+  def nodeSeqNs: Unit = {
+    val x = {
+      <x:foo xmlns:x="abc"/><y:bar xmlns:y="def"/>
+    }
+    val pp = new PrettyPrinter(80, 2)
+    val expected = """<x:foo xmlns:x="abc"/><y:bar xmlns:y="def"/>"""
+    assertEquals(expected, pp.formatNodes(x))
+  }
+
+  @UnitTest
+  def nodeStringBuilder: Unit = {
+    val x = {
+        <x:foo xmlns:x="abc"/>
+    }
+    val pp = new PrettyPrinter(80, 2)
+    val expected = """<x:foo xmlns:x="abc"/>"""
+    val sb = new StringBuilder
+    pp.format(x, sb)
+    assertEquals(expected, sb.toString)
+  }
 }