Add more tests for scalaImports renderer

This also fix union renderer issue
disneystreaming · May 30, 2024 · 91b4542 · 91b4542
1 parent 5873cc5
commit 91b4542
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 8 deletions.
diff --git a/modules/codegen/src/smithy4s/codegen/internals/Renderer.scala b/modules/codegen/src/smithy4s/codegen/internals/Renderer.scala
@@ -1040,7 +1040,6 @@ private[internals] class Renderer(compilationUnit: CompilationUnit) { self =>
       lines(
         documentationAnnotation(alt.hints),
         deprecationAnnotation(alt.hints),
-        renderScalaImports(alt.hints),
         constructor
       )
     }
@@ -1100,6 +1099,7 @@ private[internals] class Renderer(compilationUnit: CompilationUnit) { self =>
     lines(
       documentationAnnotation(hints),
       deprecationAnnotation(hints),
+      renderScalaImports(hints),
       block(
         line"sealed trait ${NameDef(name.name)} extends ${mixinExtendsStatement}scala.Product with scala.Serializable"
       ).withSameLineValue(line" self =>")(

diff --git a/modules/codegen/test/src/smithy4s/codegen/internals/RendererSpec.scala b/modules/codegen/test/src/smithy4s/codegen/internals/RendererSpec.scala
@@ -492,9 +492,10 @@ final class RendererSpec extends munit.ScalaCheckSuite {
   }
 
   test(
-    "generated code of a structure that is applied @scalaImports should contain imports"
+    "generated code of a shape that is applied @scalaImports should contain imports"
   ) {
-    val smithy =
+
+    val structure =
       """
         |$version: "2.0"
         |
@@ -511,12 +512,69 @@ final class RendererSpec extends munit.ScalaCheckSuite {
         |}
         |""".stripMargin
 
-    val contents = generateScalaCode(smithy).values
+    val service =
+      """
+        |$version: "2.0"
+        |
+        |namespace smithy4s
+        |
+        |use smithy4s.meta#scalaImports
+        |
+        |apply smithy4s#MyService @scalaImports(
+        |  ["smithy4s.providers._"]
+        |)
+        |
+        |
+        |service MyService {
+        |  version: "1.0.0"
+        |}
+        |""".stripMargin
+
+    val union =
+      """
+        |$version: "2.0"
+        |
+        |namespace smithy4s
+        |
+        |use smithy4s.meta#scalaImports
+        |
+        |apply smithy4s#MyUnion @scalaImports(
+        |  ["smithy4s.providers._"]
+        |)
+        |
+        |union MyUnion {
+        | int: Integer,
+        | str: String
+        |}
+        |""".stripMargin
+
+    val myEnum =
+      """
+        |$version: "2.0"
+        |
+        |namespace smithy4s
+        |
+        |use smithy4s.meta#scalaImports
+        |
+        |apply smithy4s#MyEnum @scalaImports(
+        |  ["smithy4s.providers._"]
+        |)
+        |
+        |enum MyEnum {
+        | Right = "right"
+        | Left = "left"
+        |}
+        |""".stripMargin
+
+    List(structure, service, union, myEnum).foreach { smithy =>
+      val contents = generateScalaCode(smithy).values
+
+      assert(
+        contents.exists(_.contains("import smithy4s.providers._")),
+        "generated code should contain imports"
+      )
+    }
 
-    assert(
-      contents.exists(_.contains("import smithy4s.providers._")),
-      "generated code should contain imports"
-    )
   }
 
   property("enumeration order is preserved") {