Enable annotation output tests

Author: Dekker1

.github/workflows/python-package.yml

@@ -14,7 +14,7 @@ jobs:
         python-version: ["3.6", "3.10", "pypy3"]
 
     env:
-      MINIZINC_URL: https://github.com/MiniZinc/MiniZincIDE/releases/download/2.6.3/MiniZincIDE-2.6.3-x86_64.AppImage
+      MINIZINC_URL: https://github.com/MiniZinc/MiniZincIDE/releases/download/2.6.4/MiniZincIDE-2.6.4-x86_64.AppImage
     steps:
       - uses: actions/checkout@v3
         with:

tests/test_types.py

@@ -222,17 +222,15 @@ def test_npint64(self):
         assert result.status is Status.SATISFIED
 
 
-# Enable on MiniZinc 2.6+ (JSON output of annotations is broken before then)
-# class TestAnn(InstanceTestCase):
-#     def test_ann_atom(self):
-#         self.instance.add_string("ann: x :: add_to_output = promise_total;")
-#         result = self.instance.solve()
-#         assert result.status is Status.SATISFIED
-#         assert result["x"] == "promise_total"
-
-#     def test_ann_call(self):
-#         self.instance.add_string(
-#         'ann: x :: add_to_output = expression_name("test");')
-#         result = self.instance.solve()
-#         assert result.status is Status.SATISFIED
-#         assert result["x"] == 'expression_name("test")'
+class TestAnn(InstanceTestCase):
+    def test_ann_atom(self):
+        self.instance.add_string("ann: x :: add_to_output = promise_total;")
+        result = self.instance.solve()
+        assert result.status is Status.SATISFIED
+        assert result["x"] == "promise_total"
+
+    def test_ann_call(self):
+        self.instance.add_string('ann: x :: add_to_output = expression_name("test");')
+        result = self.instance.solve()
+        assert result.status is Status.SATISFIED
+        assert result["x"] == 'expression_name("test")'