Refactor Response#ToXML()

command.go

@@ -34,12 +34,16 @@ func (cmd *Command) Find(terms []string) int {
 		})
 	}
 
-	xml := r.ToXML()
-	_, err := fmt.Fprint(cmd.outStream, xml)
+	xml, err := r.ToXML()
+	if err != nil {
+		return ExitCodeError
+	}
 
-	if xml == "" || err != nil {
+	_, err = fmt.Fprint(cmd.outStream, xml)
+	if err != nil {
 		return ExitCodeError
 	}
+
 	return ExitCodeOK
 }
 

response.go

@@ -40,11 +40,7 @@ func (r *Response) AddItem(item *ResponseItem) *Response {
 	return r
 }
 
-func (r *Response) ToXML() string {
+func (r *Response) ToXML() (string, error) {
 	var x, err = xml.Marshal(r)
-	if err != nil {
-		panic(err) // FIXME
-	}
-
-	return xml.Header + string(x)
+	return xml.Header + string(x), err
 }

response_test.go

@@ -40,7 +40,12 @@ func TestResponse_ToXML(t *testing.T) {
 	}
 	r.AddItem(&item)
 
-	actual := r.ToXML()
+	actual, err := r.ToXML()
+	if err != nil {
+		t.Error("failed to convert to XML")
+		return
+	}
+
 	expected := `<?xml version="1.0" encoding="UTF-8"?>
 <items><item valid="true" arg="arg-foo" uid="f000-uid" unicode="f000-unicode"><title>title-foo</title><subtitle>Subtitle foo.</subtitle><icon>./icons/title-foo.png</icon></item></items>`
 	if actual != expected {
@@ -51,7 +56,12 @@ func TestResponse_ToXML(t *testing.T) {
 func TestResponse_ToXML_Blank(t *testing.T) {
 	r := NewResponse([]string{})
 
-	actual := r.ToXML()
+	actual, err := r.ToXML()
+	if err != nil {
+		t.Error("failed to convert to XML")
+		return
+	}
+
 	expected := `<?xml version="1.0" encoding="UTF-8"?>
 <items></items>`
 	if actual != expected {