Fix broken auxdata interoperability test

Author: jdorn-gt

.ci/test-interop.sh

@@ -1,22 +1,44 @@
+#!/bin/bash
 set -e
 cd build
 
+failures=0
+
+check() {
+    local creator=$1
+    local auxdata=$2
+    local consumer=$3
+    shift 3
+
+    if "$@" ; then
+        echo $creator $auxdata AuxData work in $consumer
+    else
+        failures=$(( failures + 1))
+    fi
+}
+
 ### floating-point compatiblity test
 
 bin/test_floats -w floats_cpp.gtirb
 python3 src/test/testInterop/test_floats.py -w floats_py.gtirb
 
-bin/test_floats -r floats_py.gtirb && \
-    echo "python float AuxData work in c++"
-python3 src/test/testInterop/test_floats.py -r floats_cpp.gtirb && \
-    echo "c++ float AuxData work in python"
-rm floats_*.gtirb
+check python float c++ \
+    bin/test_floats -r floats_py.gtirb
+check c++ float python \
+    python3 src/test/testInterop/test_floats.py -r floats_cpp.gtirb
+
+rm floats_{cpp,py}.gtirb
 
-# variant compatibility test
+### variant compatibility test
 
 bin/test_variants -w variants_cpp.gtirb
 python3 src/test/testInterop/test_variants.py -w variants_py.gtirb
-python3 src/test/testInterop/test_variants.py -r variants_cpp.gtirb && \
-    echo "c++ variant AuxData work in python"
-bin/test_variants -r variants_py.gtirb && \
-    echo "python variant auxdata work in c++"
+
+check c++ variant python \
+    python3 src/test/testInterop/test_variants.py -r variants_cpp.gtirb
+check python variant c++ \
+    bin/test_variants -r variants_py.gtirb
+
+rm variants_{cpp,py}.gtirb
+
+test $failures = 0

src/test/testInterop/test_variants.py

@@ -1,6 +1,7 @@
+import dataclasses
 import os
 import tempfile
-from typing import Any
+from typing import Any, ClassVar
 
 import gtirb
 
@@ -44,30 +45,25 @@ def test_mapvariant():
     compare_variant_maps(ad2, vmap)
 
 
+@dataclasses.dataclass
 class I1:
-    GTIRB_TYPE = "int64_t"
+    GTIRB_TYPE: ClassVar[str] = "int64_t"
     data: int
 
-    def __init__(self, data) -> None:
-        self.data = data
-
 
+@dataclasses.dataclass
 class I2:
-    GTIRB_TYPE = "int64_t"
+    GTIRB_TYPE: ClassVar[str] = "int64_t"
     data: int
 
-    def __init__(self, data) -> None:
-        self.data = data
-
 
+@dataclasses.dataclass
 class S1:
-    GTIRB_TYPE = "string"
+    GTIRB_TYPE: ClassVar[str] = "string"
     data: str
 
-    def __init__(self, data) -> None:
-        self.data = data
-
 
+@dataclasses.dataclass
 class MyMap:
     TYPELIST = [
         I1,
@@ -84,6 +80,9 @@ def __eq__(self, __o: object) -> bool:
             return False
         return self._map == __o._map
 
+    def __repr__(self) -> str:
+        return f"MyMap({self._map!r})"
+
     def toAuxData(self):
         return {
             k: gtirb.Variant(self.TYPELIST.index(type(v)), v.data)
@@ -137,7 +136,7 @@ def check_ir(filename):
     compare_variant_maps(ir.aux_data["simpleVariantMap"].data, simple)
     my_map = MyMap.fromAuxData(ir.aux_data["complexVariantMap"])
     _, my_other_map = make_complex_variant_map()
-    assert my_other_map == my_map
+    assert my_other_map == my_map, (my_other_map, my_map)
 
 
 if __name__ == "__main__":