From 3a676d6790397b9d5c180c28d0394d943a15a11a Mon Sep 17 00:00:00 2001
From: Yann Hamon <yann.hamon@contentful.com>
Date: Sun, 11 May 2025 01:19:28 +0200
Subject: [PATCH] update unit tests

---
 pkg/validator/validator_test.go | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkg/validator/validator_test.go b/pkg/validator/validator_test.go
index 4e50525..4e29530 100644
--- a/pkg/validator/validator_test.go
+++ b/pkg/validator/validator_test.go
@@ -2,6 +2,7 @@ package validator
 
 import (
 	"bytes"
+	"github.com/santhosh-tekuri/jsonschema/v6"
 	"io"
 	"reflect"
 	"testing"
@@ -12,16 +13,16 @@ import (
 )
 
 type mockRegistry struct {
-	SchemaDownloader func() (string, []byte, error)
+	SchemaDownloader func() (string, any, error)
 }
 
-func newMockRegistry(f func() (string, []byte, error)) *mockRegistry {
+func newMockRegistry(f func() (string, any, error)) *mockRegistry {
 	return &mockRegistry{
 		SchemaDownloader: f,
 	}
 }
 
-func (m mockRegistry) DownloadSchema(resourceKind, resourceAPIVersion, k8sVersion string) (string, []byte, error) {
+func (m mockRegistry) DownloadSchema(resourceKind, resourceAPIVersion, k8sVersion string) (string, any, error) {
 	return m.SchemaDownloader()
 }
 
@@ -385,14 +386,15 @@ lastName: bar
 				IgnoreMissingSchemas: testCase.ignoreMissingSchema,
 				Strict:               testCase.strict,
 			},
-			schemaCache:    nil,
 			schemaDownload: downloadSchema,
 			regs: []registry.Registry{
-				newMockRegistry(func() (string, []byte, error) {
-					return "", testCase.schemaRegistry1, nil
+				newMockRegistry(func() (string, any, error) {
+					s, err := jsonschema.UnmarshalJSON(bytes.NewReader(testCase.schemaRegistry1))
+					return "", s, err
 				}),
-				newMockRegistry(func() (string, []byte, error) {
-					return "", testCase.schemaRegistry2, nil
+				newMockRegistry(func() (string, any, error) {
+					s, err := jsonschema.UnmarshalJSON(bytes.NewReader(testCase.schemaRegistry1))
+					return "", s, err
 				}),
 			},
 		}
@@ -456,11 +458,11 @@ age: not a number
 			SkipKinds:   map[string]struct{}{},
 			RejectKinds: map[string]struct{}{},
 		},
-		schemaCache:    nil,
 		schemaDownload: downloadSchema,
 		regs: []registry.Registry{
-			newMockRegistry(func() (string, []byte, error) {
-				return "", schema, nil
+			newMockRegistry(func() (string, any, error) {
+				s, err := jsonschema.UnmarshalJSON(bytes.NewReader(schema))
+				return "", s, err
 			}),
 		},
 	}
@@ -505,11 +507,11 @@ firstName: foo
 			SkipKinds:   map[string]struct{}{},
 			RejectKinds: map[string]struct{}{},
 		},
-		schemaCache:    nil,
 		schemaDownload: downloadSchema,
 		regs: []registry.Registry{
-			newMockRegistry(func() (string, []byte, error) {
-				return "", schema, nil
+			newMockRegistry(func() (string, any, error) {
+				s, err := jsonschema.UnmarshalJSON(bytes.NewReader(schema))
+				return "", s, err
 			}),
 		},
 	}