Simpify some Go tests with zson.MustParseValue (#5011)

brimdata · Jan 30, 2024 · ec69d94 · ec69d94
1 parent 4eba82a
commit ec69d94
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/api/queryio/zjson_test.go b/api/queryio/zjson_test.go
@@ -2,24 +2,16 @@ package queryio_test
 
 import (
 	"bytes"
-	"strings"
 	"testing"
 
 	"github.com/brimdata/zed"
 	"github.com/brimdata/zed/api"
 	"github.com/brimdata/zed/api/queryio"
-	"github.com/brimdata/zed/zio/zsonio"
+	"github.com/brimdata/zed/zson"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-func mkRecord(t *testing.T, s string) zed.Value {
-	r := zsonio.NewReader(zed.NewContext(), strings.NewReader(s))
-	rec, err := r.Read()
-	require.NoError(t, err)
-	return *rec
-}
-
 func TestZJSONWriter(t *testing.T) {
 	const record = `{x:1}`
 	const expected = `
@@ -32,7 +24,7 @@ func TestZJSONWriter(t *testing.T) {
 	w := queryio.NewZJSONWriter(&buf)
 	err := w.WriteControl(api.QueryChannelSet{ChannelID: 1})
 	require.NoError(t, err)
-	err = w.Write(mkRecord(t, record))
+	err = w.Write(zson.MustParseValue(zed.NewContext(), record))
 	require.NoError(t, err)
 	err = w.WriteControl(api.QueryChannelEnd{ChannelID: 1})
 	require.NoError(t, err)

diff --git a/complex_test.go b/complex_test.go
@@ -15,9 +15,7 @@ import (
 
 func TestRecordAccessNamed(t *testing.T) {
 	const input = `{foo:"hello" (=zfile),bar:true (=zbool)} (=0)`
-	reader := zsonio.NewReader(zed.NewContext(), strings.NewReader(input))
-	rec, err := reader.Read()
-	require.NoError(t, err)
+	rec := zson.MustParseValue(zed.NewContext(), input)
 	s := rec.Deref("foo").AsString()
 	assert.Equal(t, s, "hello")
 	b := rec.Deref("bar").AsBool()

diff --git a/zson/marshal_zng_test.go b/zson/marshal_zng_test.go
@@ -12,7 +12,6 @@ import (
 	"github.com/brimdata/zed/pkg/nano"
 	"github.com/brimdata/zed/zio"
 	"github.com/brimdata/zed/zio/zngio"
-	"github.com/brimdata/zed/zio/zsonio"
 	"github.com/brimdata/zed/zson"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -185,11 +184,9 @@ func TestUnmarshalRecord(t *testing.T) {
 	const expected = `{top:{T2f1:{T3f1:1(int32),T3f2:1.(float32)},T2f2:"t2f2-string1"}}`
 	require.Equal(t, expected, zson.FormatValue(rec))
 
-	val, err := zsonio.NewReader(zed.NewContext(), strings.NewReader(expected)).Read()
-	require.NoError(t, err)
-
+	val := zson.MustParseValue(zed.NewContext(), expected)
 	var v2 T1
-	err = zson.UnmarshalZNG(*val, &v2)
+	err = zson.UnmarshalZNG(val, &v2)
 	require.NoError(t, err)
 	require.Equal(t, v1, v2)