Change test generator to correctly handle unknown enum values and reg…

…enerate tests
kaitai-io · Sep 8, 2024 · 85049ab · 85049ab
1 parent 3cf422f
commit 85049ab
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 29 deletions.
diff --git a/spec/java/src/io/kaitai/struct/spec/TestEnumInvalid.java b/spec/java/src/io/kaitai/struct/spec/TestEnumInvalid.java
diff --git a/spec/java/src/io/kaitai/struct/spec/TestEnumToIInvalid.java b/spec/java/src/io/kaitai/struct/spec/TestEnumToIInvalid.java
diff --git a/spec/java/src/io/kaitai/struct/spec/TestSwitchManualEnumInvalid.java b/spec/java/src/io/kaitai/struct/spec/TestSwitchManualEnumInvalid.java
diff --git a/spec/java/src/io/kaitai/struct/spec/TestSwitchManualEnumInvalidElse.java b/spec/java/src/io/kaitai/struct/spec/TestSwitchManualEnumInvalidElse.java
diff --git a/translator/src/main/scala/io/kaitai/struct/testtranslator/specgenerators/JavaSG.scala b/translator/src/main/scala/io/kaitai/struct/testtranslator/specgenerators/JavaSG.scala
@@ -65,11 +65,24 @@ class JavaSG(spec: TestSpec, provider: ClassTypeProvider) extends BaseGenerator(
 
   override def simpleEquality(check: TestEquals): Unit = {
     val actType = translator.detectType(check.actual)
+    val expType = translator.detectType(check.expected)
+
     val actStr = translateAct(check.actual)
     val expStr = translator.translate(check.expected)
-    actType match {
-      case _: IntType | _: BooleanType =>
+
+    (actType, expType) match {
+      case (_: IntType | _: BooleanType, _) =>
         out.puts(s"assertIntEquals($actStr, $expStr);")
+      case (et: EnumType, _: IntType) => {
+        // When we expect unknown value of enumeration, in KST we uses just it integer value
+        // That expression would be translated to number. Wh should wrap it to enum
+        val enumSpec = et.enumSpec.get
+        val expEnum = translator.doEnumById(enumSpec, expStr)
+        val enumName = translator.enumClass(enumSpec.name)
+
+        out.puts(s"assertEquals($actStr, $expEnum);")
+        out.puts(s"assertTrue($expEnum instanceof $enumName.Unknown);")
+      }
       case _ =>
         out.puts(s"assertEquals($actStr, $expStr);")
     }