Return number of passed/total tests from Prolog test functions

7 files changed, 7 insertions, 14 deletions

diff --git a/prolog/problems/clp_fd/gcd_3/common.py b/prolog/problems/clp_fd/gcd_3/common.py
index 5be46be..234b126 100644
--- a/prolog/problems/clp_fd/gcd_3/common.py
+++ b/prolog/problems/clp_fd/gcd_3/common.py
@@ -49,9 +49,8 @@ def test(code, aux_code):
         if engine_id:
             prolog.engine.destroy(engine_id)
 
-    passed = n_correct == len(test_cases)
     hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}]
-    return passed, hints
+    return n_correct, len(test_cases), hints
 
 def hint(code, aux_code):
     # TODO
diff --git a/prolog/problems/clp_fd/magic_1/common.py b/prolog/problems/clp_fd/magic_1/common.py
index e69d5ea..07adf7a 100644
--- a/prolog/problems/clp_fd/magic_1/common.py
+++ b/prolog/problems/clp_fd/magic_1/common.py
@@ -47,9 +47,8 @@ def test(code, aux_code):
         if engine_id:
             prolog.engine.destroy(engine_id)
 
-    passed = n_correct == len(test_cases)
     hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}]
-    return passed, hints
+    return n_correct, len(test_cases), hints
 
 def hint(code, aux_code):
     # TODO
diff --git a/prolog/problems/clp_fd/puzzle_abc_3/common.py b/prolog/problems/clp_fd/puzzle_abc_3/common.py
index 6373d6a..9ad6d1b 100644
--- a/prolog/problems/clp_fd/puzzle_abc_3/common.py
+++ b/prolog/problems/clp_fd/puzzle_abc_3/common.py
@@ -39,9 +39,8 @@ def test(code, aux_code):
         if engine_id:
             prolog.engine.destroy(engine_id)
 
-    passed = n_correct == len(test_cases)
     hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}]
-    return passed, hints
+    return n_correct, len(test_cases), hints
 
 def hint(code, aux_code):
     # TODO
diff --git a/prolog/problems/clp_fd/puzzle_beth_1/common.py b/prolog/problems/clp_fd/puzzle_beth_1/common.py
index 9bc1066..99f0445 100644
--- a/prolog/problems/clp_fd/puzzle_beth_1/common.py
+++ b/prolog/problems/clp_fd/puzzle_beth_1/common.py
@@ -34,9 +34,8 @@ def test(code, aux_code):
         if engine_id:
             prolog.engine.destroy(engine_id)
 
-    passed = n_correct == len(test_cases)
     hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}]
-    return passed, hints
+    return n_correct, len(test_cases), hints
 
 def hint(code, aux_code):
     # TODO
diff --git a/prolog/problems/clp_fd/puzzle_momson_2/common.py b/prolog/problems/clp_fd/puzzle_momson_2/common.py
index c77e41d..3074d44 100644
--- a/prolog/problems/clp_fd/puzzle_momson_2/common.py
+++ b/prolog/problems/clp_fd/puzzle_momson_2/common.py
@@ -41,9 +41,8 @@ def test(code, aux_code):
         if engine_id:
             prolog.engine.destroy(engine_id)
 
-    passed = n_correct == len(test_cases)
     hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}]
-    return passed, hints
+    return n_correct, len(test_cases), hints
 
 def hint(code, aux_code):
     # TODO
diff --git a/prolog/problems/clp_fd/puzzle_ratio_2/common.py b/prolog/problems/clp_fd/puzzle_ratio_2/common.py
index 6a7e676..fc2d678 100644
--- a/prolog/problems/clp_fd/puzzle_ratio_2/common.py
+++ b/prolog/problems/clp_fd/puzzle_ratio_2/common.py
@@ -42,9 +42,8 @@ def test(code, aux_code):
         if engine_id:
             prolog.engine.destroy(engine_id)
 
-    passed = n_correct == len(test_cases)
     hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}]
-    return passed, hints
+    return n_correct, len(test_cases), hints
 
 def hint(code, aux_code):
     # TODO
diff --git a/prolog/problems/clp_fd/tobase_3/common.py b/prolog/problems/clp_fd/tobase_3/common.py
index 99ccda5..ce137a4 100644
--- a/prolog/problems/clp_fd/tobase_3/common.py
+++ b/prolog/problems/clp_fd/tobase_3/common.py
@@ -50,9 +50,8 @@ def test(code, aux_code):
         if engine_id:
             prolog.engine.destroy(engine_id)
 
-    passed = n_correct == len(test_cases)
     hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}]
-    return passed, hints
+    return n_correct, len(test_cases), hints
 
 def hint(code, aux_code):
     # TODO