Fix several issues found by 'go vet'

errors_test.go

@@ -21,7 +21,7 @@ func TestErrCodeString(t *testing.T) {
 	for i, tt := range tests {
 		got := tt.err.String()
 		if got != tt.want {
-			t.Errorf("%i. Error = %q; want %q", i, got, tt.want)
+			t.Errorf("%d. Error = %q; want %q", i, got, tt.want)
 		}
 	}
 }

frame_test.go

@@ -69,7 +69,7 @@ func TestWriteData(t *testing.T) {
 		t.Fatalf("got %T; want *DataFrame", f)
 	}
 	if !bytes.Equal(df.Data(), data) {
-		t.Errorf("got %q; want %q", df.Data, data)
+		t.Errorf("got %q; want %q", df.Data(), data)
 	}
 	if f.Header().Flags&1 == 0 {
 		t.Errorf("didn't see END_STREAM flag")
@@ -344,7 +344,7 @@ func TestWriteSettings(t *testing.T) {
 		got = append(got, s)
 		valBack, ok := sf.Value(s.ID)
 		if !ok || valBack != s.Val {
-			t.Errorf("Value(%d) = %v, %v; want %v, true", s.ID, valBack, ok)
+			t.Errorf("Value(%d) = %v, %v; want %v, true", s.ID, valBack, ok, s.Val)
 		}
 		return nil
 	})

hpack/encode_test.go

@@ -81,7 +81,7 @@ func TestEncoderWriteField(t *testing.T) {
 		}
 		_, err := d.Write(buf.Bytes())
 		if err != nil {
-			t.Error("%d. Decoder Write = %v", i, err)
+			t.Errorf("%d. Decoder Write = %v", i, err)
 		}
 		if !reflect.DeepEqual(got, tt.hdrs) {
 			t.Errorf("%d. Decoded %+v; want %+v", i, got, tt.hdrs)
@@ -322,11 +322,10 @@ func TestEncoderSetMaxDynamicTableSizeLimit(t *testing.T) {
 		t.Errorf("e.dynTab.maxSize = %v; want %v", got, want)
 	}
 	if got, want := e.maxSizeLimit, uint32(8192); got != want {
-		t.Errorf("e.maxSizeLimit = %v; want %v", got, want);
+		t.Errorf("e.maxSizeLimit = %v; want %v", got, want)
 	}
 }
 
-
 func removeSpace(s string) string {
 	return strings.Replace(s, " ", "", -1)
 }

hpack/hpack_test.go

@@ -127,18 +127,18 @@ func TestDynamicTableAt(t *testing.T) {
 	d := NewDecoder(4096, nil)
 	at := d.mustAt
 	if got, want := at(2), (pair(":method", "GET")); got != want {
-		t.Errorf("at(2) = %q; want %q", got, want)
+		t.Errorf("at(2) = %v; want %v", got, want)
 	}
 	d.dynTab.add(pair("foo", "bar"))
 	d.dynTab.add(pair("blake", "miz"))
 	if got, want := at(len(staticTable)+1), (pair("blake", "miz")); got != want {
-		t.Errorf("at(dyn 1) = %q; want %q", got, want)
+		t.Errorf("at(dyn 1) = %v; want %v", got, want)
 	}
 	if got, want := at(len(staticTable)+2), (pair("foo", "bar")); got != want {
-		t.Errorf("at(dyn 2) = %q; want %q", got, want)
+		t.Errorf("at(dyn 2) = %v; want %v", got, want)
 	}
 	if got, want := at(3), (pair(":method", "POST")); got != want {
-		t.Errorf("at(3) = %q; want %q", got, want)
+		t.Errorf("at(3) = %v; want %v", got, want)
 	}
 }
 
@@ -196,7 +196,7 @@ func TestDynamicTableSizeEvict(t *testing.T) {
 		t.Fatalf("after setMaxSize, size = %d; want %d", d.dynTab.size, want)
 	}
 	if got, want := d.mustAt(len(staticTable)+1), (pair("foo", "bar")); got != want {
-		t.Errorf("at(dyn 1) = %q; want %q", got, want)
+		t.Errorf("at(dyn 1) = %v; want %v", got, want)
 	}
 	add(pair("long", strings.Repeat("x", 500)))
 	if want := uint32(0); d.dynTab.size != want {

server_test.go

@@ -505,7 +505,7 @@ func TestServer_Request_Get_PathSlashes(t *testing.T) {
 		})
 	}, func(r *http.Request) {
 		if r.RequestURI != "/%2f/" {
-			t.Errorf("RequestURI = %q; want /%2f/", r.RequestURI)
+			t.Errorf("RequestURI = %q; want /%%2f/", r.RequestURI)
 		}
 		if r.URL.Path != "///" {
 			t.Errorf("URL.Path = %q; want ///", r.URL.Path)
@@ -1896,7 +1896,7 @@ func TestServer_Response_ManyHeaders_With_Continuation(t *testing.T) {
 			}
 		}
 		if n < 5 {
-			t.Errorf("Only got %d CONTINUATION frames; expected 5+ (currently 6)")
+			t.Errorf("Only got %d CONTINUATION frames; expected 5+ (currently 6)", n)
 		}
 	})
 }