Construct: support exception key top-level and in assertions

List of tests that depends on `asserts[i].exception` key: expr_to_i_trailing `exception` key: default_endian_expr_exception eof_exception_bytes eof_exception_sized eof_exception_u4 eos_exception_bytes eos_exception_sized eos_exception_u4 valid_fail_anyof_int valid_fail_contents valid_fail_eq_bytes valid_fail_eq_int valid_fail_eq_str valid_fail_expr valid_fail_inst valid_fail_max_int valid_fail_min_int valid_fail_range_bytes valid_fail_range_float valid_fail_range_int valid_fail_range_str
kaitai-io · Jul 16, 2024 · ba05e7a · ba05e7a
1 parent deec84c
commit ba05e7a
Show file tree

Hide file tree

Showing 22 changed files with 253 additions and 1 deletion.
diff --git a/spec/construct/test_default_endian_expr_exception.py b/spec/construct/test_default_endian_expr_exception.py
diff --git a/spec/construct/test_eof_exception_bytes.py b/spec/construct/test_eof_exception_bytes.py
diff --git a/spec/construct/test_eof_exception_sized.py b/spec/construct/test_eof_exception_sized.py
diff --git a/spec/construct/test_eof_exception_u4.py b/spec/construct/test_eof_exception_u4.py
diff --git a/spec/construct/test_eos_exception_bytes.py b/spec/construct/test_eos_exception_bytes.py
diff --git a/spec/construct/test_eos_exception_sized.py b/spec/construct/test_eos_exception_sized.py
diff --git a/spec/construct/test_eos_exception_u4.py b/spec/construct/test_eos_exception_u4.py
diff --git a/spec/construct/test_expr_to_i_trailing.py b/spec/construct/test_expr_to_i_trailing.py
diff --git a/spec/construct/test_valid_fail_anyof_int.py b/spec/construct/test_valid_fail_anyof_int.py
diff --git a/spec/construct/test_valid_fail_contents.py b/spec/construct/test_valid_fail_contents.py
diff --git a/spec/construct/test_valid_fail_eq_bytes.py b/spec/construct/test_valid_fail_eq_bytes.py
diff --git a/spec/construct/test_valid_fail_eq_int.py b/spec/construct/test_valid_fail_eq_int.py
diff --git a/spec/construct/test_valid_fail_eq_str.py b/spec/construct/test_valid_fail_eq_str.py
diff --git a/spec/construct/test_valid_fail_expr.py b/spec/construct/test_valid_fail_expr.py
diff --git a/spec/construct/test_valid_fail_inst.py b/spec/construct/test_valid_fail_inst.py
diff --git a/spec/construct/test_valid_fail_max_int.py b/spec/construct/test_valid_fail_max_int.py
diff --git a/spec/construct/test_valid_fail_min_int.py b/spec/construct/test_valid_fail_min_int.py
diff --git a/spec/construct/test_valid_fail_range_bytes.py b/spec/construct/test_valid_fail_range_bytes.py
diff --git a/spec/construct/test_valid_fail_range_float.py b/spec/construct/test_valid_fail_range_float.py
diff --git a/spec/construct/test_valid_fail_range_int.py b/spec/construct/test_valid_fail_range_int.py
diff --git a/spec/construct/test_valid_fail_range_str.py b/spec/construct/test_valid_fail_range_str.py
diff --git a/translator/src/main/scala/io/kaitai/struct/testtranslator/specgenerators/ConstructSG.scala b/translator/src/main/scala/io/kaitai/struct/testtranslator/specgenerators/ConstructSG.scala
@@ -1,8 +1,9 @@
 package io.kaitai.struct.testtranslator.specgenerators
 
 import _root_.io.kaitai.struct.{ClassTypeProvider, Utils}
-import _root_.io.kaitai.struct.datatype.DataType
+import _root_.io.kaitai.struct.datatype.{DataType, KSError}
 import _root_.io.kaitai.struct.exprlang.Ast
+import _root_.io.kaitai.struct.languages.PythonCompiler
 import _root_.io.kaitai.struct.testtranslator.{Main, TestAssert, TestEquals, TestSpec}
 import _root_.io.kaitai.struct.translators.ConstructTranslator
 
@@ -28,6 +29,13 @@ class ConstructSG(spec: TestSpec, provider: ClassTypeProvider) extends BaseGener
   override def runParse(): Unit =
     out.puts(s"r = _schema.parse_file('src/${spec.data}')")
 
+  override def runParseExpectError(exception: KSError): Unit = {
+    importList.add("import kaitaistruct")
+    out.puts(s"with self.assertRaises(${PythonCompiler.ksErrorName(exception)}):")
+    out.inc
+    runParse()
+  }
+
   override def footer(): Unit = {}
 
   override def simpleEquality(check: TestEquals): Unit = {
@@ -50,6 +58,14 @@ class ConstructSG(spec: TestSpec, provider: ClassTypeProvider) extends BaseGener
   override def trueArrayEquality(check: TestEquals, elType: DataType, elts: Seq[Ast.expr]): Unit =
     simpleEquality(check)
 
+  override def testException(actual: Ast.expr, exception: KSError): Unit = {
+    importList.add("import kaitaistruct")
+    out.puts(s"with self.assertRaises(${PythonCompiler.ksErrorName(exception)}):")
+    out.inc
+    out.puts(translateAct(actual))
+    out.dec
+  }
+
   def translateAct(x: Ast.expr) =
     translator.translate(x).replace("this." + Main.INIT_OBJ_NAME, "r")