Ensure randStr includes full UTF-8 charset

nhooyr · nhooyr · commit a43c537e3114 · 2019-09-23T15:35:05.000-05:00
diff --git a/assert_test.go b/assert_test.go
@@ -2,10 +2,10 @@ package websocket_test
 
 import (
 	"context"
-	"encoding/hex"
 	"fmt"
 	"math/rand"
 	"reflect"
+	"strings"
 
 	"github.com/google/go-cmp/cmp"
 
@@ -99,7 +99,11 @@ func randBytes(n int) []byte {
 }
 
 func randString(n int) string {
-	return hex.EncodeToString(randBytes(n))[:n]
+	s := strings.ToValidUTF8(string(randBytes(n)), "_")
+	if len(s) > n {
+		return s[:n]
+	}
+	return s
 }
 
 func assertEcho(ctx context.Context, c *websocket.Conn, typ websocket.MessageType, n int) error {
diff --git a/websocket_js_test.go b/websocket_js_test.go
@@ -36,12 +36,12 @@ func TestConn(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = assertJSONEcho(ctx, c, 16)
+	err = assertJSONEcho(ctx, c, 1024)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	err = assertEcho(ctx, c, websocket.MessageBinary, 16)
+	err = assertEcho(ctx, c, websocket.MessageBinary, 1024)
 	if err != nil {
 		t.Fatal(err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -36,12 +36,12 @@ func TestConn(t *testing.T) {`
`36`	`36`	`t.Fatal(err)`
`37`	`37`	`}`
`38`	`38`
`39`		`- err = assertJSONEcho(ctx, c, 16)`
	`39`	`+ err = assertJSONEcho(ctx, c, 1024)`
`40`	`40`	`if err != nil {`
`41`	`41`	`t.Fatal(err)`
`42`	`42`	`}`
`43`	`43`
`44`		`- err = assertEcho(ctx, c, websocket.MessageBinary, 16)`
	`44`	`+ err = assertEcho(ctx, c, websocket.MessageBinary, 1024)`
`45`	`45`	`if err != nil {`
`46`	`46`	`t.Fatal(err)`
`47`	`47`	`}`