Prolog: add test cases for the trees group

3 files changed, 57 insertions, 9 deletions

diff --git a/prolog/problems/trees/tolistbt_2/common.py b/prolog/problems/trees/tolistbt_2/common.py
index 3c14c4e..290b16b 100644
--- a/prolog/problems/trees/tolistbt_2/common.py
+++ b/prolog/problems/trees/tolistbt_2/common.py
@@ -1,18 +1,57 @@
-# coding=utf-8
+from operator import itemgetter
+import socket
+
+import prolog.engine
+import prolog.util
+from server.hints import Hint, HintPopup
 
 id = 141
-number = 46
-visible = False
+number = 50
+visible = True
 facts = None
 
 solution = '''\
 conc141([], L, L).
 conc141([H|T], L2, [H|L]) :-
-  conc141(T, L2, L).
+    conc141(T, L2, L).
 
 tolistBT(nil, []).
 tolistBT(b(L, E, R), List) :-
-  tolistBT(L, LL),
-  tolistBT(R, RL),
-  conc141(LL, [E|RL], List).
+    tolistBT(L, LL),
+    tolistBT(R, RL),
+    conc141(LL, [E|RL], List).
 '''
+
+test_cases = [
+    ('tolistBT(nil, X), X == []',
+        [{}]),
+    ('tolistBT(b(b(b(nil,4,nil),2,b(nil,6,nil)),1,b(nil,3,b(nil,5,nil))), X), X == [4,2,6,1,3,5]',
+        [{}]),
+    ('tolistBT(b(b(b(b(nil,8,nil),7,nil),3,b(nil,2,nil)),8,b(b(nil,4,nil),8,b(nil,1,nil))), X), X == [8,7,3,2,8,4,8,1]',
+        [{}]),
+    ('tolistBT(b(b(b(b(nil,a,nil),b,nil),c,nil),d,nil), X), X == [a,b,c,d]',
+        [{}]),
+]
+
+def test(code, aux_code):
+    n_correct = 0
+    engine_id = None
+    try:
+        engine_id, output = prolog.engine.create(code=code+aux_code, timeout=1.0)
+        if engine_id is not None and 'error' not in map(itemgetter(0), output):
+            # Engine successfully created, and no syntax error in program.
+            for query, answers in test_cases:
+                if prolog.engine.check_answers(engine_id, query=query, answers=answers, timeout=1.0):
+                    n_correct += 1
+    except socket.timeout:
+        pass
+    finally:
+        if engine_id:
+            prolog.engine.destroy(engine_id)
+
+    hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_cases)}}]
+    return n_correct, len(test_cases), hints
+
+def hint(code, aux_code):
+    # TODO
+    return []
diff --git a/prolog/problems/trees/tolistbt_2/en.py b/prolog/problems/trees/tolistbt_2/en.py
index 94ba3ea..702efbb 100644
--- a/prolog/problems/trees/tolistbt_2/en.py
+++ b/prolog/problems/trees/tolistbt_2/en.py
@@ -1,5 +1,3 @@
-# coding=utf-8
-
 name = 'tolistBT/2'
 slug = 'construct a list with all elements of a binary tree'
 
diff --git a/prolog/problems/trees/tolistbt_2/sl.py b/prolog/problems/trees/tolistbt_2/sl.py
new file mode 100644
index 0000000..5545c51
--- /dev/null
+++ b/prolog/problems/trees/tolistbt_2/sl.py
@@ -0,0 +1,11 @@
+name = 'tolistBT/2'
+slug = 'vrni seznam elementov binarnega drevesa'
+
+description = '''\
+<p><code>tolistBT(T, L)</code>: seznam <code>L</code> vsebuje vse elemente binarnega drevesa <code>T</code> v infiksnem vrstnem redu.</p>
+<pre>
+?- tolistBT(b(b(nil,2,nil),1,b(nil,3,nil)), L).
+  L = [2,1,3].
+</pre>'''
+
+hint = {}