Merge branch 'main' into zapdiff

Author: AryaHassanli

cmd/cli/zapdiff.go

@@ -103,4 +103,3 @@ func listXMLFiles(p string) (paths []string, err error) {
 
 	return
 }
-

zapdiff/check.go

@@ -7,8 +7,8 @@ import (
 )
 
 func checkMismatches(ep elementPair, baseName string, n1, n2 string) (mm []XmlMismatch) {
-	e1Children := make(map[string]*etree.Element)
-	e2Children := make(map[string]*etree.Element)
+	e1Children := make(map[string]*etree.Element, len(ep.e1.ChildElements()))
+	e2Children := make(map[string]*etree.Element, len(ep.e2.ChildElements()))
 	mm = make([]XmlMismatch, 0)
 
 	for _, c1 := range ep.e1.ChildElements() {
@@ -63,8 +63,8 @@ func checkMismatches(ep elementPair, baseName string, n1, n2 string) (mm []XmlMi
 
 func checkAttributes(ep elementPair, id string, baseName string, n1, n2 string) (mm []XmlMismatch) {
 	mm = make([]XmlMismatch, 0)
-	e1Attrs := make(map[string]string)
-	e2Attrs := make(map[string]string)
+	e1Attrs := make(map[string]string, len(ep.e1.Attr))
+	e2Attrs := make(map[string]string, len(ep.e2.Attr))
 
 	for _, a := range ep.e1.Attr {
 		e1Attrs[a.Key] = a.Value

zapdiff/csv.go

@@ -10,7 +10,12 @@ import (
 // WriteMismatchesToCSV writes the given mismatches to the writer in CSV format.
 func WriteMismatchesToCSV(w io.Writer, mm []XmlMismatch, l XmlMismatchLevel) (err error) {
 	csvWriter := csv.NewWriter(w)
-	defer csvWriter.Flush()
+	defer func() {
+		csvWriter.Flush()
+		if err == nil {
+			err = csvWriter.Error()
+		}
+	}()
 
 	// Write header
 	header := []string{"Level", "Type", "File", "Element Xpath", "Details"}

zapdiff/element_id.go

@@ -8,12 +8,20 @@ import (
 
 func parentAndSelfAttr(e *etree.Element, attr string) string {
 	parentID := getEntityUniqueIdentifier(e.Parent())
-	return fmt.Sprintf("%s/%s[@%s='%s']", parentID, e.Tag, attr, e.SelectAttrValue(attr, ""))
+	a := e.SelectAttr(attr)
+	if a == nil {
+		return fmt.Sprintf("%s/%s", parentID, getElementXPathSegment(e))
+	}
+	return fmt.Sprintf("%s/%s[@%s='%s']", parentID, e.Tag, attr, a.Value)
 }
 
 func parentAndSelfText(e *etree.Element) string {
 	parentID := getEntityUniqueIdentifier(e.Parent())
-	return fmt.Sprintf("%s[%s='%s']/%s", parentID, e.Tag, e.Text(), e.Tag)
+	text := e.Text()
+	if text == "" {
+		return fmt.Sprintf("%s/%s", parentID, getElementXPathSegment(e))
+	}
+	return fmt.Sprintf("%s/%s[text()='%s']", parentID, e.Tag, text)
 }
 
 func getEntityUniqueIdentifier(e *etree.Element) string {

zapdiff/xpath.go

@@ -19,7 +19,6 @@ func getElementXPathSegment(e *etree.Element) (s string) {
 			cnt++
 			if sib == e {
 				idx = cnt
-				break
 			}
 		}
 	}