clean up the decode loop and fix a couple of bad prints

R=rsc
DELTA=15  (8 added, 2 deleted, 5 changed)
OCL=31738
CL=31738
This commit is contained in:
Rob Pike 2009-07-16 13:05:46 -07:00
parent 1902283053
commit 04ae91cf71
2 changed files with 13 additions and 7 deletions

View file

@ -171,7 +171,7 @@ func TestEncoderDecoder(t *testing.T) {
newEt1 := new(ET1);
dec.Decode(newEt1);
if dec.state.err != nil {
t.Fatalf("error decoding ET1:", dec.state.err);
t.Fatal("error decoding ET1:", dec.state.err);
}
if !reflect.DeepEqual(et1, newEt1) {
@ -185,7 +185,7 @@ func TestEncoderDecoder(t *testing.T) {
newEt1 = new(ET1);
dec.Decode(newEt1);
if dec.state.err != nil {
t.Fatalf("round 2: error decoding ET1:", dec.state.err);
t.Fatal("round 2: error decoding ET1:", dec.state.err);
}
if !reflect.DeepEqual(et1, newEt1) {
t.Fatalf("round 2: invalid data for et1: expected %+v; got %+v\n", *et1, *newEt1);
@ -202,7 +202,7 @@ func TestEncoderDecoder(t *testing.T) {
newEt2 := new(ET2);
dec.Decode(newEt2);
if dec.state.err == nil {
t.Fatalf("round 3: expected `bad type' error decoding ET2");
t.Fatal("round 3: expected `bad type' error decoding ET2");
}
}