From bbfafbb32c4c13ee8a273be1fc9ab0bd0180eed6 Mon Sep 17 00:00:00 2001 From: Mickael Remond Date: Thu, 18 Jan 2018 17:03:54 +0100 Subject: [PATCH] Clean-up / Consistency --- iq.go | 2 +- iq_test.go | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/iq.go b/iq.go index 69e04c4..3ef76b3 100644 --- a/iq.go +++ b/iq.go @@ -105,7 +105,7 @@ func (iqDecoder) decode(p *xml.Decoder, se xml.StartElement) (IQ, error) { // UnmarshalXML implements custom parsing for IQs func (iq *IQ) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { iq.XMLName = start.Name - fmt.Println("IQ Name", iq.XMLName) + // Extract IQ attributes for _, attr := range start.Attr { if attr.Name.Local == "id" { diff --git a/iq_test.go b/iq_test.go index 2ee86b4..d833e5b 100644 --- a/iq_test.go +++ b/iq_test.go @@ -2,7 +2,6 @@ package xmpp // import "fluux.io/xmpp" import ( "encoding/xml" - "reflect" "testing" "github.com/google/go-cmp/cmp" @@ -19,14 +18,16 @@ func TestUnmarshalIqs(t *testing.T) { } for _, test := range tests { - var parsedIQ = new(IQ) - err := xml.Unmarshal([]byte(test.iqString), parsedIQ) + parsedIQ := IQ{} + err := xml.Unmarshal([]byte(test.iqString), &parsedIQ) if err != nil { t.Errorf("Unmarshal(%s) returned error", test.iqString) } - if !reflect.DeepEqual(parsedIQ, &test.parsedIQ) { - t.Errorf("Unmarshal(%s) expecting result %+v = %+v", test.iqString, parsedIQ, &test.parsedIQ) + + if !xmlEqual(parsedIQ, test.parsedIQ) { + t.Errorf("non matching items\n%s", cmp.Diff(parsedIQ, test.parsedIQ)) } + } } @@ -50,8 +51,8 @@ func TestGenerateIq(t *testing.T) { t.Errorf("cannot marshal xml structure") } - var parsedIQ = new(IQ) - if err = xml.Unmarshal(data, parsedIQ); err != nil { + parsedIQ := IQ{} + if err = xml.Unmarshal(data, &parsedIQ); err != nil { t.Errorf("Unmarshal(%s) returned error", data) }