From 60b1cc983c65654552c4b4a0d52114248ae0228f Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Tue, 30 Jun 2020 08:36:18 +0530
Subject: Fix Tests

---
 yaksh/evaluator_tests/test_bash_evaluation.py   | 6 ++++--
 yaksh/evaluator_tests/test_c_cpp_evaluation.py  | 3 ++-
 yaksh/evaluator_tests/test_java_evaluation.py   | 3 ++-
 yaksh/evaluator_tests/test_python_evaluation.py | 3 ++-
 yaksh/evaluator_tests/test_scilab_evaluation.py | 9 ++++-----
 5 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'yaksh/evaluator_tests')

diff --git a/yaksh/evaluator_tests/test_bash_evaluation.py b/yaksh/evaluator_tests/test_bash_evaluation.py
index f86bf24..689f65b 100644
--- a/yaksh/evaluator_tests/test_bash_evaluation.py
+++ b/yaksh/evaluator_tests/test_bash_evaluation.py
@@ -129,7 +129,8 @@ class BashAssertionEvaluationTestCases(EvaluatorBaseTest):
 
         # Then
         self.assertFalse(result.get("success"))
-        self.assert_correct_output("Error", result.get("error"))
+        self.assert_correct_output("Error",
+                                   result.get("error")[0]["message"])
 
     def test_infinite_loop(self):
         # Given
@@ -416,7 +417,8 @@ class BashHookEvaluationTestCases(EvaluatorBaseTest):
 
         # Then
         self.assertFalse(result.get('success'))
-        self.assert_correct_output('Incorrect Answer', result.get('error'))
+        self.assert_correct_output('Incorrect Answer',
+                                   result.get('error')[0]['message'])
 
     def test_assert_with_hook(self):
         # Given
diff --git a/yaksh/evaluator_tests/test_c_cpp_evaluation.py b/yaksh/evaluator_tests/test_c_cpp_evaluation.py
index 14ed808..242d0b0 100644
--- a/yaksh/evaluator_tests/test_c_cpp_evaluation.py
+++ b/yaksh/evaluator_tests/test_c_cpp_evaluation.py
@@ -822,7 +822,8 @@ class CppHookEvaluationTestCases(EvaluatorBaseTest):
 
         # Then
         self.assertFalse(result.get('success'))
-        self.assert_correct_output('Incorrect Answer', result.get('error'))
+        self.assert_correct_output('Incorrect Answer',
+                                   result.get('error')[0]['message'])
 
     def test_assert_with_hook(self):
         # Given
diff --git a/yaksh/evaluator_tests/test_java_evaluation.py b/yaksh/evaluator_tests/test_java_evaluation.py
index eb09f2f..3e30ba3 100644
--- a/yaksh/evaluator_tests/test_java_evaluation.py
+++ b/yaksh/evaluator_tests/test_java_evaluation.py
@@ -694,7 +694,8 @@ class JavaHookEvaluationTestCases(EvaluatorBaseTest):
 
         # Then
         self.assertFalse(result.get('success'))
-        self.assert_correct_output('Incorrect Answer', result.get('error'))
+        self.assert_correct_output('Incorrect Answer',
+                                   result.get('error')[0]['message'])
 
     def test_assert_with_hook(self):
         # Given
diff --git a/yaksh/evaluator_tests/test_python_evaluation.py b/yaksh/evaluator_tests/test_python_evaluation.py
index de973cf..35c2322 100644
--- a/yaksh/evaluator_tests/test_python_evaluation.py
+++ b/yaksh/evaluator_tests/test_python_evaluation.py
@@ -803,7 +803,8 @@ class PythonHookEvaluationTestCases(EvaluatorBaseTest):
 
         # Then
         self.assertFalse(result.get('success'))
-        self.assert_correct_output('Incorrect Answer', result.get('error'))
+        self.assert_correct_output('Incorrect Answer',
+                                   result.get('error')[0]['message'])
 
     def test_assert_with_hook(self):
         # Given
diff --git a/yaksh/evaluator_tests/test_scilab_evaluation.py b/yaksh/evaluator_tests/test_scilab_evaluation.py
index d3f1dc8..41abf94 100644
--- a/yaksh/evaluator_tests/test_scilab_evaluation.py
+++ b/yaksh/evaluator_tests/test_scilab_evaluation.py
@@ -92,9 +92,8 @@ class ScilabEvaluationTestCases(EvaluatorBaseTest):
 
         grader = Grader(self.in_dir)
         result = grader.evaluate(kwargs)
-
         self.assertFalse(result.get("success"))
-        self.assert_correct_output('error', result.get("error"))
+        self.assert_correct_output('error', result.get("error")[0]['message'])
 
     def test_incorrect_answer(self):
         user_answer = ("funcprot(0)\nfunction[c]=add(a,b)"
@@ -110,10 +109,10 @@ class ScilabEvaluationTestCases(EvaluatorBaseTest):
 
         grader = Grader(self.in_dir)
         result = grader.evaluate(kwargs)
-
-        lines_of_error = len(result.get('error')[0].splitlines())
+        lines_of_error = len(result.get('error')[0]['message'].splitlines())
         self.assertFalse(result.get('success'))
-        self.assert_correct_output("Message", result.get('error'))
+        self.assert_correct_output("Message",
+                                   result.get('error')[0]["message"])
         self.assertTrue(lines_of_error > 1)
 
     def test_infinite_loop(self):
-- 
cgit