From 95e107bf9e6a288969e4a83aee1a7062990f3b67 Mon Sep 17 00:00:00 2001
From: Martin <martin@leo.fri1.uni-lj.si>
Date: Fri, 9 Oct 2015 16:35:23 +0200
Subject: Fixed testing for most problems.

---
 .../functions_and_modules/caesar_cipher/common.py  | 36 +++++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

(limited to 'python/problems/functions_and_modules/caesar_cipher/common.py')

diff --git a/python/problems/functions_and_modules/caesar_cipher/common.py b/python/problems/functions_and_modules/caesar_cipher/common.py
index 494a7f9..3c53369 100644
--- a/python/problems/functions_and_modules/caesar_cipher/common.py
+++ b/python/problems/functions_and_modules/caesar_cipher/common.py
@@ -20,7 +20,7 @@ def caesar(s):
             cipher += chr(ord(c) - 23)
         else:
             cipher += c
-    return cipher)
+    return cipher
 '''
 
 hint_type = {
@@ -28,12 +28,39 @@ hint_type = {
 }
 
 def test(python, code):
-    test_in = [1]
+    func_name = 'caesar'
+    tokens = get_tokens(code)
+    if not has_token_sequence(tokens, ['def', func_name]):
+        return False, [{'id' : 'no_func_name', 'args' : {'func_name' : func_name}}]
+
+    in_out = [
+        ('', ''),
+        ('a', 'd'),
+        ('aa', 'dd'),
+        ('ab', 'de'),
+        ('z', 'c'),
+        ('xyz', 'abc'),
+        (' ', ' '),
+        ('a  a', 'd  d'),
+        ('julij cezar je seveda uporabljal cezarjevo sifro',
+         'mxolm fhcdu mh vhyhgd xsrudeomdo fhcdumhyr vliur'),
+        ('the quick brown fox jumps over the lazy dog',
+         'wkh txlfn eurzq ira mxpsv ryhu wkh odcb grj'),
+    ]
+
+    test_in = [(func_name+'("%s")'%str(l[0]), None) for l in in_out]
+    test_out = [l[1] for l in in_out]
+
+    answers = python(code=code, inputs=test_in, timeout=1.0)
     n_correct = 0
+    tin, tout = None, None
+    for i, (ans, to) in enumerate(zip(answers, test_out)):
+        n_correct += ans[0] == to
+        if ans[0] != to:
+            tin = test_in[i][0]
+            tout = to
 
     passed = n_correct == len(test_in)
-    tin = None
-    tout = None
     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)}})
@@ -41,6 +68,7 @@ def test(python, code):
         hints.append({'id': 'final_hint'})
     return passed, hints
 
+
 def hint(python, code):
     tokens = get_tokens(code)
 
-- 
cgit v1.2.1