issue #90 - part 1

anyxml_test.go

@@ -158,7 +158,7 @@ func TestNilMap(t *testing.T) {
 
 func TestNilValue(t *testing.T) {
 	val := map[string]interface{}{"toplevel": nil}
-	checkval := "<root><toplevel><nil></toplevel></root>"
+	checkval := "<root><toplevel/></root>"
 
 	XmlDefaultEmptyElemSyntax()
 	xmlout, err := AnyXml(val, "root")
@@ -171,7 +171,7 @@ func TestNilValue(t *testing.T) {
 	}
 
 	checkval = `   <root>
-     <toplevel><nil></toplevel>
+     <toplevel/>
    </root>`
 	xmlout, err = AnyXmlIndent(val, "   ", "  ", "root")
 	if err != nil {
@@ -183,7 +183,7 @@ func TestNilValue(t *testing.T) {
 	}
 
 	XmlGoEmptyElemSyntax()
-	checkval = "<root><toplevel><nil></toplevel></root>"
+	checkval = "<root><toplevel></toplevel></root>"
 	xmlout, err = AnyXml(val, "root")
 	if err != nil {
 		t.Fatal(err)
@@ -194,7 +194,7 @@ func TestNilValue(t *testing.T) {
 	}
 
 	checkval = `   <root>
-     <toplevel><nil></toplevel>
+     <toplevel></toplevel>
    </root>`
 	xmlout, err = AnyXmlIndent(val, "   ", "  ", "root")
 	if err != nil {

isvalid_test.go

@@ -55,11 +55,12 @@ func TestXmlCheckIsValid(t *testing.T) {
 		t.Fatal("NewMapJson err;", err)
 	}
 	fmt.Printf("%v\n", m)
-	if _, err = m.Xml(); err == nil {
-		t.Fatal("Xml err: nil")
+	if b, err := m.Xml(); err != nil {
+		fmt.Println("m:", string(b))
+		t.Fatal("Xml err:", err)
 	}
-	if _, err = m.XmlIndent("", "   "); err == nil {
-		t.Fatal("XmlIndent err: nil")
+	if _, err = m.XmlIndent("", "   "); err != nil {
+		t.Fatal("XmlIndent err:", nil)
 	}
 
 	ms, err := NewMapXmlSeq([]byte(`<doc><elem>element</elem></doc>`))

xml.go

@@ -476,6 +476,12 @@ func xmlToMapParser(skey string, a []xml.Attr, p *xml.Decoder, r bool) (map[stri
 				} else {
 					n[skey] = "" // empty element
 				}
+			} else if len(n) == 1 && len(na) > 0 {
+				// it's a simple element w/ no attributes w/ subelements
+				for _, v := range n {
+					na["#text"] = v
+				}
+				n[skey] = na
 			}
 			return n, nil
 		case xml.CharData: