Ignore cached type ids in tests.

Author: RZhang05

interpreter/runtimetype_test.go

@@ -27,8 +27,22 @@ import (
 	. "github.com/onflow/cadence/test_utils/common_utils"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
+// assertTypeValuesEqual compares two TypeValues using their Equal method,
+// which properly ignores cache fields like cachedID
+func assertTypeValuesEqual(t *testing.T, expected, actual interpreter.Value) {
+	expectedTypeValue, ok := expected.(interpreter.TypeValue)
+	require.True(t, ok, "expected value is not a TypeValue")
+
+	require.True(t,
+		expectedTypeValue.Equal(nil, actual),
+		"TypeValues are not equal: expected %v, got %v",
+		expected, actual,
+	)
+}
+
 func TestInterpretOptionalType(t *testing.T) {
 
 	t.Parallel()
@@ -44,7 +58,7 @@ func TestInterpretOptionalType(t *testing.T) {
       let e = Type<String?>()
     `)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		interpreter.TypeValue{
 			Type: &interpreter.OptionalStaticType{
 				Type: interpreter.PrimitiveStaticTypeString,
@@ -53,7 +67,7 @@ func TestInterpretOptionalType(t *testing.T) {
 		inter.GetGlobal("a"),
 	)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		interpreter.TypeValue{
 			Type: &interpreter.OptionalStaticType{
 				Type: interpreter.PrimitiveStaticTypeInt,
@@ -62,7 +76,7 @@ func TestInterpretOptionalType(t *testing.T) {
 		inter.GetGlobal("b"),
 	)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		interpreter.TypeValue{
 			Type: &interpreter.OptionalStaticType{
 				Type: interpreter.NewCompositeStaticTypeComputeTypeID(nil, TestLocation, "R"),
@@ -71,7 +85,7 @@ func TestInterpretOptionalType(t *testing.T) {
 		inter.GetGlobal("c"),
 	)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		interpreter.TypeValue{
 			Type: &interpreter.OptionalStaticType{
 				Type: &interpreter.OptionalStaticType{
@@ -82,7 +96,7 @@ func TestInterpretOptionalType(t *testing.T) {
 		inter.GetGlobal("d"),
 	)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		inter.GetGlobal("a"),
 		inter.GetGlobal("e"),
 	)
@@ -438,7 +452,7 @@ func TestInterpretReferenceType(t *testing.T) {
       let f = ReferenceType(entitlements: ["X"], type: Type<@R>())
     `)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		interpreter.TypeValue{
 			Type: &interpreter.ReferenceStaticType{
 				ReferencedType: interpreter.NewCompositeStaticTypeComputeTypeID(nil, TestLocation, "R"),
@@ -453,7 +467,7 @@ func TestInterpretReferenceType(t *testing.T) {
 		inter.GetGlobal("a"),
 	)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		interpreter.TypeValue{
 			Type: &interpreter.ReferenceStaticType{
 				ReferencedType: interpreter.PrimitiveStaticTypeString,
@@ -463,7 +477,7 @@ func TestInterpretReferenceType(t *testing.T) {
 		inter.GetGlobal("b"),
 	)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		interpreter.TypeValue{
 			Type: &interpreter.ReferenceStaticType{
 				ReferencedType: interpreter.NewCompositeStaticTypeComputeTypeID(nil, TestLocation, "S"),
@@ -478,7 +492,7 @@ func TestInterpretReferenceType(t *testing.T) {
 		inter.GetGlobal("c"),
 	)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		inter.GetGlobal("a"),
 		inter.GetGlobal("d"),
 	)
@@ -522,7 +536,7 @@ func TestInterpretIntersectionType(t *testing.T) {
       let k = IntersectionType(types: ["S.test.S", "S.test.S2"])!
     `)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		interpreter.TypeValue{
 			Type: &interpreter.IntersectionStaticType{
 				Types: []*interpreter.InterfaceStaticType{
@@ -538,7 +552,7 @@ func TestInterpretIntersectionType(t *testing.T) {
 		inter.GetGlobal("c"),
 	)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		interpreter.TypeValue{
 			Type: &interpreter.IntersectionStaticType{
 				Types: []*interpreter.InterfaceStaticType{
@@ -554,7 +568,7 @@ func TestInterpretIntersectionType(t *testing.T) {
 		inter.GetGlobal("j"),
 	)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		interpreter.TypeValue{
 			Type: &interpreter.IntersectionStaticType{
 				Types: []*interpreter.InterfaceStaticType{
@@ -571,12 +585,12 @@ func TestInterpretIntersectionType(t *testing.T) {
 		inter.GetGlobal("f"),
 	)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		inter.GetGlobal("a"),
 		inter.GetGlobal("h"),
 	)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		inter.GetGlobal("b"),
 		inter.GetGlobal("i"),
 	)
@@ -597,7 +611,7 @@ func TestInterpretCapabilityType(t *testing.T) {
       let e = Type<Capability<&String>>()
     `)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		interpreter.TypeValue{
 			Type: &interpreter.CapabilityStaticType{
 				BorrowType: &interpreter.ReferenceStaticType{
@@ -609,7 +623,7 @@ func TestInterpretCapabilityType(t *testing.T) {
 		inter.GetGlobal("a"),
 	)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		interpreter.TypeValue{
 			Type: &interpreter.CapabilityStaticType{
 				BorrowType: &interpreter.ReferenceStaticType{
@@ -621,7 +635,7 @@ func TestInterpretCapabilityType(t *testing.T) {
 		inter.GetGlobal("b"),
 	)
 
-	assert.Equal(t,
+	assertTypeValuesEqual(t,
 		interpreter.TypeValue{
 			Type: &interpreter.CapabilityStaticType{
 				BorrowType: &interpreter.ReferenceStaticType{