Fix tests

neandertech · May 12, 2024 · 79c6684 · 79c6684
1 parent 0cba540
commit 79c6684
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -113,3 +113,6 @@ lazy val examples = crossProject(JVMPlatform, JSPlatform)
       "software.amazon.smithy" % "smithy-model" % smithyVersion
     )
   )
+  .jsSettings(
+    Test / fork := false
+  )
diff --git a/modules/tests/jvm/src/test/scala/utils.test.scala b/modules/tests/jvm/src/test/scala/utils.test.scala
@@ -61,13 +61,16 @@ trait SchemaSuite extends FunSuite {
   def checkSchema[A: Schema](modelStrings: String*)(using Location) = {
     val unvalidated = DynamicSchemaIndex.builder.addAll(Schema[A]).build().toSmithyModel
     val node = ModelSerializer.builder().build().serialize(unvalidated)
-    val validated = Model.assembler().addDocumentNode(node).assemble().unwrap()
+    val validated = Model.assembler().discoverModels().addDocumentNode(node).assemble().unwrap()
+    val filtered = ModelTransformer
+      .create()
+      .filterShapes(validated, _.getId().getNamespace() != "smithy4s.deriving.internals")
     val expectedAssembler = Model.assembler()
     modelStrings.zipWithIndex.foreach { case (string, index) =>
       expectedAssembler.addUnparsedModel(s"expected$index.smithy", string)
     }
     val expected = expectedAssembler.assemble().unwrap()
-    assertEquals(ModelWrapper(validated), ModelWrapper(expected))
+    assertEquals(ModelWrapper(filtered), ModelWrapper(expected))
   }
 }