Merge pull request #380 from maheshgudi/beautify_assertions

Prettify assertion error output

4 files changed, 118 insertions, 21 deletions

diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index 9596c1c..a1f0df4 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -80,27 +80,50 @@
                 {% block main %}
                 {% endblock %}
             </div>
+            <br/>
             {% if question.type == 'code' or question.type == 'upload' %}
                 {% if error_message %}
                     <div class="row" id="error_panel">
       {% for error in error_message %}
               <div class="panel panel-danger">
-      <div class="panel-heading">Testcase No. {{ forloop.counter }}</div>
+      <div class="panel-heading">Error No. {{ forloop.counter }}</div>
       <div class="panel-body">
       <div class="well well-sm">
-      {% if not error.expected_output %}
+      {% if not error.type %}
       <pre><code> {{error|safe}} </code></pre>
-      {% else %}
-        {% if error.given_input %}
-       <table class="table table-bordered">
-        <col width="30%">
-          <tr class = "active">
-          <td> For given Input value(s):</td>
-          <td>{{error.given_input}}</td>
+      {% elif error.type == 'assertion' %}
+            {% if error.test_case %}
+      <strong> We tried your code with the following test case:</strong><br/></br>
+              <pre><code><strong style="color:#d9534f">{{error.test_case}}</strong></code></pre>
+            {% endif %}
+          <p> <b>The following error took place: </b></p>
+        <table class="table table-bordered" width="100%" id='assertion'>
+          <col width="30%">
+            <tr class = "active">
+            <td><b>Exception Name: </b></td>
+            <td><span style="color: #d9534f">{{error.exception}}</span></td>
+          </tr>
+          <tr>
+            <td><b>Exception Message: </b></td><td>{{error.message}}</td>
           </tr>
-       </table>
+          <tr>
+            {% if error.traceback %}
+            <td><b>Full Traceback: </b></td>
+            <td><pre>{{error.traceback}}</pre></td>
+            {% endif %}
+          </tr>
+        </table>
+      {% elif error.type == 'stdio' %}
+        {% if error.given_input %}
+         <table class="table table-bordered">
+          <col width="30%">
+            <tr class = "active">
+            <td> For given Input value(s):</td>
+            <td>{{error.given_input}}</td>
+            </tr>
+         </table>
        {% endif %}
-        <table class="table table-bordered" width="100%" id="output">
+        <table class="table table-bordered" width="100%" id="stdio">
           <col width="10%">
           <col width="40%">
           <col width="40%">
diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index 37bc788..3339177 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -218,9 +218,8 @@ Status : <b style="color: green;"> Passed </b><br/>
             {% endif %}
             {% with ans.error_list as err %}
             {% for error in err %}
-            {% if not error.expected_output %}
-      <pre><code> {{error|safe}} </code></pre>
-      {% else %}
+
+      {% if error.type == 'stdio' %}
         <div class = "well well-sm">
         {% if error.given_input %}
        <table class="table table-bordered">
@@ -262,6 +261,32 @@ Status : <b style="color: green;"> Passed </b><br/>
            </tr>
           </table>
         </div>
+        {% elif error.type == 'assertion' %}
+            {% if error.test_case %}
+      <strong> We tried you code with the following test case:</strong><br/></br>
+              <pre><code><strong style="color:#d9534f">{{error.test_case}}</strong></code></pre>
+            {% endif %}
+          <p> <b>The following error took place: </b></p>
+          <div class="well well-sm">
+        <table class="table table-bordered" width="100%">
+          <col width="30%">
+            <tr class = "active">
+            <td><b>Exception Name: </b></td>
+            <td><span style="color: #d9534f">{{error.exception}}</span></td>
+          </tr>
+          <tr>
+            <td><b>Exception Message: </b></td><td>{{error.message}}</td>
+          </tr>
+          <tr>
+            {% if error.traceback %}
+            <td><b>Full Traceback: </b></td>
+            <td><pre>{{error.traceback}}</pre></td>
+            {% endif %}
+          </tr>
+        </table>
+      </div> <!-- Closes well -->
+        {% else %}
+            <pre><code> {{error|safe}} </code></pre>
         {% endif %}
         {% endfor %}
         {% endwith %}
diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index 6dfaac3..a0219dd 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -136,12 +136,10 @@ User IP address: {{ paper.user_ip }}
             <div class="panel-heading">Correct answer
         {% else %}
             <div class="panel panel-danger">
-            <div class="panel-heading">Error
+            <div class="panel-heading">Error<br/>
         {% with answer.error_list as err %}
             {% for error in err %}
-            {% if not error.expected_output %}
-      <pre><code> {{error|safe}} </code></pre>
-      {% else %}
+            {% if error.type == 'stdio' %}
         <div class = "well well-sm">
         {% if error.given_input %}
        <table class="table table-bordered">
@@ -183,6 +181,32 @@ User IP address: {{ paper.user_ip }}
            </tr>
           </table>
         </div>
+        {% elif error.type == 'assertion' %}
+            {% if error.test_case %}
+      <strong> We tried you code with the following test case:</strong><br/></br>
+              <pre><code><strong style="color:#d9534f">{{error.test_case}}</strong></code></pre>
+            {% endif %}
+          <p> <b>The following error took place: </b></p>
+          <div class="well well-sm">
+        <table class="table table-bordered" width="100%">
+          <col width="30%">
+            <tr class = "active">
+            <td><b>Exception Name: </b></td>
+            <td><span style="color: #d9534f">{{error.exception}}</span></td>
+          </tr>
+          <tr>
+            <td><b>Exception Message: </b></td><td>{{error.message}}</td>
+          </tr>
+          <tr>
+            {% if error.traceback %}
+            <td><b>Full Traceback: </b></td>
+            <td><pre>{{error.traceback}}</pre></td>
+            {% endif %}
+          </tr>
+        </table>
+      </div> <!-- Closes well -->
+        {% else %}
+          <pre><code> {{error|safe}} </code></pre>
         {% endif %}
         {% endfor %}
         {% endwith %}
diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html
index 79987b1..fa16a08 100644
--- a/yaksh/templates/yaksh/view_answerpaper.html
+++ b/yaksh/templates/yaksh/view_answerpaper.html
@@ -131,9 +131,8 @@
     
         {% with answer.error_list as err %}
             {% for error in err %}
-            {% if not error.expected_output %}
-      <pre><code> {{error|safe}} </code></pre>
-      {% else %}
+            
+      {% if error.type == 'stdio' %}
         <div class = "well well-sm">
         {% if error.given_input %}
        <table class="table table-bordered">
@@ -175,6 +174,32 @@
            </tr>
           </table>
         </div>
+        {% elif error.type == 'assertion' %}
+            {% if error.test_case %}
+      <strong> We tried you code with the following test case:</strong><br/></br>
+              <pre><code><strong style="color:#d9534f">{{error.test_case}}</strong></code></pre>
+            {% endif %}
+          <p> <b>The following error took place: </b></p>
+          <div class="well well-sm">
+        <table class="table table-bordered" width="100%">
+          <col width="30%">
+            <tr class = "active">
+            <td><b>Exception Name: </b></td>
+            <td><span style="color: #d9534f">{{error.exception}}</span></td>
+          </tr>
+          <tr>
+            <td><b>Exception Message: </b></td><td>{{error.message}}</td>
+          </tr>
+          <tr>
+            {% if error.traceback %}
+            <td><b>Full Traceback: </b></td>
+            <td><pre>{{error.traceback}}</pre></td>
+            {% endif %}
+          </tr>
+        </table>
+      </div> <!-- Closes well -->
+        {% else %}
+          <pre><code> {{error|safe}} </code></pre>
         {% endif %}
         {% endfor %}
         {% endwith %}