updata Anagram

Author: AlexandreDubray

Anagram/run

@@ -1,51 +1,22 @@
-#! /bin/python3
-# coding: utf-8
+#!/bin/python3
+import importlib.util
+import sys
 
-from inginious import input
-from inginious import feedback
-from inginious import input
-import subprocess
-from inginious import rst
-import re
 
+# Dynamically load modules we need
+# Credits to https://stackoverflow.com/a/67692/6149867
+# And for the explanation : http://www.blog.pythonlibrary.org/2016/05/27/python-201-an-intro-to-importlib/
+def dynamically_load_module(module, path):
+    spec = importlib.util.spec_from_file_location(module, path)
+    mod = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(mod)
+    return mod
 
-# Will be filled by process.py
-exercise = 'Anagram'
-student_file = f'{exercise}.java'
-test_file = f'{exercise}TestInginious.java'
 
-# Archive for jplag
+#####################################
+# Our import for common run file    #
+#####################################
+sys.path.append("/course/common")
 
-input.parse_template(student_file)
-
-student_name = input.get_input("@username")
-subprocess.call(['archive', '-a', student_file,'-o',student_name+''], universal_newlines=True)
-
-
-compile_error = subprocess.call(f'javac -cp ".:libs/junit-4.12.jar:libs/hamcrest-core-1.3.jar:libs/JavaGrading.jar" RunTests.java {test_file} {student_file} 2>&1', shell=True, stdout=open('compiler.out', 'w'))
-
-if compile_error != 0:
-    codeblock = rst.get_codeblock("java", open('compiler.out').read())
-    feedback.set_global_feedback("Votre code ne compile pas: \n\n" + codeblock, True)
-    feedback.set_global_result("failed")
-    exit(0)
-
-
-try:
-    out = subprocess.check_output('java -cp "libs/junit-4.12.jar:libs/hamcrest-core-1.3.jar:libs/JavaGrading.jar:." RunTests', shell=True).decode('utf8')
-    out = out[out.index('--- GRADE ---'):]
-
-    grade = re.findall(r"^TOTAL ([0-9\.]+)/([0-9\.]+)$", out, re.MULTILINE)[-1]
-    grade = 100.0*float(grade[0])/float(grade[1])
-
-    feedback.set_grade(grade)
-    output = '\n'.join(out.split('\n')[1:-4])
-    feedback.set_global_feedback("Résultat des tests: \n\n" + output, True)
-
-    if grade < 99.99 :
-        feedback.set_global_result("failed")
-    else:
-        feedback.set_global_result("success")
-except Exception as e:
-    feedback.set_global_feedback("Une erreur s'est produite!." + str(e), True)
-    feedback.set_global_result("failed")
+runfile = dynamically_load_module("runfile", "/course/common/runfile.py")
+runfile.main()

Anagram/src/AnagramTestInginious.java

@@ -3,6 +3,7 @@
 import static org.junit.Assert.*;
 
 import com.github.guillaumederval.javagrading.*;
+import templates.*;
 public class AnagramTestInginious {
 
     @Test

Anagram/templates/Anagram.java

@@ -1 +1,3 @@
-@@code@@
+package templates;
+
+@@student_answer@@