Change `TypeTest` to use isorecursive types (#4540)

Isorecursive typing is the future standard type system, so change generic type
tests to use it.

2 files changed, 6 insertions, 5 deletions

diff --git a/test/gtest/type-builder.cpp b/test/gtest/type-builder.cpp
index c81a4ac19..7817939ce 100644
--- a/test/gtest/type-builder.cpp
+++ b/test/gtest/type-builder.cpp
@@ -74,6 +74,7 @@ TEST_F(TypeTest, TypeIterator) {
 
 TEST_F(TypeTest, IndexedTypePrinter) {
   TypeBuilder builder(4);
+  builder.createRecGroup(0, 4);
 
   Type refStructA = builder.getTempRefType(builder[0], Nullable);
   Type refStructB = builder.getTempRefType(builder[1], Nullable);
@@ -99,19 +100,19 @@ TEST_F(TypeTest, IndexedTypePrinter) {
 
   std::stringstream stream;
   stream << print(built[0]);
-  EXPECT_EQ(stream.str(), "(struct (field (ref null $array1)))");
+  EXPECT_EQ(stream.str(), "(struct_subtype (field (ref null $array1)) data)");
 
   stream.str("");
   stream << print(built[1]);
-  EXPECT_EQ(stream.str(), "(struct (field (ref null $struct0)))");
+  EXPECT_EQ(stream.str(), "(struct_subtype (field (ref null $struct0)) data)");
 
   stream.str("");
   stream << print(built[2]);
-  EXPECT_EQ(stream.str(), "(array (ref null $struct1))");
+  EXPECT_EQ(stream.str(), "(array_subtype (ref null $struct1) data)");
 
   stream.str("");
   stream << print(built[3]);
-  EXPECT_EQ(stream.str(), "(array (ref null $array0))");
+  EXPECT_EQ(stream.str(), "(array_subtype (ref null $array0) data)");
 }
 
 TEST_F(EquirecursiveTest, Basics) {
diff --git a/test/gtest/type-test.h b/test/gtest/type-test.h
index 1860efeab..fffcbd3dd 100644
--- a/test/gtest/type-test.h
+++ b/test/gtest/type-test.h
@@ -32,7 +32,7 @@ protected:
   }
 };
 
-using TypeTest = TypeSystemTest<wasm::TypeSystem::Equirecursive>;
+using TypeTest = TypeSystemTest<wasm::TypeSystem::Isorecursive>;
 using EquirecursiveTest = TypeSystemTest<wasm::TypeSystem::Equirecursive>;
 using NominalTest = TypeSystemTest<wasm::TypeSystem::Nominal>;
 using IsorecursiveTest = TypeSystemTest<wasm::TypeSystem::Isorecursive>;