Merge branch '#72' into master

antchfx · Oct 25, 2021 · 95ebf6b · 95ebf6b
2 parents 0960309 + eca2fa0
commit 95ebf6b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/node.go b/node.go
@@ -142,7 +142,7 @@ func outputXML(buf *bytes.Buffer, n *Node, preserveSpaces bool) {
 func (n *Node) OutputXML(self bool) string {
 	preserveSpaces := calculatePreserveSpaces(n, false)
 	var buf bytes.Buffer
-	if self {
+	if self && n.Type != DocumentNode {
 		outputXML(&buf, n, preserveSpaces)
 	} else {
 		for n := n.FirstChild; n != nil; n = n.NextSibling {

diff --git a/parse_test.go b/parse_test.go
@@ -370,7 +370,7 @@ func TestStreamParser_Success1(t *testing.T) {
 	}
 	testOutputXML(t, "first call result", `<BBB>b1</BBB>`, n)
 	testOutputXML(t, "doc after first call",
-		`<><?xml?><ROOT><AAA><CCC>c1</CCC><BBB>b1</BBB></AAA></ROOT></>`, findRoot(n))
+		`<?xml?><ROOT><AAA><CCC>c1</CCC><BBB>b1</BBB></AAA></ROOT>`, findRoot(n))
 
 	// Second `<BBB>` read
 	n, err = sp.Read()
@@ -379,7 +379,7 @@ func TestStreamParser_Success1(t *testing.T) {
 	}
 	testOutputXML(t, "second call result", `<BBB>b2<ZZZ z="1">z1</ZZZ></BBB>`, n)
 	testOutputXML(t, "doc after second call",
-		`<><?xml?><ROOT><AAA><DDD>d1</DDD><BBB>b2<ZZZ z="1">z1</ZZZ></BBB></AAA></ROOT></>`, findRoot(n))
+		`<?xml?><ROOT><AAA><DDD>d1</DDD><BBB>b2<ZZZ z="1">z1</ZZZ></BBB></AAA></ROOT>`, findRoot(n))
 
 	// Third `<BBB>` read (Note we will skip 'b3' since the streamElementFilter excludes it)
 	n, err = sp.Read()
@@ -391,7 +391,7 @@ func TestStreamParser_Success1(t *testing.T) {
 	// been filtered out and is not our target node, thus it is considered just like any other
 	// non target nodes such as `<CCC>`` or `<DDD>`
 	testOutputXML(t, "doc after third call",
-		`<><?xml?><ROOT><AAA></AAA><ZZZ><BBB>b4</BBB></ZZZ></ROOT></>`,
+		`<?xml?><ROOT><AAA></AAA><ZZZ><BBB>b4</BBB></ZZZ></ROOT>`,
 		findRoot(n))
 
 	// Fourth `<BBB>` read
@@ -401,7 +401,7 @@ func TestStreamParser_Success1(t *testing.T) {
 	}
 	testOutputXML(t, "fourth call result", `<BBB>b5</BBB>`, n)
 	testOutputXML(t, "doc after fourth call",
-		`<><?xml?><ROOT><AAA></AAA><ZZZ><BBB>b5</BBB></ZZZ></ROOT></>`,
+		`<?xml?><ROOT><AAA></AAA><ZZZ><BBB>b5</BBB></ZZZ></ROOT>`,
 		findRoot(n))
 
 	_, err = sp.Read()
@@ -431,7 +431,7 @@ func TestStreamParser_Success2(t *testing.T) {
 		t.Fatal(err.Error())
 	}
 	testOutputXML(t, "first call result", `<CCC>c1</CCC>`, n)
-	testOutputXML(t, "doc after first call", `<><?xml?><AAA><CCC>c1</CCC></AAA></>`, findRoot(n))
+	testOutputXML(t, "doc after first call", `<?xml?><AAA><CCC>c1</CCC></AAA>`, findRoot(n))
 
 	// Second Read() should return d1
 	n, err = sp.Read()
@@ -440,7 +440,7 @@ func TestStreamParser_Success2(t *testing.T) {
 	}
 	testOutputXML(t, "second call result", `<DDD>d1</DDD>`, n)
 	testOutputXML(t, "doc after second call",
-		`<><?xml?><AAA><BBB>b1</BBB><DDD>d1</DDD></AAA></>`, findRoot(n))
+		`<?xml?><AAA><BBB>b1</BBB><DDD>d1</DDD></AAA>`, findRoot(n))
 
 	// Third call should return c2
 	n, err = sp.Read()
@@ -449,7 +449,7 @@ func TestStreamParser_Success2(t *testing.T) {
 	}
 	testOutputXML(t, "third call result", `<CCC>c2</CCC>`, n)
 	testOutputXML(t, "doc after third call",
-		`<><?xml?><AAA><BBB>b2</BBB><CCC>c2</CCC></AAA></>`, findRoot(n))
+		`<?xml?><AAA><BBB>b2</BBB><CCC>c2</CCC></AAA>`, findRoot(n))
 
 	_, err = sp.Read()
 	if err != io.EOF {