better tests

Author: keks

command_test.go

@@ -367,5 +367,10 @@ func TestPostRun(t *testing.T) {
 				t.Fatal("too few values in next")
 			}
 		}
+
+		_, err = res.Next()
+		if err != io.EOF {
+			t.Fatal("expected EOF, got", err)
+		}
 	}
 }

response_test.go

@@ -1,59 +1,54 @@
 package cmds
 
 import (
-	// "bytes"
-	// "fmt"
+	"bytes"
+	"fmt"
 	"strings"
-	// "testing"
+	"testing"
+
+	"github.com/ipfs/go-ipfs-cmds/cmdsutil"
 )
 
 type TestOutput struct {
 	Foo, Bar string
 	Baz      int
 }
 
-/*
 func TestMarshalling(t *testing.T) {
 	cmd := &Command{}
 	opts, _ := cmd.GetOptions(nil)
 
 	req, _ := NewRequest(nil, nil, nil, nil, nil, opts)
 
-	res := NewResponse(req)
-	res.SetOutput(TestOutput{"beep", "boop", 1337})
-
-	_, err := res.Marshal()
-	if err == nil {
-		t.Error("Should have failed (no encoding type specified in request)")
-	}
+	buf := bytes.NewBuffer(nil)
+	wc := writecloser{Writer: buf, Closer: nopCloser{}}
+	re := NewWriterResponseEmitter(wc, req, Encoders[JSON])
 
-	req.SetOption(EncShort, JSON)
-
-	reader, err := res.Marshal()
+	err := re.Emit(TestOutput{"beep", "boop", 1337})
 	if err != nil {
 		t.Error(err, "Should have passed")
 	}
-	buf := new(bytes.Buffer)
-	buf.ReadFrom(reader)
+
+	req.SetOption(cmdsutil.EncShort, JSON)
+
 	output := buf.String()
 	if removeWhitespace(output) != "{\"Foo\":\"beep\",\"Bar\":\"boop\",\"Baz\":1337}" {
+		t.Log("expected: {\"Foo\":\"beep\",\"Bar\":\"boop\",\"Baz\":1337}")
+		t.Log("got:", removeWhitespace(buf.String()))
 		t.Error("Incorrect JSON output")
 	}
 
-	res.SetError(fmt.Errorf("Oops!"), ErrClient)
-	reader, err = res.Marshal()
-	if err != nil {
-		t.Error("Should have passed")
-	}
 	buf.Reset()
-	buf.ReadFrom(reader)
+
+	re.SetError(fmt.Errorf("Oops!"), cmdsutil.ErrClient)
+
 	output = buf.String()
-	fmt.Println(removeWhitespace(output))
 	if removeWhitespace(output) != "{\"Message\":\"Oops!\",\"Code\":1}" {
+		t.Log("expected: {\"Message\":\"Oops!\",\"Code\":1}")
+		t.Log("got:", removeWhitespace(buf.String()))
 		t.Error("Incorrect JSON output")
 	}
 }
-*/
 
 func removeWhitespace(input string) string {
 	input = strings.Replace(input, " ", "", -1)