#66, fix minor bug of preserve white space on Output XML if node or i…

…t's parent node has declare a `xml:space="preserve"`.

node.go

@@ -71,7 +71,7 @@ func (n *Node) InnerText() string {
 
 func (n *Node) sanitizedData(preserveSpaces bool) string {
 	if preserveSpaces {
-		return strings.Trim(n.Data, "\n\t")
+		return n.Data
 	}
 	return strings.TrimSpace(n.Data)
 }
@@ -140,12 +140,13 @@ func outputXML(buf *bytes.Buffer, n *Node, preserveSpaces bool) {
 
 // OutputXML returns the text that including tags name.
 func (n *Node) OutputXML(self bool) string {
+	preserveSpaces := calculatePreserveSpaces(n, false)
 	var buf bytes.Buffer
 	if self {
-		outputXML(&buf, n, false)
+		outputXML(&buf, n, preserveSpaces)
 	} else {
 		for n := n.FirstChild; n != nil; n = n.NextSibling {
-			outputXML(&buf, n, false)
+			outputXML(&buf, n, preserveSpaces)
 		}
 	}
 

node_test.go

@@ -326,15 +326,16 @@ func TestOutputXMLWithSpaceParent(t *testing.T) {
 	doc, _ := Parse(strings.NewReader(s))
 	t.Log(doc.OutputXML(true))
 
-	n := FindOne(doc, "/class_list/student/name")
 	expected := "<name> Robert </name>"
 	if g := doc.OutputXML(true); strings.Index(g, expected) == -1 {
 		t.Errorf(`expected "%s", obtained "%s"`, expected, g)
 	}
 
-	output := html.UnescapeString(doc.OutputXML(true))
-	if strings.Contains(output, "\n") {
-		t.Errorf("the outputted xml contains newlines")
+	n := FindOne(doc, "/class_list/student")
+	output := html.UnescapeString(n.OutputXML(false))
+	expected = "\n\t\t\t<name> Robert </name>\n\t\t\t<grade>A+</grade>\n\t\t"
+	if !(output == expected) {
+		t.Errorf(`expected "%s", obtained "%s"`, expected, output)
 	}
 	t.Log(n.OutputXML(false))
 }
@@ -398,20 +399,20 @@ func TestOutputXMLWithSpaceOverwrittenToDefault(t *testing.T) {
 	doc, _ := Parse(strings.NewReader(s))
 	t.Log(doc.OutputXML(true))
 
-	n := FindOne(doc, "/class_list/student")
 	expected := `<name xml:space="default">Robert</name>`
 	if g := doc.OutputXML(false); strings.Index(g, expected) == -1 {
 		t.Errorf(`expected "%s", obtained "%s"`, expected, g)
 	}
 
-	output := html.UnescapeString(doc.OutputXML(true))
-	if strings.Contains(output, "\n") {
-		t.Errorf("the outputted xml contains newlines")
+	n := FindOne(doc, "/class_list/student")
+	output := html.UnescapeString(n.OutputXML(false))
+	expected = "\n\t\t\t<name xml:space=\"default\">Robert</name>\n\t\t\t<grade>A+</grade>\n\t\t"
+	if !(output == expected) {
+		t.Errorf(`expected "%s", obtained "%s"`, expected, output)
 	}
 	t.Log(n.OutputXML(false))
 }
 
-
 func TestOutputXMLWithXMLInCDATA(t *testing.T) {
 	s := `<?xml version="1.0" encoding="utf-8"?><node><![CDATA[<greeting>Hello, world!</greeting>]]></node>`
 	doc, _ := Parse(strings.NewReader(s))