Add tests for docs/atomics-signature-embedded-json.json

Reuse the existing untrustedSignature.UnmarshalJSON tests.

NOTE: The schema at schemaPath is NOT authoritative; docs/atomic-signature.json and the code is, rather!
The schemaPath references are not testing that the code follows the behavior declared by the schema,
they are testing that the schema follows the behavior of the code!

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

Author: mtrmac

signature/signature_test.go

@@ -3,6 +3,7 @@ package signature
 import (
 	"encoding/json"
 	"io/ioutil"
+	"path/filepath"
 	"testing"
 	"time"
 
@@ -11,6 +12,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/xeipuuv/gojsonschema"
 )
 
 func TestInvalidSignatureError(t *testing.T) {
@@ -92,42 +94,57 @@ func modifiedUntrustedSignatureJSON(t *testing.T, validJSON []byte, modifyFn fun
 }
 
 // Verify that input can be unmarshaled as an untrustedSignature, and that it passes JSON schema validation, and return the unmarshaled untrustedSignature.
-func succesfullyUnmarshalUntrustedSignature(t *testing.T, input []byte) untrustedSignature {
+func succesfullyUnmarshalUntrustedSignature(t *testing.T, schemaLoader gojsonschema.JSONLoader, input []byte) untrustedSignature {
 	inputString := string(input)
 
 	var s untrustedSignature
 	err := json.Unmarshal(input, &s)
 	require.NoError(t, err, inputString)
+
+	res, err := gojsonschema.Validate(schemaLoader, gojsonschema.NewStringLoader(inputString))
+	assert.True(t, err == nil, inputString)
+	assert.True(t, res.Valid(), inputString)
+
 	return s
 }
 
 // Verify that input can't be unmashaled as an untrusted signature, and that it fails JSON schema validation.
-func assertUnmarshalUntrustedSignatureFails(t *testing.T, input []byte) {
+func assertUnmarshalUntrustedSignatureFails(t *testing.T, schemaLoader gojsonschema.JSONLoader, input []byte) {
 	inputString := string(input)
 
 	var s untrustedSignature
 	err := json.Unmarshal(input, &s)
 	assert.Error(t, err, inputString)
+
+	res, err := gojsonschema.Validate(schemaLoader, gojsonschema.NewStringLoader(inputString))
+	assert.True(t, err != nil || !res.Valid(), inputString)
 }
 
 func TestUnmarshalJSON(t *testing.T) {
+	// NOTE: The schema at schemaPath is NOT authoritative; docs/atomic-signature.json and the code is, rather!
+	// The schemaPath references are not testing that the code follows the behavior declared by the schema,
+	// they are testing that the schema follows the behavior of the code!
+	schemaPath, err := filepath.Abs("../docs/atomic-signature-embedded-json.json")
+	require.NoError(t, err)
+	schemaLoader := gojsonschema.NewReferenceLoader("file://" + schemaPath)
+
 	// Invalid input. Note that json.Unmarshal is guaranteed to validate input before calling our
 	// UnmarshalJSON implementation; so test that first, then test our error handling for completeness.
-	assertUnmarshalUntrustedSignatureFails(t, []byte("&"))
+	assertUnmarshalUntrustedSignatureFails(t, schemaLoader, []byte("&"))
 	var s untrustedSignature
-	err := s.UnmarshalJSON([]byte("&"))
+	err = s.UnmarshalJSON([]byte("&"))
 	assert.Error(t, err)
 
 	// Not an object
-	assertUnmarshalUntrustedSignatureFails(t, []byte("1"))
+	assertUnmarshalUntrustedSignatureFails(t, schemaLoader, []byte("1"))
 
 	// Start with a valid JSON.
 	validSig := newUntrustedSignature("digest!@#", "reference#@!")
 	validJSON, err := validSig.MarshalJSON()
 	require.NoError(t, err)
 
 	// Success
-	s = succesfullyUnmarshalUntrustedSignature(t, validJSON)
+	s = succesfullyUnmarshalUntrustedSignature(t, schemaLoader, validJSON)
 	assert.Equal(t, validSig, s)
 
 	// Various ways to corrupt the JSON
@@ -170,7 +187,7 @@ func TestUnmarshalJSON(t *testing.T) {
 	}
 	for _, fn := range breakFns {
 		testJSON := modifiedUntrustedSignatureJSON(t, validJSON, fn)
-		assertUnmarshalUntrustedSignatureFails(t, testJSON)
+		assertUnmarshalUntrustedSignatureFails(t, schemaLoader, testJSON)
 	}
 
 	// Modifications to unrecognized fields in "optional" are allowed and ignored
@@ -180,7 +197,7 @@ func TestUnmarshalJSON(t *testing.T) {
 	}
 	for _, fn := range allowedModificationFns {
 		testJSON := modifiedUntrustedSignatureJSON(t, validJSON, fn)
-		s := succesfullyUnmarshalUntrustedSignature(t, testJSON)
+		s := succesfullyUnmarshalUntrustedSignature(t, schemaLoader, testJSON)
 		assert.Equal(t, validSig, s)
 	}
 
@@ -193,7 +210,7 @@ func TestUnmarshalJSON(t *testing.T) {
 	}
 	validJSON, err = validSig.MarshalJSON()
 	require.NoError(t, err)
-	s = succesfullyUnmarshalUntrustedSignature(t, validJSON)
+	s = succesfullyUnmarshalUntrustedSignature(t, schemaLoader, validJSON)
 	assert.Equal(t, validSig, s)
 }
 

vendor.conf

@@ -29,3 +29,5 @@ gopkg.in/cheggaaa/pb.v1 d7e6ca3010b6f084d8056847f55d7f572f180678
 gopkg.in/yaml.v2 a3f3340b5840cee44f372bddb5880fcbc419b46a
 k8s.io/client-go bcde30fb7eaed76fd98a36b4120321b94995ffb6
 github.com/xeipuuv/gojsonschema master
+github.com/xeipuuv/gojsonreference master
+github.com/xeipuuv/gojsonpointer master