Exclusively use assert package

databricks · Oct 29, 2024 · 9aefbaa · 9aefbaa
1 parent 0662b84
commit 9aefbaa
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 26 deletions.
diff --git a/libs/dyn/dynassert/assert.go b/libs/dyn/dynassert/assert.go
@@ -111,7 +111,3 @@ func PanicsWithError(t assert.TestingT, errString string, f func(), msgAndArgs .
 func NotPanics(t assert.TestingT, f func(), msgAndArgs ...interface{}) bool {
 	return assert.NotPanics(t, f, msgAndArgs...)
 }
-
-func JSONEq(t assert.TestingT, expected string, actual string, msgAndArgs ...interface{}) bool {
-	return assert.JSONEq(t, expected, actual, msgAndArgs...)
-}
diff --git a/libs/dyn/jsonsaver/encoder_test.go b/libs/dyn/jsonsaver/encoder_test.go
@@ -4,12 +4,13 @@ import (
 	"testing"
 
 	assert "github.com/databricks/cli/libs/dyn/dynassert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestEncoder_marshalNoEscape(t *testing.T) {
 	out, err := marshalNoEscape("1 < 2")
-	require.NoError(t, err)
+	if !assert.NoError(t, err) {
+		return
+	}
 
 	// Confirm the output.
 	assert.JSONEq(t, `"1 < 2"`, string(out))
@@ -23,7 +24,9 @@ func TestEncoder_marshalNoEscape(t *testing.T) {
 
 func TestEncoder_marshalIndentNoEscape(t *testing.T) {
 	out, err := marshalIndentNoEscape([]string{"1 < 2", "2 < 3"}, "", "  ")
-	require.NoError(t, err)
+	if !assert.NoError(t, err) {
+		return
+	}
 
 	// Confirm the output.
 	assert.JSONEq(t, `["1 < 2", "2 < 3"]`, string(out))

diff --git a/libs/dyn/jsonsaver/saver_test.go b/libs/dyn/jsonsaver/saver_test.go
@@ -4,37 +4,42 @@ import (
 	"testing"
 
 	"github.com/databricks/cli/libs/dyn"
-	"github.com/stretchr/testify/require"
+	assert "github.com/databricks/cli/libs/dyn/dynassert"
 )
 
 func TestMarshalString(t *testing.T) {
 	b, err := Marshal(dyn.V("string"))
-	require.NoError(t, err)
-	require.JSONEq(t, `"string"`, string(b))
+	if assert.NoError(t, err) {
+		assert.JSONEq(t, `"string"`, string(b))
+	}
 }
 
 func TestMarshalBool(t *testing.T) {
 	b, err := Marshal(dyn.V(true))
-	require.NoError(t, err)
-	require.JSONEq(t, `true`, string(b))
+	if assert.NoError(t, err) {
+		assert.JSONEq(t, `true`, string(b))
+	}
 }
 
 func TestMarshalInt(t *testing.T) {
 	b, err := Marshal(dyn.V(42))
-	require.NoError(t, err)
-	require.JSONEq(t, `42`, string(b))
+	if assert.NoError(t, err) {
+		assert.JSONEq(t, `42`, string(b))
+	}
 }
 
 func TestMarshalFloat(t *testing.T) {
 	b, err := Marshal(dyn.V(42.1))
-	require.NoError(t, err)
-	require.JSONEq(t, `42.1`, string(b))
+	if assert.NoError(t, err) {
+		assert.JSONEq(t, `42.1`, string(b))
+	}
 }
 
 func TestMarshalTime(t *testing.T) {
 	b, err := Marshal(dyn.V(dyn.MustTime("2021-01-01T00:00:00Z")))
-	require.NoError(t, err)
-	require.JSONEq(t, `"2021-01-01T00:00:00Z"`, string(b))
+	if assert.NoError(t, err) {
+		assert.JSONEq(t, `"2021-01-01T00:00:00Z"`, string(b))
+	}
 }
 
 func TestMarshalMap(t *testing.T) {
@@ -43,8 +48,9 @@ func TestMarshalMap(t *testing.T) {
 	m.Set(dyn.V("key2"), dyn.V("value2"))
 
 	b, err := Marshal(dyn.V(m))
-	require.NoError(t, err)
-	require.JSONEq(t, `{"key1":"value1","key2":"value2"}`, string(b))
+	if assert.NoError(t, err) {
+		assert.JSONEq(t, `{"key1":"value1","key2":"value2"}`, string(b))
+	}
 }
 
 func TestMarshalSequence(t *testing.T) {
@@ -53,8 +59,9 @@ func TestMarshalSequence(t *testing.T) {
 	s = append(s, dyn.V("value2"))
 
 	b, err := Marshal(dyn.V(s))
-	require.NoError(t, err)
-	require.JSONEq(t, `["value1","value2"]`, string(b))
+	if assert.NoError(t, err) {
+		assert.JSONEq(t, `["value1","value2"]`, string(b))
+	}
 }
 
 func TestMarshalComplex(t *testing.T) {
@@ -72,13 +79,14 @@ func TestMarshalComplex(t *testing.T) {
 
 	// Marshal without indent.
 	b, err := Marshal(dyn.V(root))
-	require.NoError(t, err)
-	require.Equal(t, `{"map1":{"str1":"value1","str2":"value2"},"seq1":["value1","value2"]}`+"\n", string(b))
+	if assert.NoError(t, err) {
+		assert.Equal(t, `{"map1":{"str1":"value1","str2":"value2"},"seq1":["value1","value2"]}`+"\n", string(b))
+	}
 
 	// Marshal with indent.
 	b, err = MarshalIndent(dyn.V(root), "", "  ")
-	require.NoError(t, err)
-	require.Equal(t, `{
+	if assert.NoError(t, err) {
+		assert.Equal(t, `{
   "map1": {
     "str1": "value1",
     "str2": "value2"
@@ -88,4 +96,5 @@ func TestMarshalComplex(t *testing.T) {
     "value2"
   ]
 }`+"\n", string(b))
+	}
 }