Convert more bespoke methods to io.Reader/io.Writer interfaces

[rbdr/mobius] / hotline / user_test.go

diff --git a/hotline/user_test.go b/hotline/user_test.go
index 2268a3ec647c4f16aa68df942206932cf19687f8..6258316f94d5f3186baa696008009d82d4e14acb 100644 (file)
--- a/hotline/user_test.go
+++ b/hotline/user_test.go
@@ -44,13 +44,14 @@ func TestReadUser(t *testing.T) {
        }
        for _, tt := range tests {
                t.Run(tt.name, func(t *testing.T) {
-                       got, err := ReadUser(tt.args.b)
+                       var user User
+                       _, err := user.Write(tt.args.b)
                        if (err != nil) != tt.wantErr {
                                t.Errorf("ReadUser() error = %v, wantErr %v", err, tt.wantErr)
                                return
                        }
-                       if !assert.Equal(t, tt.want, got) {
-                               t.Errorf("ReadUser() got = %v, want %v", got, tt.want)
+                       if !assert.Equal(t, tt.want, &user) {
+                               t.Errorf("ReadUser() got = %v, want %v", user, tt.want)
                        }
                })
        }
@@ -77,8 +78,8 @@ func TestDecodeUserString(t *testing.T) {
        }
        for _, tt := range tests {
                t.Run(tt.name, func(t *testing.T) {
-                       if gotDecodedString := DecodeUserString(tt.args.encodedString); gotDecodedString != tt.wantDecodedString {
-                               t.Errorf("DecodeUserString() = %v, want %v", gotDecodedString, tt.wantDecodedString)
+                       if gotDecodedString := decodeString(tt.args.encodedString); gotDecodedString != tt.wantDecodedString {
+                               t.Errorf("decodeString() = %v, want %v", gotDecodedString, tt.wantDecodedString)
                        }
                })
        }
@@ -110,7 +111,7 @@ func TestNegatedUserString(t *testing.T) {
        }
        for _, tt := range tests {
                t.Run(tt.name, func(t *testing.T) {
-                       if got := negateString(tt.args.encodedString); !bytes.Equal(got, tt.want) {
+                       if got := encodeString(tt.args.encodedString); !bytes.Equal(got, tt.want) {
                                t.Errorf("NegatedUserString() = %x, want %x", got, tt.want)
                        }
                })