*: Compare protojson's using require.JSONEq in tests

Signed-off-by: Leonard Lyubich <leonard@morphbits.io>
nspcc-dev · Sep 30, 2024 · 4303331 · 4303331
1 parent 0246d63
commit 4303331
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 27 deletions.
diff --git a/bearer/bearer_test.go b/bearer/bearer_test.go
@@ -827,15 +827,11 @@ func TestToken_Unmarshal(t *testing.T) {
 }
 
 func TestToken_MarshalJSON(t *testing.T) {
+	//nolint:staticcheck
 	b, err := json.MarshalIndent(validBearerToken, "", " ")
 	require.NoError(t, err)
-	if string(b) != validJSONBearerToken {
-		// protojson is inconsistent https://github.com/golang/protobuf/issues/1121
-		var val bearer.Token
-		require.NoError(t, val.UnmarshalJSON(b))
-		t.Skip("https://github.com/nspcc-dev/neofs-sdk-go/issues/606")
-		require.Equal(t, validBearerToken, val)
-	}
+	t.Skip("https://github.com/nspcc-dev/neofs-sdk-go/issues/606")
+	require.JSONEq(t, validJSONBearerToken, string(b))
 }
 
 func TestToken_UnmarshalJSON(t *testing.T) {

diff --git a/session/container_test.go b/session/container_test.go
@@ -377,15 +377,11 @@ func TestContainer_Unmarshal(t *testing.T) {
 
 func TestContainer_MarshalJSON(t *testing.T) {
 	for i := range validContainerTokens {
+		//nolint:staticcheck
 		b, err := json.MarshalIndent(validContainerTokens[i], "", " ")
 		require.NoError(t, err, i)
-		if string(b) != validJSONContainerTokens[i] {
-			// protojson is inconsistent https://github.com/golang/protobuf/issues/1121
-			var val session.Container
-			require.NoError(t, val.UnmarshalJSON(b), i)
-			t.Skip("https://github.com/nspcc-dev/neofs-sdk-go/issues/606")
-			require.Equal(t, validContainerTokens[i], val, i)
-		}
+		t.Skip("https://github.com/nspcc-dev/neofs-sdk-go/issues/606")
+		require.JSONEq(t, validJSONContainerTokens[i], string(b))
 	}
 }
 

diff --git a/session/object_test.go b/session/object_test.go
@@ -411,15 +411,11 @@ func TestObject_Unmarshal(t *testing.T) {
 }
 
 func TestObject_MarshalJSON(t *testing.T) {
+	//nolint:staticcheck
 	b, err := json.MarshalIndent(validObjectToken, "", " ")
 	require.NoError(t, err)
-	if string(b) != validJSONObjectToken {
-		// protojson is inconsistent https://github.com/golang/protobuf/issues/1121
-		var val session.Object
-		require.NoError(t, val.UnmarshalJSON(b))
-		t.Skip("https://github.com/nspcc-dev/neofs-sdk-go/issues/606")
-		require.Equal(t, validObjectToken, val)
-	}
+	t.Skip("https://github.com/nspcc-dev/neofs-sdk-go/issues/606")
+	require.JSONEq(t, validJSONObjectToken, string(b))
 }
 
 func TestObject_UnmarshalJSON(t *testing.T) {

diff --git a/version/version_test.go b/version/version_test.go
@@ -98,12 +98,7 @@ func TestVersion_String(t *testing.T) {
 func TestVersion_MarshalJSON(t *testing.T) {
 	b, err := validVersion.MarshalJSON()
 	require.NoError(t, err)
-	if string(b) != validJSON {
-		// protojson is inconsistent https://github.com/golang/protobuf/issues/1121
-		var v version.Version
-		require.NoError(t, v.UnmarshalJSON(b))
-		require.Equal(t, validVersion, v)
-	}
+	require.JSONEq(t, validJSON, string(b))
 }
 
 func TestVersion_UnmarshalJSON(t *testing.T) {