1 files changed, 52 insertions, 20 deletions

diff --git a/python/problems/introduction/fast_fingers/common.py b/python/problems/introduction/fast_fingers/common.py
index 8ab51ab..cda6486 100644
--- a/python/problems/introduction/fast_fingers/common.py
+++ b/python/problems/introduction/fast_fingers/common.py
@@ -1,11 +1,12 @@
 # coding=utf-8
 
-from python.util import has_token_sequence
+from python.util import has_token_sequence, string_almost_equal, \
+    string_contains_number, get_tokens, get_numbers, get_exception_desc
 from server.hints import Hint, HintSequence
 
 id = 190
 group = 'introduction'
-number = 2
+number = 5
 visible = True
 
 solution = '''\
@@ -14,28 +15,62 @@ zacetek = time()
 rezultat = float(input("Koliko je 7*6? "))
 konec = time()
 cas = konec­zacetek
-print ("Porabil si ", cas, "s.")
+print ("Vpisal si ", rezultat, ". Za razmišljanje si porabil ", cas, " s.")
 '''
 
 hint_type = {
-    'plan': Hint('plan'),
-    'name_error': HintSequence('name_error', 4),
-    'type_error': HintSequence('name_error', 4),
-    'error': HintSequence('error', 2),
+    'name_error': Hint('name_error'),
+    'type_error': Hint('type_error'),
+    'error': Hint('error'),
     'time': Hint('time'),
     'time_diff': Hint('time_diff'),
+    'printing': Hint('printing'),
 }
 
 def test(python, code):
-    passed = True
-    hints = [{'id': 'test_results', 'args': {'passed': 0, 'total': 0}}]
+    # List of inputs: (expression to eval, stdin).
+    test_in = [
+        (None, '1\n'),
+        (None, '2\n'),
+        (None, '42\n'),
+        (None, '-42\n'),
+        (None, '0\n'),
+    ]
+    test_out = [
+        1,
+        2,
+        42,
+        -42,
+        0
+    ]
+
+   # List of outputs: (expression result, stdout, stderr, exception).
+    answers = python(code=code, inputs=test_in, timeout=1.0)
+    outputs = [ans[1] for ans in answers]
+
+    n_correct = 0
+    tin = None
+    for i, (output, correct) in enumerate(zip(outputs, test_out)):
+        if string_contains_number(output, correct):
+            n_correct += 1
+        else:
+            tin = test_in[i][1]
+            tout = correct
+
+    passed = n_correct == len(test_in)
+    hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_in)}}]
+    if tin:
+        hints.append({'id': 'problematic_test_case', 'args': {'testin': str(tin), 'testout': str(tout)}})
     return passed, hints
 
 def hint(python, code):
+    tokens = get_tokens(code)
+
     # run one test first to see if there are any exceptions
-    test_in = [(None, '5\n')]
-    answer = python(code=code, inputs=test_in, timeout=2.0)
+    test_in = [(None, '212\n')]
+    answer = python(code=code, inputs=test_in, timeout=1.0)
     exc = answer[0][3]
+    exc_hint = get_exception_desc(answer[0][3])
     # if have an exception!
     if exc:
         if 'NameError' in exc:
@@ -43,21 +78,18 @@ def hint(python, code):
         elif 'TypeError' in exc:
             return [{'id':'type_error', 'args': {'message': exc}}]
         else:
-            return [{'id':'error', 'args': {'message': exc}}]
+            return exc_hint
 
     # First: if student does not import time, tell him about that module
-    if not has_token_sequence(code, ['time']):
+    if not has_token_sequence(tokens, ['time']):
         return [{'id': 'time'}]
 
-    # show plan if student is lost
-    # a) empty progam or
-    # b) there is not input (we can do it here, since we have no input hint)
-    if len(code.strip()) < 5 or (not has_token_sequence(code, ['input'])):
-        return [{'id': 'plan'}]
-
     # Student will have to compute time difference and they will need
     # the substraction (-) operator to do this. Check for the minus operator.
-    if not has_token_sequence(code, ['-']):
+    if not has_token_sequence(tokens, ['-']):
         return [{'id' : 'time_diff'}]
 
+    if not string_contains_number(answer[0][1], 212):
+        return [{'id' : 'printing'}]
+
     return None