Jinja templates and render functions on feedback.

Author: niotie

Diff for: templates/generic/generic.pl

@@ -22,5 +22,5 @@
 
 # définition de la procédure de validation
 grader==
-return (0, "<l'exercice n'a pas défini de procédure de validation>")
+return (0, "L'exercice n'a pas défini de procédure de validation.")
 ==

Diff for: templates/generic/grader.py

@@ -11,6 +11,7 @@
 # TODO: check whether other stuff should be mocked (notably stderr) and possibly
 #  use a new patch-decorated function
 # TODO: implement comparison facilities with trusted code
+# TODO: add comments to individual tests
 
 import sys
 
@@ -55,4 +56,4 @@ def get_student_code(exercise_context: dict):
               "contacter un enseignant.", file=sys.stderr)
         raise e
 
-    sandboxio.output(0, str(r.tests))
+    sandboxio.output(0, r.render_tests())

Diff for: templates/generic/jinja/testgroup.html

@@ -0,0 +1,29 @@
+{% if testgroup.status == stat.PASS %}
+<div style="border:1px solid black;padding:0%;margin:1%;background-color:LightGreen;border-radius:4px;">
+    <button type="button"
+            class="btn btn-block btn-success"
+            data-toggle="collapse"
+            data-target="#{{ testgroup.make_id() }}">
+        {{ testgroup.title }}
+    </button>
+    <div id="{{ testgroup.make_id() }}" class="collapse">
+        <div class="card card-success;" style="background-color: LightGreen;">
+{% else %}
+<div style="border:1px solid black;padding:1%;margin:1%;background-color:Tomato;border-radius:4px;">
+    <button type="button"
+            class="btn btn-block  btn-danger"
+            data-toggle="collapse"
+            data-target="#{{ testgroup.make_id() }}"
+            aria-expanded="true"
+            aria-controls="{{ testgroup.make_id() }}">
+        {{ testgroup.title }}
+    </button>
+    <div id="{{ testgroup.make_id() }}" class="show">
+        <div class="card card-danger;" style="background-color: Tomato;">
+{% endif %}
+{% for test in testgroup.tests %}
+    {{ test.render() }}
+{% endfor %}
+        </div>
+    </div>
+</div>

Diff for: templates/generic/jinja/testitem.html

@@ -0,0 +1,37 @@
+{%  if test.status == stat.FAIL %}
+<div style="border:1px solid black;padding:1px;margin:1px;background-color:Tomato;border-radius:4px;">
+    <button type="button"
+            class="btn btn-block btn-danger"
+            aria-expanded="true"
+            aria-controls="{{ test.make_id() }}"
+            data-toggle="collapse"
+            data-target="#{{ test.make_id() }}">
+        {{ test.__str__() }}
+    </button>
+    <div id="test-{{num}}" class="show">
+        <div class="card card-danger;"
+             style="background-color: Tomato;">
+            <p>
+                {{ test.__str__() }}
+            </p>
+        </div>
+    </div>
+</div>
+{% else %}
+<div style="border:1px white;padding:1px;margin:1px;background-color:LightGreen;border-radius:4px;">
+    <button type="button"
+            class="btn btn-block btn-success"
+            data-toggle="collapse"
+            data-target="#{{ test.make_id() }}">
+        {{ test.__str__() }}
+    </button>
+    <div id="{{ test.make_id() }}" class="collapse">
+        <div class="card card-success;"
+             style="background-color: LightGreen;">
+            <p>
+                {{ test.__str__() }}
+            </p>
+        </div>
+    </div>
+</div>
+{%  endif %}

Diff for: templates/generic/tests/test_idiot.py

@@ -31,4 +31,4 @@ def f(n):
     # 5 - display test results
     # TODO: needs work
     for test in runner.tests:
-        print(test)
+        print(test.render())

Diff for: templates/generic/tests/tri_de_trois.py

@@ -56,4 +56,4 @@
 g.end_test_group()
 
 for test in g.tests:
-    print(test)
+    print(test.render())

Diff for: templates/generic/utils/coderunner.py

@@ -102,9 +102,14 @@ def end_test_group(self) -> NoReturn:
     def record_test(self, test: fb.TestFeedback) -> NoReturn:
         if self.current_test_group:
             self.current_test_group.append(test)
+            if test.status == fb.FAIL:
+                self.current_test_group.status = fb.FAIL
         else:
             self.tests.append(test)
 
+    def render_tests(self):
+        return "\n".join(test.render() for test in self.tests)
+
     """Code execution."""
 
     def summarize_changes(self):
@@ -209,3 +214,11 @@ def assert_no_global_change(self):
         added, deleted, modified, _ = self.summarize_changes()
         status = fb.FAIL if added or deleted or modified else fb.PASS
         self.record_test(fb.NoGlobalChangeTestFeedback(status))
+
+    def assert_no_exception(self):
+        status = self.exception is None
+        self.record_test(fb.NoExceptionTestFeedback(status))
+
+    def assert_exception(self, exception_type):
+        status = isinstance(self.exception, exception_type)
+        self.record_test(fb.ExceptionTestFeedback(status, exception_type))

Diff for: templates/generic/utils/testfeedback.py

@@ -1,4 +1,17 @@
-FAIL, PASS, INFO, EXEC, EVAL = range(5)
+import jinja2
+import string
+import unicodedata
+
+FAIL, PASS, INFO, EXEC, EVAL, GROUP = range(6)
+
+# TODO: change this, ugly
+stat_dict = {
+    "FAIL": FAIL,
+    "PASS": PASS,
+    "INFO": INFO,
+    "EXEC": EXEC,
+    "EVAL": EVAL
+}
 
 _prefix = {
     FAIL: "[erreur] ",
@@ -15,6 +28,8 @@
 
 
 class TestFeedback:
+    num = 0
+
     def __init__(self, status, params):
         self.status = status
         self.params = _default_params.copy()
@@ -23,6 +38,16 @@ def __init__(self, status, params):
     def __str__(self):
         return _prefix[self.status]
 
+    def render(self):
+        with open('templates/generic/jinja/testitem.html', "r") as tempfile:
+            templatestring = tempfile.read()
+        template = jinja2.Template(templatestring)
+        return template.render(test=self, stat=stat_dict)
+
+    def make_id(self):
+        TestFeedback.num += 1
+        return TestFeedback.num
+
 
 class OutputTestFeedback(TestFeedback):
     def __init__(self, status, expected, **params):
@@ -238,6 +263,7 @@ def __str__(self):
 class TestGroup:
     def __init__(self, title: str):
         self.title = title
+        self.status = GROUP
         self.tests = []
 
     def __str__(self):
@@ -246,3 +272,14 @@ def __str__(self):
 
     def append(self, test: TestFeedback):
         self.tests.append(test)
+
+    def make_id(self):
+        return 'group-' + ''.join(
+            x for x in unicodedata.normalize('NFKD', self.title) if x.isalnum()
+        ).lower()
+
+    def render(self):
+        with open('templates/generic/jinja/testgroup.html',"r") as tempfile:
+            templatestring = tempfile.read()
+        template = jinja2.Template(templatestring)
+        return template.render(testgroup=self, stat=stat_dict)

Diff for: unused/ap1_feedback.html renamed to unused/ap1_feedback_old.html

@@ -1,5 +1,5 @@
 from typing import Callable, TypeVar
-from unused.ap1_feedback import Feedback
+from unused.ap1_feedback_old import Feedback
 
 T = TypeVar('T')