mismatches) {
builder.append("");
- for (int i = 0; i < lines.size(); i++) {
- String line = lines.get(i);
- if (matches.contains(i))
- passSpan(line);
- else if (mismatches.contains(i))
- failSpan(line);
- else
- escape(line);
- builder.append("\n");
+ if (hidden) {
+ builder.append("[Hidden]");
+ } else {
+ for (int i = 0; i < lines.size(); i++) {
+ String line = lines.get(i);
+ if (matches.contains(i))
+ passSpan(line);
+ else if (mismatches.contains(i))
+ failSpan(line);
+ else
+ escape(line);
+ builder.append("\n");
+ }
}
builder.append("\n");
return this;
@@ -166,33 +189,22 @@ public HTMLReport systemError(Throwable t) {
* @see com.horstmann.codecheck.Report#image(java.lang.String, byte[])
*/
@Override
- public HTMLReport image(String captionText, BufferedImage img) throws IOException {
+ public HTMLReport image(String captionText, String filename, BufferedImage img) {
if (img == null)
return this;
caption(captionText);
- image(img);
- return this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.horstmann.codecheck.Report#image(byte[])
- */
- @Override
- public HTMLReport image(BufferedImage img) throws IOException {
- if (img == null)
- return this;
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- ImageIO.write(img, "PNG", out);
- out.close();
- byte[] pngBytes = out.toByteArray();
- String data = Base64.getEncoder().encodeToString(pngBytes);
- builder.append("");
- builder.append("![\"screen](\"data:image/png;base64,");)
");
- builder.append("
\n");
+ try {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ ImageIO.write(img, "PNG", out);
+ out.close();
+ builder.append("");
+ builder.append("![\"screen](\"");)
");
+ builder.append("
\n");
+ } catch (IOException ex) {
+ builder.append("Cannot display image
");
+ }
return this;
}
@@ -203,6 +215,25 @@ public HTMLReport file(String file, String contents) {
return this;
}
+ public HTMLReport file(String fileName, byte[] contents, boolean hidden) {
+ caption(fileName);
+ if (hidden) {
+ output("[Hidden]");
+ } else if (isImage(fileName)) {
+ builder.append("
\n");
+ } else {
+ try {
+ output(StandardCharsets.UTF_8.newDecoder().decode(ByteBuffer.wrap(contents)).toString());
+ } catch (CharacterCodingException e) {
+ output("[Binary]");
+ }
+ }
+ return this;
+ }
+
+
private HTMLReport escape(CharSequence s) {
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
@@ -280,19 +311,7 @@ protected void addFootnotes() {
builder.append("\n");
}
}
-
- /*
- * (non-Javadoc)
- *
- * @see com.horstmann.codecheck.Report#save(java.nio.file.Path)
- */
- @Override
- public HTMLReport save(Path dir, String out) throws IOException {
- Path outPath = dir.resolve(out + ".html");
- Files.write(outPath, builder.toString().getBytes());
- return this;
- }
-
+
@Override
public void close() {
addFootnotes();
@@ -301,6 +320,9 @@ public void close() {
@Override
public String getText() { return builder.toString(); }
+
+ @Override
+ public String extension() { return "html"; }
private HTMLReport tableStart(String klass) {
builder.append(" matchData) {
@Override
public HTMLReport runTable(String[] methodNames, String[] argNames, String[][] args,
- String[] actual, String[] expected, boolean[] outcomes) {
+ String[] actual, String[] expected, boolean[] outcomes, boolean[] hidden, String mainclass) {
tableStart("run").rowStart();
headerCell("");
if (methodNames != null)
@@ -441,12 +463,20 @@ public HTMLReport runTable(String[] methodNames, String[] argNames, String[][] a
for (int i = 0; i < args.length; i++) {
rowStart();
cellStart().pass(outcomes[i]).cellEnd();
- if (methodNames != null)
- codeCell(methodNames[i]);
- for (String a : args[i])
- codeCell(a.trim());
- codeCell(actual[i]);
- codeCell(expected[i]);
+ if (hidden != null && hidden[i]) {
+ codeCell("[Hidden]");
+ for (String a : args[i])
+ codeCell("[Hidden]");
+ codeCell("[Hidden]");
+ codeCell("[Hidden]");
+ } else {
+ if (methodNames != null)
+ codeCell(methodNames[i]);
+ for (String a : args[i])
+ codeCell(a.trim());
+ codeCell(actual[i]);
+ codeCell(expected[i]);
+ }
rowEnd();
}
tableEnd();
diff --git a/app/com/horstmann/codecheck/HaskellLanguage.java b/app/com/horstmann/codecheck/HaskellLanguage.java
index 9b126c5b..83241d0e 100644
--- a/app/com/horstmann/codecheck/HaskellLanguage.java
+++ b/app/com/horstmann/codecheck/HaskellLanguage.java
@@ -36,27 +36,11 @@ public String functionName(String declaration) {
@Override public Map writeTester(Path file, String contents, List calls, ResourceLoader resourceLoader) {
Map result = new HashMap<>();
-
- // Rewrite solution in module CodeCheckSolution
String moduleName = moduleOf(file);
- Path solutionModuleFile = Paths.get("CodeCheckSolution.hs");
- StringBuilder out = new StringBuilder();
- List in = Util.lines(contents);
- out.append("module CodeCheckSolution where\n");
- for (int i = 0; i < in.size(); i++) {
- String line = in.get(i);
- if (!line.trim().startsWith("module ")) {
- out.append(line);
- out.append("\n");
- }
- }
- result.put(solutionModuleFile, out.toString());
-
// Generate testCodeCheck.hs
Path testFile = Paths.get("testCodeCheck.hs");
- out = new StringBuilder();
+ StringBuilder out = new StringBuilder();
out.append("import " + moduleName + "\n");
- out.append("import CodeCheckSolution\n");
out.append("import Control.Exception\n");
out.append("import System.Environment\n");
out.append("main :: IO ()\n");
@@ -64,50 +48,28 @@ public String functionName(String declaration) {
out.append(" args <- getArgs\n");
for (int k = 0; k < calls.size(); k++) {
Calls.Call call = calls.get(k);
- if (k == 0) out.append(" if (head args) == \"1\" then ");
+ if (k == 0 && calls.size() > 1) out.append(" if (head args) == \"1\" then ");
else if (k < calls.size() - 1) out.append(" else if (head args) == \"" + (k + 1) + "\" then ");
- else out.append(" else ");
- out.append(moduleName + "." + call.name + " " + call.args + " `comp` CodeCheckSolution."
- + call.name + " " + call.args + "\n");
+ else if (calls.size() > 1) out.append(" else ");
+ else out.append(" ");
+ out.append("pr $ " + call.name + " " + call.args + "\n");
}
out.append(" where\n");
out.append(" exec expr = (do x <- evaluate expr ; return $ Just x)\n");
out.append(" `catch` (\\(SomeException x) -> return Nothing)\n");
- out.append(" comp expr1 expr2 = do\n");
- out.append(" actual <- exec expr1\n");
- out.append(" expected <- exec expr2\n");
- out.append(" case (actual, expected) of\n");
- out.append(" (Nothing, Nothing) -> putStrLn \"error\\nerror\\ntrue\"\n");
- out.append(" (Just a, Just b) -> putStrLn$ (show a) ++ \"\\n\" ++ (show b) ++ (if a==b then \"\\ntrue\" else \"\\nfalse\")\n");
- out.append(" (Just a, Nothing) -> putStrLn $ (show a) ++ \"\\nerror\\nfalse\"\n");
- out.append(" (Nothing, Just b) -> putStrLn $ \"error\\n\" ++ (show b) ++ \"\\nfalse\"\n");
+ out.append(" pr expr = do\n");
+ out.append(" res <- exec expr\n");
+ out.append(" case res of\n");
+ out.append(" Nothing -> putStrLn \"error\"\n");
+ out.append(" Just a -> putStrLn $ show a\n");
result.put(testFile, out.toString());
return result;
}
- /*
-
-
-
- Student.maxNum [] `comp` CodeCheckSolution.maxNum [] -- function name and args
- Student.maxNum [1] `comp` CodeCheckSolution.maxNum [1]
- Student.maxNum [1,2,3] `comp` CodeCheckSolution.maxNum [1,2,3]
-*/
-
-
- private static String variablePatternString = "\\s*let\\s+(?\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*)\\s*=\\s*(?.+)";
- private static Pattern variablePattern = Pattern.compile(variablePatternString);
-
- /*
- * (non-Javadoc)
- *
- * @see com.horstmann.codecheck.Language#variablePattern()
- */
- @Override
- public Pattern variableDeclPattern() {
- return variablePattern;
- }
+ private static Pattern VARIABLE_DECL_PATTERN = Pattern.compile(
+ "\\s*let\\s+(?\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*)\\s*=\\s*(?.+)");
+ @Override public Pattern variableDeclPattern() { return VARIABLE_DECL_PATTERN; }
private static Pattern ERROR_PATTERN = Pattern.compile("(?[^/]+\\.rkt):(?[0-9]+):(?[0-9]+): (?.+)");
@Override public Pattern errorPattern() { return ERROR_PATTERN; }
diff --git a/app/com/horstmann/codecheck/Input.java b/app/com/horstmann/codecheck/Input.java
new file mode 100644
index 00000000..fa88aad8
--- /dev/null
+++ b/app/com/horstmann/codecheck/Input.java
@@ -0,0 +1,27 @@
+package com.horstmann.codecheck;
+
+
+public class Input{
+ private String key;
+ private String value;
+ private boolean hidden;
+
+
+ public Input(String key, String value, boolean hidden) {
+ this.key = key;
+ this.value = value;
+ this.hidden = hidden;
+ }
+
+ public boolean getHidden(){
+ return hidden;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public String getValue() {
+ return value;
+ }
+}
\ No newline at end of file
diff --git a/app/com/horstmann/codecheck/JSONReport.java b/app/com/horstmann/codecheck/JSONReport.java
index 27b68da1..56d927bd 100644
--- a/app/com/horstmann/codecheck/JSONReport.java
+++ b/app/com/horstmann/codecheck/JSONReport.java
@@ -3,9 +3,10 @@
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.nio.file.Path;
+import java.io.UncheckedIOException;
import java.util.ArrayList;
import java.util.Base64;
+import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -13,36 +14,58 @@
import javax.imageio.ImageIO;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
public class JSONReport implements Report {
public static class Item {
public Item() {}
public Item(String name, String contents) {
+ this(name, contents, false);
+ }
+ public Item(String name, String contents, boolean hidden) {
this.name = name;
- this.value = contents;
+ this.value = contents;
+ this.hidden = hidden;
}
public String name;
public String value;
+ public boolean hidden;
}
-
+
+ public static class ImageItem {
+ public ImageItem() {}
+ public ImageItem(String caption, String filename, BufferedImage image) {
+ this.caption = caption;
+ name = filename;
+ try {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ ImageIO.write(image, "PNG", out);
+ out.close();
+ data = Base64.getEncoder().encodeToString(out.toByteArray());
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ }
+ public String caption;
+ public String name;
+ public String data;
+ }
+
public static class Run {
public String caption;
+ public String mainclass;
public List- args;
public String input;
public String output;
+ public boolean hidden;
public List matchedOutput;
- public List
- files = new ArrayList<>();
- public List
- images = new ArrayList<>();
+ public Map files = new HashMap<>();
+ public List images = new ArrayList<>();
public String errors;
public List errorData = new ArrayList<>();
public String html;
public Boolean passed;
}
- public static class Section {
+ public static class Section {
public String type;
public String errors;
public List errorData = new ArrayList<>();
@@ -51,23 +74,15 @@ public static class Section {
public static class ReportData {
public String errors;
- //public List
- studentFiles = new ArrayList<>();
- //public List
- providedFiles = new ArrayList<>();
public List sections = new ArrayList<>();
public Map metaData = new LinkedHashMap<>();
public String score; // TODO: Score each item
}
- private ReportData data = new ReportData();
+ protected ReportData data = new ReportData();
private Section section;
private Run run;
- /* TODO:
- * testMethod:
- * call:
- * sub:
- */
-
public JSONReport(String title) {
}
@@ -82,8 +97,10 @@ public JSONReport header(String sectionType, String text) {
}
@Override
- public JSONReport run(String caption) {
+ public JSONReport run(String caption, String mainclass, boolean hidden) {
run = new Run();
+ run.mainclass = mainclass;
+ run.hidden = hidden;
run.passed = true;
if (section.runs == null) section.runs = new ArrayList<>();
section.runs.add(run);
@@ -101,7 +118,10 @@ public JSONReport output(CharSequence text) {
if (run.html != null) builder.append(run.html);
builder.append("
Output:
");
builder.append("");
- builder.append(HTMLReport.htmlEscape(text));
+ if (run.hidden)
+ builder.append("[Hidden]");
+ else
+ builder.append(HTMLReport.htmlEscape(text));
builder.append("");
run.html = builder.toString();
@@ -143,8 +163,7 @@ public JSONReport systemError(Throwable t) {
@Override
public JSONReport args(String args) {
- // TODO: Would like to skip if no args
- // if (args == null || args.trim().length() == 0) return this;
+ if (args == null || args.trim().length() == 0) return this;
run.args = new ArrayList<>();
run.args.add(new Item("Command line arguments", args));
return this;
@@ -156,37 +175,28 @@ public JSONReport input(String input) {
StringBuilder builder = new StringBuilder();
if (run.html != null) builder.append(run.html);
if (run.input != null) {
- builder.append("Input:
");
- builder.append(HTMLReport.htmlEscape(run.input));
- builder.append("");
+ if (run.hidden) {
+ builder.append("[Hidden]
");
+ } else {
+ builder.append("Input:
");
+ builder.append(HTMLReport.htmlEscape(run.input));
+ builder.append("");
+ }
}
run.html = builder.toString();
return this;
}
@Override
- public JSONReport image(String caption, BufferedImage image) throws IOException {
- if (image == null) return this;
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- ImageIO.write(image, "PNG", out);
- out.close();
- byte[] pngBytes = out.toByteArray();
- String data = Base64.getEncoder().encodeToString(pngBytes);
- run.images.add(new Item(caption, data));
+ public JSONReport image(String caption, String filename, BufferedImage image) {
+ if (image != null) run.images.add(new ImageItem(caption, filename, image));
return this;
}
- @Override
- public JSONReport image(BufferedImage image) throws IOException {
- image("", image);
- return this;
- }
-
@Override
public JSONReport file(String file, String contents) {
- Item item = new Item(file, contents);
- if (!"studentFiles".equals(section.type) && !"providedFiles".equals(section.type)) {
- run.files.add(item);
+ if (!"studentFiles".equals(section.type)) {
+ run.files.put(file, contents);
StringBuilder builder = new StringBuilder();
if (run.html != null) builder.append(run.html);
@@ -199,6 +209,11 @@ public JSONReport file(String file, String contents) {
}
return this;
}
+
+ public JSONReport file(String fileName, byte[] contents, boolean hidden) {
+ // Not reporting provided files
+ return this;
+ }
@Override
public JSONReport add(Score score) {
@@ -207,24 +222,11 @@ public JSONReport add(Score score) {
}
@Override
- public JSONReport save(Path dir, String out) throws IOException {
- Path outPath = dir.resolve(out + ".json");
- ObjectMapper mapper = new ObjectMapper();
- mapper.setSerializationInclusion(Include.NON_DEFAULT);
- mapper.writeValue(outPath.toFile(), data);
- // JSON.std.write(data, outPath.toFile());
- return this;
- }
-
+ public String extension() { return "json"; }
+
@Override
public String getText() {
- ObjectMapper mapper = new ObjectMapper();
- mapper.setSerializationInclusion(Include.NON_DEFAULT);
- try {
- return mapper.writeValueAsString(data);
- } catch (JsonProcessingException e) {
- return null;
- }
+ return Util.toJsonString(data);
}
@Override
@@ -282,21 +284,25 @@ public JSONReport output(List lines, Set matches,
StringBuilder builder = new StringBuilder();
if (run.html != null) builder.append(run.html);
builder.append("");
- for (int i = 0; i < lines.size(); i++) {
- StringBuilder line = HTMLReport.htmlEscape(lines.get(i));
- if (matches.contains(i)) {
- builder.append("");
- builder.append(line);
- builder.append("");
- }
- else if (mismatches.contains(i)) {
- builder.append("");
- builder.append(line);
- builder.append("");
- }
- else
- builder.append(line);
- builder.append("\n");
+ if (run.hidden) {
+ for (int i = 0; i < lines.size(); i++) {
+ StringBuilder line = HTMLReport.htmlEscape(lines.get(i));
+ if (matches.contains(i)) {
+ builder.append("");
+ builder.append(line);
+ builder.append("");
+ }
+ else if (mismatches.contains(i)) {
+ builder.append("");
+ builder.append(line);
+ builder.append("");
+ }
+ else
+ builder.append(line);
+ builder.append("\n");
+ }
+ } else {
+ builder.append("[Hidden]");
}
builder.append("\n");
run.html = builder.toString();
@@ -306,11 +312,13 @@ else if (mismatches.contains(i)) {
@Override
public JSONReport runTable(String[] methodNames, String[] argNames, String[][] args, String[] actual,
- String[] expected, boolean[] outcomes) {
+ String[] expected, boolean[] outcomes, boolean[] hidden, String mainclass) {
if (section.runs == null) section.runs = new ArrayList<>();
for (int i = 0; i < actual.length; i++)
{
Run run = new Run();
+ run.mainclass = mainclass;
+ run.hidden = hidden != null && hidden[i];
run.passed = true;
if (methodNames != null) run.caption = methodNames[i];
section.runs.add(run);
@@ -372,8 +380,7 @@ public JSONReport footnote(String text) {
}
@Override
- public JSONReport errors(List errorData)
- {
+ public JSONReport errors(List errorData) {
if (section != null)
section.errorData.addAll(errorData);
return this;
diff --git a/app/com/horstmann/codecheck/JavaLanguage.java b/app/com/horstmann/codecheck/JavaLanguage.java
index fda40a3a..8566d712 100644
--- a/app/com/horstmann/codecheck/JavaLanguage.java
+++ b/app/com/horstmann/codecheck/JavaLanguage.java
@@ -7,13 +7,14 @@
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
+import java.util.ArrayList;
public class JavaLanguage implements Language {
public String getExtension() { return "java"; };
@Override
public boolean isUnitTest(Path fileName) {
- return fileName.toString().matches(".*Test[0-9]*.java");
+ return fileName.toString().matches(".*(T|_t)est[0-9]*.java");
}
private static Pattern mainPattern = Pattern
@@ -39,83 +40,50 @@ public Path pathOf(String moduleName) {
@Override
public Map writeTester(Path file, String contents, List calls, ResourceLoader resourceLoader) {
String className = moduleOf(file);
- List lines = Util.lines(contents);
- int i = 0;
- // TODO: Could be enum or record
- while (i < lines.size() && !lines.get(i).contains("class " + className))
- i++;
- if (i == lines.size())
- throw new CodeCheckException("Can't find class " + className
- + " for inserting CALL in " + file);
- lines.set(i, lines.get(i).replace("class " + className,
- "class " + className + "CodeCheck { static class Solution { static class " + className));
- i = lines.size() - 1;
- while (i >= 0 && !lines.get(i).trim().equals("}"))
- i--;
- if (i == -1)
- throw new CodeCheckException("Can't find } for inserting CALL in "
- + file);
- lines.add(i++, " }");
- lines.add(i++, " }");
- lines.add(i++, " public static void main(String[] args) throws Exception");
- lines.add(i++, " {");
- for (int k = 0; k < calls.size(); k++) {
- Calls.Call call = calls.get(k);
- boolean isStatic = call.modifiers.contains("static");
- lines.add(i++, " if (args[0].equals(\"" + (k + 1) + "\"))");
- lines.add(i++, " {");
- if (!isStatic) {
- lines.add(i++, " " + className + " obj1 = new " + className
+ List lines = new ArrayList<>();
+ contents
+ .lines()
+ .filter(l -> l.trim().startsWith("import "))
+ .forEach(l -> lines.add(l));
+ lines.add("public class " + className + "CodeCheck {");
+ lines.add(" public static void main(String[] args) throws Exception");
+ lines.add(" {");
+ for (int k = 0; k < calls.size(); k++) {
+ Calls.Call call = calls.get(k);
+ boolean isStatic = call.modifiers.contains("static");
+ lines.add(" if (args[0].equals(\"" + (k + 1) + "\"))");
+ lines.add(" {");
+ if (!isStatic) {
+ lines.add(" " + className + " obj1 = new " + className
+ "();");
- lines.add(i++, " Solution." + className + " obj2 = new Solution." + className + "();");
- }
- lines.add(i++, " Object expected = "
- + (isStatic ? "Solution." + className : "obj2") + "." + call.name + "(" + call.args
- + ");");
- lines.add(i++,
- " System.out.println(_toString(expected));");
- lines.add(i++, " Object actual = "
+ }
+ lines.add(" Object result = "
+ (isStatic ? className : "obj1") + "." + call.name + "("
+ call.args + ");");
- lines.add(i++, " System.out.println(_toString(actual));");
- lines.add(
- i++,
- " System.out.println(java.util.Objects.deepEquals(actual, expected));");
- lines.add(i++, " }");
+ lines.add(" System.out.println(_toString(result));");
+ lines.add(" }");
}
- lines.add(i++, " }");
- lines.add(i++, " private static String _toString(Object obj)");
- lines.add(i++, " {");
- lines.add(i++, " if (obj == null) return \"null\";");
- lines.add(i++, " if (obj instanceof String) return \"\\\"\" + ((String) obj).replace(\"\\\\\", \"\\\\\\\\\").replace(\"\\\"\", \"\\\\\\\"\").replace(\"\\n\", \"\\\\n\") + \"\\\"\";");
- lines.add(i++, " if (obj instanceof Object[])");
- lines.add(i++,
- " return java.util.Arrays.deepToString((Object[]) obj);");
- lines.add(i++, " if (obj.getClass().isArray())");
- lines.add(
- i++,
- " try { return (String) java.util.Arrays.class.getMethod(\"toString\", obj.getClass()).invoke(null, obj); }");
- lines.add(i++, " catch (Exception ex) {}");
- lines.add(i++, " return obj.toString();");
- lines.add(i++, " }");
-
- // expected == null ? null : expected instanceof Object[] ?
- // java.util.Arrays.deepToString((Object[]) expected) :
- // expected.getClass().isArray() ? java.util.Arrays.toString(expected) :
- // expected
+ lines.add(" }");
+ lines.add(" private static String _toString(Object obj)");
+ lines.add(" {");
+ lines.add(" if (obj == null) return \"null\";");
+ lines.add(" if (obj instanceof Object[])");
+ lines.add(" return java.util.Arrays.deepToString((Object[]) obj);");
+ lines.add(" if (obj.getClass().isArray())");
+ lines.add(" try { return (String) java.util.Arrays.class.getMethod(\"toString\", obj.getClass()).invoke(null, obj); }");
+ lines.add(" catch (Exception ex) {}");
+ lines.add(" return obj.toString();");
+ lines.add(" }");
+ lines.add("}");
Path p = pathOf(className + "CodeCheck");
Map testFiles = new HashMap<>();
testFiles.put(p, Util.join(lines, "\n"));
return testFiles;
}
- private static String patternString = "\\s*((public|static|final|private|protected)\\s+)*[A-Za-z0-9_<>\\[\\]]+\\s+(?\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*)\\s*=\\s*(?[^;]+);.*";
- private static Pattern pattern = Pattern.compile(patternString);
-
- @Override
- public Pattern variableDeclPattern() {
- return pattern;
- }
+ private static Pattern VARIABLE_DECL_PATTERN = Pattern.compile(
+ "((public|static|final|private|protected)\\s+)*[A-Za-z0-9_<>\\[\\]]+\\s+(?\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*)\\s*=\\s*(?[^;]+);");
+ @Override public Pattern variableDeclPattern() { return VARIABLE_DECL_PATTERN; }
@Override
public String process(Path file, Map submissionFiles) {
diff --git a/app/com/horstmann/codecheck/JavaScriptLanguage.java b/app/com/horstmann/codecheck/JavaScriptLanguage.java
index 89a4547a..36ea55fd 100644
--- a/app/com/horstmann/codecheck/JavaScriptLanguage.java
+++ b/app/com/horstmann/codecheck/JavaScriptLanguage.java
@@ -2,7 +2,6 @@
import java.io.IOException;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashMap;
@@ -46,41 +45,20 @@ public Map writeTester(Path file, String contents, List call
Set functionNames = new TreeSet<>();
for (Calls.Call call : calls) functionNames.add(call.name);
List lines = new ArrayList<>();
- lines.add("const codecheck = require('./codecheck.js')"); // TODO: Update to ECMAScript module
- lines.add("const studentFunctions = function(){");
lines.addAll(Util.lines(contents));
- lines.add("return {");
- for (String functionName : functionNames)
- lines.add(functionName + ", ");
- lines.add("}}()");
- lines.add("const solutionFunctions = function(){");
- lines.addAll(Util.lines(contents));
- lines.add("return {");
- for (String functionName : functionNames)
- lines.add(functionName + ", ");
- lines.add("}}()");
-
for (int k = 0; k < calls.size(); k++) {
Calls.Call call = calls.get(k);
lines.add("if (process.argv[process.argv.length - 1] === '" + (k + 1) + "') {");
- lines.add("const actual = studentFunctions." + call.name + "(" + call.args + ")");
- lines.add("const expected = solutionFunctions." + call.name + "(" + call.args + ")");
- lines.add("console.log(JSON.stringify(expected))");
- lines.add("console.log(JSON.stringify(actual))");
- lines.add("console.log(codecheck.deepEquals(actual, expected))");
+ lines.add("const result = " + call.name + "(" + call.args + ")");
+ lines.add("console.log(JSON.stringify(result))");
lines.add("}");
}
Map paths = new LinkedHashMap<>();
paths.put(pathOf(moduleName + "CodeCheck"), Util.join(lines, "\n"));
- paths.put(Paths.get("codecheck.js"), resourceLoader.loadResourceAsString("codecheck.js")); // TODO mjs when we support ECMAScript modules
return paths;
}
- private static String patternString = "(var|const|let)\\s+(?[A-Za-z][A-Za-z0-9]*)\\s*=(?[^;]+);?";
- private static Pattern pattern = Pattern.compile(patternString);
-
- @Override
- public Pattern variableDeclPattern() {
- return pattern;
- }
+ private static Pattern VARIABLE_DECL_PATTERN = Pattern.compile(
+ "(var|const|let)\\s+(?[A-Za-z][A-Za-z0-9_]*)\\s*=(?[^;]+);?");
+ @Override public Pattern variableDeclPattern() { return VARIABLE_DECL_PATTERN; }
}
diff --git a/app/com/horstmann/codecheck/KotlinLanguage.java b/app/com/horstmann/codecheck/KotlinLanguage.java
new file mode 100644
index 00000000..63dc37b3
--- /dev/null
+++ b/app/com/horstmann/codecheck/KotlinLanguage.java
@@ -0,0 +1,63 @@
+package com.horstmann.codecheck;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class KotlinLanguage implements Language {
+
+ @Override
+ public String getExtension() {
+ return "kt";
+ }
+
+ private static Pattern mainPattern1 = Pattern
+ .compile("fun\\s+main\\s*\\((\\s*\\S+\\s*:\\s*Array<\\s*String\\s*>\\s*)?\\)");
+
+ @Override
+ public boolean isMain(Path p, String contents) {
+ return mainPattern1.matcher(contents).find();
+ }
+
+ @Override
+ public Map writeTester(Path file, String contents, List calls, ResourceLoader resourceLoader) {
+ // Requirement: File name must equal to object containing called method
+ String objectName = moduleOf(file);
+ List lines = new ArrayList<>();
+ lines.add("fun main(args: Array) {");
+ for (int k = 0; k < calls.size(); k++) {
+ Calls.Call call = calls.get(k);
+ String submissionFun = call.name;
+ lines.add("if (args[0] == \"" + (k + 1) + "\") {");
+ lines.add(" val result = " + submissionFun + "(" + call.args + ")");
+ lines.add(" println(result)");
+ lines.add("}");
+ }
+ lines.add("}");
+ Path p = Paths.get(objectName + "CodeCheck.kt");
+ Map testModules = new HashMap<>();
+ testModules.put(p, Util.join(lines, "\n"));
+ return testModules;
+ }
+
+ private static Pattern functionPattern = Pattern.compile(
+ "^\\s*fun\\s+(?\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*)\\s*(.*).*$");
+
+ @Override public String functionName(String declaration) {
+ Matcher matcher = functionPattern.matcher(declaration);
+ if (matcher.matches()) return matcher.group("name");
+ else return null;
+ }
+
+ private static Pattern VARIABLE_DECL_PATTERN = Pattern.compile(
+ "(val|var)\\s+(?\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*)(\\s*:[^=]+\\s*)?\\s*=\\s*(?[^;]+)");
+ @Override public Pattern variableDeclPattern() { return VARIABLE_DECL_PATTERN; }
+
+ private static Pattern ERROR_PATTERN = Pattern.compile("(.+/)?(?[^/]+\\.kt):(?[0-9]+):(?[0-9]+): error: (?.+)");
+ @Override public Pattern errorPattern() { return ERROR_PATTERN; }
+}
diff --git a/app/com/horstmann/codecheck/Language.java b/app/com/horstmann/codecheck/Language.java
index 420bccba..ea4323c2 100644
--- a/app/com/horstmann/codecheck/Language.java
+++ b/app/com/horstmann/codecheck/Language.java
@@ -25,7 +25,11 @@ public interface Language {
new CSharpLanguage(),
new HaskellLanguage(),
new SMLLanguage(),
- new DartLanguage()
+ new DartLanguage(),
+ new RustLanguage(),
+ new BashLanguage(),
+ new KotlinLanguage(),
+ new PHPLanguage()
};
static Language languageFor(Set files) {
@@ -116,7 +120,7 @@ default boolean isTester(Path fileName) {
if (fileName == null) return false;
String moduleName = moduleOf(fileName);
if (moduleName == null) return false;
- return moduleName.matches(".*Tester[0-9]*");
+ return moduleName.matches(".*(T|_t)ester[0-9]*");
}
/**
@@ -143,7 +147,7 @@ default boolean isMain(Path fileName, String contents) {
if (!fileName.toString().endsWith("." + extension)) return false;
Pattern p = mainPattern();
if (p == null)
- return moduleOf(fileName).matches(".*(Runn|Test)er[0-9]*");
+ return moduleOf(fileName).matches(".*(Runn|_runn|Test|_test)er[0-9]*");
else
return p.matcher(contents).find();
}
@@ -180,16 +184,16 @@ default Map writeTester(Path file, String contents, List submissionFiles, Substitution sub) throws Exception {
@@ -109,65 +113,63 @@ private void doSubstitutions(Map submissionFiles, Substitution sub
actual[i] = Util.truncate(actual[i], expected[i].length() + MUCH_LONGER);
score.pass(outcomes[i], null); // Pass/fail shown in run table
}
- report.runTable(null, argNames, args, actual, expected, outcomes);
+ report.runTable(null, argNames, args, actual, expected, outcomes, null, mainFile.toString());
});
}
+
+ private void doCalls(Map submissionFiles, Calls calls, ResourceLoader resourceLoader) throws Exception {
+ Path file = calls.getFile();
+
+ String submissionContents = submissionFiles.get(file);
+ if (submissionContents.isEmpty()) submissionContents = Util.getString(problem.getUseFiles(), file);
+ Map submissionTesterFiles = problem.getLanguage().writeTester(file, submissionContents, calls.getCalls(), resourceLoader);
+ Path submissionBase = Paths.get("submissioncallfiles");
+ for (Map.Entry entry : submissionTesterFiles.entrySet())
+ plan.addFile(submissionBase.resolve(entry.getKey()), entry.getValue());
+ List submissionSources = new ArrayList(submissionTesterFiles.keySet());
- private void doCalls(Calls calls, ResourceLoader resourceLoader) throws Exception {
- Map testerFiles = calls.writeTester(problem, resourceLoader);
- Path base = Paths.get("callfiles");
- for (Map.Entry entry : testerFiles.entrySet())
- plan.addFile(base.resolve(entry.getKey()), entry.getValue());
+ String solutionContents = Util.getString(problem.getSolutionFiles(), file);
+ if (solutionContents.isEmpty()) solutionContents = Util.getString(problem.getUseFiles(), file);
+ Map solutionTesterFiles = problem.getLanguage().writeTester(file, solutionContents, calls.getCalls(), resourceLoader);
+ Path solutionBase = Paths.get("solutioncallfiles");
+ for (Map.Entry entry : solutionTesterFiles.entrySet())
+ plan.addFile(solutionBase.resolve(entry.getKey()), entry.getValue());
+ List solutionSources = new ArrayList(solutionTesterFiles.keySet());
+
+ // TODO: This is the only place with a list of sources.
+ // If the multiple sources in the C++ tester are removed, do we still need them?
+ plan.compile("submissioncall", "submission submissioncallfiles", submissionSources, dependentSourcePaths);
+ plan.compile("solutioncall", "solution solutioncallfiles", solutionSources, dependentSourcePaths);
- String[] names = new String[calls.getSize()];
- String[][] args = new String[calls.getSize()][1];
- String[] actual = new String[calls.getSize()];
- String[] expected = new String[calls.getSize()];
- boolean[] outcomes = new boolean[calls.getSize()];
-
int timeout = timeoutMillis / calls.getSize();
int maxOutput = maxOutputLen / calls.getSize();
- List sources = new ArrayList(testerFiles.keySet());
- plan.compile("call", "submission callfiles", sources, dependentSourcePaths); // TODO: This is the only place with a list of sources. Why???
for (int i = 0; i < calls.getSize(); i++) {
- Path mainFile = sources.get(0);
- // TODO: Solution code not isolated from student. It would be more secure to
- // change call strategy to generate output.
- plan.run("call", "call", "call" + i, mainFile, "", "" + (i + 1), timeout, maxOutput, false);
+ plan.run("submissioncall", "submissioncall", "submissioncall" + i, submissionSources.get(0), "", "" + (i + 1), timeout, maxOutput, false);
+ plan.run("solutioncall", "solutioncall", "solutioncall" + i, solutionSources.get(0), "", "" + (i + 1), timeout, maxOutput, false);
}
plan.addTask(() -> {
- report.header("call", "Calling with Arguments");
- if (!plan.checkCompiled("call", report, score)) return;
+ report.header("call", "Calling with arguments");
+ if (!plan.checkCompiled("submissioncall", report, score)) return;
+ if (!plan.checkCompiled("solutioncall", report, score)) return;
+ String[] names = new String[calls.getSize()];
+ String[][] args = new String[calls.getSize()][1];
+ String[] actual = new String[calls.getSize()];
+ String[] expected = new String[calls.getSize()];
+ boolean[] outcomes = new boolean[calls.getSize()];
+ boolean[] hidden = new boolean[calls.getSize()];
+
for (int i = 0; i < calls.getSize(); i++) {
- String output = plan.outerr("call" + i);
- List lines = Util.lines(output);
+ actual[i] = plan.outerr("submissioncall" + i);
+ expected[i] = plan.outerr("solutioncall" + i);
+ outcomes[i] = actual[i].equals(expected[i]);
Calls.Call call = calls.getCall(i);
names[i] = call.name;
args[i][0] = call.args;
- if (lines.size() == 3 && Arrays.asList("true", "false").contains(lines.get(2))) {
- expected[i] = lines.get(0);
- actual[i] = Util.truncate(lines.get(1), expected[i].length() + MUCH_LONGER);
- outcomes[i] = lines.get(2).equals("true");
- } else {
- // Error in compilation or execution
- // We assume that the solution correctly produces a single line
- // Most likely, the rest is an exception report, and the true/false never came
- StringBuilder msg = new StringBuilder();
- for (int j = 1; j < lines.size(); j++) {
- String line = lines.get(j);
- if (j < lines.size() - 1 || !(line.equals("true") || line.equals("false")))
- msg.append(line); msg.append('\n');
- }
- String message = msg.toString();
-
- expected[i] = lines.size() > 0 ? lines.get(0) : "";
- actual[i] = message;
- outcomes[i] = false;
- }
+ hidden[i] = call.isHidden();
score.pass(outcomes[i], null /* no report--it's in the table */);
}
- report.runTable(names, new String[] { "Arguments" }, args, actual, expected, outcomes);
+ report.runTable(names, new String[] { "Arguments" }, args, actual, expected, outcomes, hidden, submissionSources.get(0).toString());
});
}
@@ -178,16 +180,17 @@ private void runUnitTests() {
unitTests.add(p);
}
if (unitTests.size() > 0) {
- report.header("unitTest", "Unit Tests");
+ plan.addTask(() -> report.header("unitTest", "Unit tests"));
for (Path p: unitTests) {
String id = plan.nextID("test");
plan.unitTest(id, p, dependentSourcePaths, timeoutMillis / unitTests.size(), maxOutputLen / unitTests.size());
plan.addTask(() -> {
- report.run(p.toString());
+ boolean hidden = problem.getAnnotations().getHiddenTestFiles().contains(p);
+ report.run(p.toString(), p.toString(), hidden);
if (!plan.checkCompiled(id, report, score)) return;
String outerr = plan.outerr(id);
- problem.getLanguage().reportUnitTest(outerr, report, score);
+ problem.getLanguage().reportUnitTest(outerr, report, score);
});
}
@@ -199,7 +202,8 @@ private void runTester(Path mainFile, int timeout, int maxOutputLen) throws Exce
plan.compile(compileID, "submission", mainFile, dependentSourcePaths);
plan.run(compileID, compileID, mainFile, "", null, timeout, maxOutputLen, false);
plan.addTask(() -> {
- report.run("Running " + mainFile);
+ boolean hidden = problem.getAnnotations().getHiddenTestFiles().contains(mainFile);
+ report.run(mainFile.toString(), mainFile.toString(), hidden);
if (!plan.checkCompiled(compileID, report, score)) return;
String outerr = plan.outerr(compileID);
AsExpected cond = new AsExpected(comp);
@@ -210,56 +214,60 @@ private void runTester(Path mainFile, int timeout, int maxOutputLen) throws Exce
});
}
- private void testInputs(Map inputs, Path mainFile, boolean okToInterleave) throws Exception {
+ private void testInputs(List inputs, Path mainFile, boolean okToInterleave) throws Exception {
/*
* If there are no inputs, we feed in one empty input to execute the program.
*/
if (inputs.size() == 0)
- inputs.put("", "");
+ inputs.add(new Input("", "", false));
plan.compile("submissionrun", "submission", mainFile, dependentSourcePaths);
- boolean runSolution = !problem.getInputMode() && !problem.getAnnotations().isSample(mainFile);
- if (runSolution)
+ boolean runSolution = !problem.getInputMode() && !problem.getAnnotations().isSample(mainFile); // TODO: SAMPLE legacy?
+ if (runSolution) {
plan.compile("solutionrun", "solution", mainFile, dependentSourcePaths);
+ }
plan.addTask(() -> {
- report.header("run", problem.getInputMode() ? "Output" : "Testing " + mainFile);
if (runSolution)
plan.checkSolutionCompiled("solutionrun", report, score);
plan.checkCompiled("submissionrun", report, score);
});
- for (String test : inputs.keySet()) {
- String input = inputs.get(test);
- testInput(mainFile, runSolution, test, input, timeoutMillis / inputs.size(), maxOutputLen / inputs.size(), okToInterleave);
+ for (int i = 0; i < inputs.size(); i++) {
+ String test = inputs.get(i).getKey();
+ String input = inputs.get(i).getValue();
+ boolean hidden = inputs.get(i).getHidden();
+ testInput(mainFile, runSolution, test, input, timeoutMillis / inputs.size(), maxOutputLen / inputs.size(), okToInterleave, hidden);
}
}
private void testInput(Path mainFile,
- boolean runSolution, String test, String input, int timeout, int maxOutput, boolean okToInterleave)
+ boolean runSolution, String test, String input, int timeout, int maxOutput, boolean okToInterleave, boolean hidden)
throws Exception {
- List runargs = problem.getAnnotations().findKeys("ARGS");
+ List runargs = problem.getAnnotations().findAll("ARGS");
if (runargs.size() == 0) runargs.add("");
- String out = problem.getAnnotations().findUniqueKey("OUT");
+ String out = problem.getAnnotations().findUnique("OUT");
List outFiles = out == null ? Collections.emptyList() : Arrays.asList(out.trim().split("\\s+"));
String runNumber = test.replace("test", "").trim();
- plan.addTask(() -> {
- if (!plan.compiled("submissionrun")) return;
- report.run(!test.equals("Input") && runNumber.length() > 0 ? "Test " + runNumber : null);
- });
+ String title = !test.equals("Input") && runNumber.length() > 0 ? "Test " + runNumber : null;
boolean interleaveio = okToInterleave && (problem.getLanguage().echoesStdin() == Language.Interleave.ALWAYS ||
problem.getLanguage().echoesStdin() == Language.Interleave.UNGRADED && test.equals("Input"));
if (input == null || input.isBlank()) interleaveio = false;
else if (!input.endsWith("\n")) input += "\n";
// TODO: Language settings
+ // TODO: Pass runSolution to report?
for (String args : runargs) {
- testInput(mainFile, runSolution, test, input, args, outFiles, timeout / runargs.size(), maxOutput / runargs.size(), interleaveio);
+ plan.addTask(() -> {
+ if (!plan.compiled("submissionrun")) return;
+ report.run(title, mainFile.toString(), hidden);
+ });
+ testInput(mainFile, runSolution, test, input, args, outFiles, timeout / runargs.size(), maxOutput / runargs.size(), interleaveio, hidden) ;
}
}
private void testInput(Path mainFile,
- boolean runSolution, String test, String input, String runargs, List outFiles, int timeout, int maxOutput, boolean interleaveio)
+ boolean runSolution, String test, String input, String runargs, List outFiles, int timeout, int maxOutput, boolean interleaveio, boolean hidden)
throws Exception {
String submissionRunID = plan.nextID("submissionrun");
plan.run("submissionrun", submissionRunID, mainFile, runargs, input, outFiles, timeout, maxOutput, interleaveio);
@@ -272,71 +280,60 @@ private void testInput(Path mainFile,
report.args(runargs);
if (!interleaveio && !test.equals("Input")) report.input(input);
-
- List contents = new ArrayList<>();
- List imageComp = new ArrayList<>();
+
String outerr = plan.outerr(submissionRunID);
+ String expectedOuterr = runSolution ? plan.outerr(solutionRunID) : null;
+ if (expectedOuterr != null && expectedOuterr.trim().length() > 0 && outFiles.size() == 0) {
+ boolean outcome = comp.execute(input, outerr, expectedOuterr, report, null);
+ score.pass(outcome, report);
+ } else {
+ // Not scoring output if there are outFiles, but showing in case there is an exception
+ report.output(outerr);
+ }
+
+ Map contents = new HashMap<>();
+ Map imageComp = new HashMap<>();
for (String f : outFiles) {
if (CompareImages.isImage(f)) {
- try {
- imageComp.add(new CompareImages(plan.getOutputBytes(submissionRunID, f)));
- } catch (IOException ex) {
- report.output(outerr);
- report.error(ex.getMessage());
- }
+ imageComp.put(f, new CompareImages(plan.getOutputBytes(submissionRunID, f)));
}
else
- contents.add(plan.getOutputString(submissionRunID, f));
+ contents.put(f, plan.getOutputString(submissionRunID, f));
}
if (!runSolution) {
- report.output(outerr);
for (String f : outFiles) {
if (CompareImages.isImage(f)) {
- try {
- report.image("Image", imageComp.remove(0).first());
- } catch (IOException ex) {
- report.error(ex.getMessage());
- }
+ CompareImages ci = imageComp.get(f);
+ report.image(null, f, ci.first());
}
else
- report.file(f, contents.remove(0));
+ report.file(f, contents.get(f));
}
// No score
return;
}
- String expectedOuterr = plan.outerr(solutionRunID);
-
- if (expectedOuterr != null && expectedOuterr.trim().length() > 0) {
- if (outFiles.size() > 0) {
- // Report output but don't grade it
- report.output(outerr);
- } else {
- boolean outcome = comp.execute(input, outerr, expectedOuterr, report, null);
- score.pass(outcome, report);
- }
- }
-
for (String f : outFiles) {
if (CompareImages.isImage(f)) {
- CompareImages ic = imageComp.remove(0);
+ CompareImages ic = imageComp.get(f);
try {
ic.setOtherImage(plan.getOutputBytes(solutionRunID, f));
boolean outcome = ic.getOutcome();
- report.image("Image", ic.first());
- if (!outcome) {
- report.image("Expected", ic.other());
- report.image("Mismatched pixels", ic.diff());
+ if (outcome) {
+ report.image(outFiles.size() > 1 ? f : null, f, ic.first());
+ } else {
+ report.image(outFiles.size() > 1 ? f : "Actual", f, ic.first());
+ report.image("Expected", null, ic.other());
+ report.image("Mismatched pixels", null, ic.diff());
}
score.pass(outcome, report);
} catch (IOException ex) {
report.error(ex.getMessage());
}
- } else {
+ } else { // TODO: Should we support binary files???
String expectedContents = plan.getOutputString(solutionRunID, f);
- boolean outcome = comp.execute(input, contents.remove(0),
- expectedContents, report, f);
+ boolean outcome = comp.execute(input, contents.get(f), expectedContents, report, f);
score.pass(outcome, report);
}
}
@@ -400,10 +397,11 @@ public void reportComments(Properties metadata) {
report.comment(entries.getKey().toString(), entries.getValue().toString());
}
- public Report run(Map submissionFiles, Map problemFiles,
+ public Plan run(Map submissionFiles, Map problemFiles,
String reportType, Properties metadata, ResourceLoader resourceLoader) throws IOException {
long startTime = System.currentTimeMillis();
- boolean scoring = true;
+ boolean okToInterleave = true;
+ boolean scoring = true; // TODO: Legacy?
try {
// Set up report first in case anything else throws an exception
@@ -413,45 +411,54 @@ else if ("JSON".equals(reportType))
report = new JSONReport("Report");
else if ("NJS".equals(reportType))
report = new NJSReport("Report");
+ else if ("Setup".equals(reportType)) {
+ report = new SetupReport("Report");
+ // okToInterleave = false; // TODO
+ }
else
report = new HTMLReport("Report");
+ plan = new Plan(resourceLoader.getProperty("com.horstmann.codecheck.debug") != null);
+ plan.setReport(report);
+ plan.readSolutionOutputs(problemFiles);
+
problem = new Problem(problemFiles);
+ if (report instanceof SetupReport) ((SetupReport) report).setProblem(problem);
+ plan.setLanguage(problem.getLanguage());
- plan = new Plan(problem.getLanguage(), resourceLoader.getProperty("com.horstmann.codecheck.debug") != null);
+ Set printFiles = Util.filterNot(problem.getUseFiles().keySet(), "*.jar", "*.pdf"); // TODO pdf???
+ printFiles.removeAll(problem.getSolutionFiles().keySet());
timeoutMillis = (int) problem.getAnnotations().findUniqueDoubleKey("TIMEOUT", DEFAULT_TIMEOUT_MILLIS);
maxOutputLen = (int) problem.getAnnotations().findUniqueDoubleKey("MAXOUTPUTLEN", DEFAULT_MAX_OUTPUT_LEN);
double tolerance = problem.getAnnotations().findUniqueDoubleKey("TOLERANCE", DEFAULT_TOLERANCE);
- boolean ignoreCase = !"false".equalsIgnoreCase(problem.getAnnotations().findUniqueKey("IGNORECASE"));
- boolean ignoreSpace = !"false".equalsIgnoreCase(problem.getAnnotations().findUniqueKey("IGNORESPACE"));
- boolean okToInterleave = !"false".equalsIgnoreCase(problem.getAnnotations().findUniqueKey("INTERLEAVE"));
- scoring = !"false".equalsIgnoreCase(problem.getAnnotations().findUniqueKey("SCORING"));
+ boolean ignoreCase = !"false".equalsIgnoreCase(problem.getAnnotations().findUnique("IGNORECASE"));
+ boolean ignoreSpace = !"false".equalsIgnoreCase(problem.getAnnotations().findUnique("IGNORESPACE"));
+ if ("false".equalsIgnoreCase(problem.getAnnotations().findUnique("SCORING"))) scoring = false; // TODO: Legacy?
+ if ("false".equalsIgnoreCase(problem.getAnnotations().findUnique("INTERLEAVE"))) okToInterleave = false;
comp.setTolerance(tolerance);
comp.setIgnoreCase(ignoreCase);
- comp.setIgnoreSpace(ignoreSpace);
-
+ comp.setIgnoreSpace(ignoreSpace);
+
+ if (tolerance != DEFAULT_TOLERANCE) report.attribute("tolerance", tolerance);
+ if (timeoutMillis != DEFAULT_TIMEOUT_MILLIS) report.attribute("timeout", timeoutMillis);
+ if (maxOutputLen != DEFAULT_MAX_OUTPUT_LEN) report.attribute("maxOutputLen", maxOutputLen);
+ if (ignoreCase == false) report.attribute("ignoreCase", ignoreCase);
+ if (ignoreSpace == false) report.attribute("ignoreSpace", ignoreSpace);
+ if (okToInterleave == false) report.attribute("interleave", okToInterleave);
+
getMainAndDependentSourceFiles();
reportComments(metadata);
copyFilesToPlan(submissionFiles);
-
- // TODO: This would be nice to have in Problem, except that one might later need to remove checkstyle.xml
- // the use files that the students are entitled to see
- Set printFiles = Util.filterNot(problem.getUseFiles().keySet(),
- "*.png", "*.PNG", "*.gif", "*.GIF", "*.jpg", "*.jpeg", "*.JPG", "*.bmp", "*.BMP",
- "*.jar", "*.pdf");
- printFiles.removeAll(problem.getAnnotations().getHidden());
- printFiles.removeAll(problem.getSolutionFiles().keySet());
-
if (problem.getAnnotations().checkConditions(submissionFiles, report)) {
- if (problem.getAnnotations().has("CALL")) {
+ if (problem.getAnnotations().has("CALL") || problem.getAnnotations().has("CALL HIDDEN")) {
Calls calls = problem.getAnnotations().findCalls();
mainSourcePaths.remove(calls.getFile());
dependentSourcePaths.add(calls.getFile());
- doCalls(calls, resourceLoader);
+ doCalls(submissionFiles, calls, resourceLoader);
}
if (problem.getAnnotations().has("SUB")) {
Substitution sub = problem.getAnnotations().findSubstitution();
@@ -460,10 +467,10 @@ else if ("NJS".equals(reportType))
doSubstitutions(submissionFiles, sub);
}
- Map inputs = new TreeMap<>();
+ List inputs = new ArrayList();
for (String i : new String[] { "", "1", "2", "3", "4", "5", "6", "7", "8", "9" }) {
String key = "test" + i + ".in";
-
+
Path p = Paths.get(key);
byte[] contents = null;
if (problemFiles.containsKey(p))
@@ -474,15 +481,18 @@ else if ("NJS".equals(reportType))
contents = problemFiles.get(p);
}
if (contents != null)
- inputs.put("test" + i, new String(contents, StandardCharsets.UTF_8));
+ inputs.add(new Input("test" + i, new String(contents, StandardCharsets.UTF_8), false));
}
int inIndex = inputs.size();
- for (String s : problem.getAnnotations().findKeys("IN")) {
- inputs.put("test" + ++inIndex, Util.unescapeJava(s));
+ for (String s : problem.getAnnotations().findAll("IN")) {
+ inputs.add(new Input("test" + ++inIndex, Util.unescapeJava(s), false));
+ }
+ for (String s : problem.getAnnotations().findAll("IN HIDDEN")) {
+ inputs.add(new Input("test" + ++inIndex, Util.unescapeJava(s), true));
}
if (problem.getInputMode()) {
Path p = Paths.get("Input");
- inputs.put("Input", submissionFiles.get(p));
+ inputs.add(new Input("Input", submissionFiles.get(p), false));
}
runUnitTests();
@@ -491,19 +501,20 @@ else if ("NJS".equals(reportType))
List runFiles = new ArrayList<>();
for (Path mainSourceFile : mainSourcePaths) {
if (problem.getLanguage().isTester(mainSourceFile) && !problem.getSolutionFiles().keySet().contains(mainSourceFile)
- && !problem.getAnnotations().isSample(mainSourceFile) && !problem.getInputMode())
+ && !problem.getAnnotations().isSample(mainSourceFile) && !problem.getInputMode()) // TODO: SAMPLE legacy?
testerFiles.add(mainSourceFile);
else
runFiles.add(mainSourceFile);
}
if (testerFiles.size() > 0) {
- report.header("tester", "Testers");
+ plan.addTask(() -> report.header("tester", "Running test"));
for (Path testerFile : testerFiles)
runTester(testerFile, timeoutMillis / testerFiles.size(), maxOutputLen / testerFiles.size());
}
if (runFiles.size() > 0) {
+ plan.addTask(() -> report.header("run", "Running program"));
for (Path runFile : runFiles)
testInputs(inputs, runFile, okToInterleave);
}
@@ -520,11 +531,11 @@ else if ("NJS".equals(reportType))
});
}
}
+ String remoteURL = resourceLoader.getProperty("com.horstmann.codecheck.comrun.remote");
+ String scriptCommand = resourceLoader.getProperty("com.horstmann.codecheck.comrun.local");
+ if (remoteURL == null && scriptCommand == null) scriptCommand = "/opt/codecheck/comrun";
+ plan.execute(report, remoteURL, scriptCommand);
}
- String remoteURL = resourceLoader.getProperty("com.horstmann.codecheck.comrun.remote");
- String scriptCommand = resourceLoader.getProperty("com.horstmann.codecheck.comrun.local");
- if (remoteURL == null && scriptCommand == null) scriptCommand = "/opt/codecheck/comrun";
- plan.execute(report, remoteURL, scriptCommand);
if (!problem.getInputMode()) { // Don't print submitted or provided files for run-only mode
report.header("studentFiles", "Submitted files");
@@ -537,8 +548,11 @@ else if ("NJS".equals(reportType))
if (printFiles.size() > 0) {
report.header("providedFiles", "Provided files");
- for (Path p : printFiles)
- report.file(p.toString(), new String(problem.getUseFiles().get(p), StandardCharsets.UTF_8));
+ for (Path p : printFiles) {
+ boolean hidden = problem.getAnnotations().getHidden().contains(p)
+ || problem.getAnnotations().getHiddenTestFiles().contains(p);
+ report.file(p.toString(), problem.getUseFiles().get(p), hidden);
+ }
}
}
} catch (Throwable t) {
@@ -554,6 +568,6 @@ else if ("NJS".equals(reportType))
}
else System.err.println("report is null");
}
- return report;
+ return plan;
}
}
diff --git a/app/com/horstmann/codecheck/MatlabLanguage.java b/app/com/horstmann/codecheck/MatlabLanguage.java
index bc7a31c2..8fc1f49a 100644
--- a/app/com/horstmann/codecheck/MatlabLanguage.java
+++ b/app/com/horstmann/codecheck/MatlabLanguage.java
@@ -47,27 +47,9 @@ public Map writeTester(Path file, String contents, List[A-Za-z][A-Za-z0-9_]*)\\s*=\\s*(?.+)");
+ @Override public Pattern variableDeclPattern() { return VARIABLE_DECL_PATTERN; }
}
diff --git a/app/com/horstmann/codecheck/NJSReport.java b/app/com/horstmann/codecheck/NJSReport.java
index 9f8a5f0c..7072e2d0 100644
--- a/app/com/horstmann/codecheck/NJSReport.java
+++ b/app/com/horstmann/codecheck/NJSReport.java
@@ -1,16 +1,10 @@
package com.horstmann.codecheck;
-import java.io.IOException;
-import java.nio.file.Path;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
public class NJSReport extends HTMLReport {
public static class ReportData {
public List errors = new ArrayList<>();
@@ -58,26 +52,14 @@ public NJSReport errors(List errors) {
return this;
}
- @Override
- public NJSReport save(Path dir, String out) throws IOException {
- Path outPath = dir.resolve(out + ".json");
- ObjectMapper mapper = new ObjectMapper();
- mapper.setSerializationInclusion(Include.NON_DEFAULT);
- mapper.writeValue(outPath.toFile(), data);
- return this;
- }
-
@Override
public String getText() {
- ObjectMapper mapper = new ObjectMapper();
- mapper.setSerializationInclusion(Include.NON_DEFAULT);
- try {
- return mapper.writeValueAsString(data);
- } catch (JsonProcessingException e) {
- return null;
- }
+ return Util.toJsonString(data);
}
+ @Override
+ public String extension() { return "json"; }
+
@Override
public void close() {
if (sectionType != null) builder.append("\n");
diff --git a/app/com/horstmann/codecheck/PHPLanguage.java b/app/com/horstmann/codecheck/PHPLanguage.java
new file mode 100644
index 00000000..88b7648d
--- /dev/null
+++ b/app/com/horstmann/codecheck/PHPLanguage.java
@@ -0,0 +1,58 @@
+package com.horstmann.codecheck;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.regex.Pattern;
+
+import com.horstmann.codecheck.Calls.Call;
+
+public class PHPLanguage implements Language {
+ @Override
+ public String getExtension() {
+ return "php";
+ }
+
+ @Override
+ public Map writeTester(Path file, String contents, List calls, ResourceLoader resourceLoader) throws IOException {
+ String moduleName = moduleOf(file);
+ Set functionNames = new TreeSet<>();
+ for (Calls.Call call : calls) functionNames.add(call.name);
+ List lines = new ArrayList<>();
+ lines.addAll(Util.lines(contents));
+ for (int i = lines.size() - 1; i >= 0; i--) {
+ if (lines.get(i).strip().equals("?>")) {
+ lines.set(i, "");
+ i = 0;
+ }
+ }
+ for (int k = 0; k < calls.size(); k++) {
+ Calls.Call call = calls.get(k);
+ lines.add("if ($argv[1] === '" + (k + 1) + "') {");
+ lines.add("$result = " + call.name + "(" + call.args + ");");
+ lines.add("var_export($result);"); // TODO Or var_dump, print_r
+ lines.add("}");
+ }
+ lines.add("?>");
+ Map paths = new LinkedHashMap<>();
+ paths.put(pathOf(moduleName + "CodeCheck"), Util.join(lines, "\n"));
+ return paths;
+ }
+
+ private static Pattern VARIABLE_DECL_PATTERN = Pattern.compile(
+ "^\\s*(?\\$[A-Za-z][A-Za-z0-9_]*)\\s*=(?[^;]+);");
+ @Override public Pattern variableDeclPattern() { return VARIABLE_DECL_PATTERN; }
+
+ public boolean isUnitTest(Path fileName) { return fileName.toString().matches(".*(T|_t)est[0-9]*.php"); }
+
+ private static final Pattern successPattern = Pattern.compile("OK \\([0-9]+ tests?, (?[0-9.]+) assertions\\)");
+ private static final Pattern failurePattern = Pattern.compile("Tests: [0-9]+, Assertions: (?[0-9]+), Failures: (?[0-9]+)\\.");
+ @Override public Pattern unitTestSuccessPattern() { return successPattern; }
+ @Override public Pattern unitTestFailurePattern() { return failurePattern; }
+
+}
diff --git a/app/com/horstmann/codecheck/Plan.java b/app/com/horstmann/codecheck/Plan.java
index 5f64c256..ebe43ec7 100644
--- a/app/com/horstmann/codecheck/Plan.java
+++ b/app/com/horstmann/codecheck/Plan.java
@@ -10,9 +10,11 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
+import java.util.Set;
public class Plan {
private Language language;
@@ -23,13 +25,57 @@ public class Plan {
private int nextID = 0;
private static int MIN_TIMEOUT = 3; // TODO: Maybe better to switch interleaveio and timeout?
private boolean debug;
+ private Report report;
- public Plan(Language language, boolean debug) throws IOException {
- this.language = language;
+ public Plan(boolean debug) throws IOException {
this.debug = debug;
if (debug) addScript("debug");
}
+
+ public void setLanguage(Language language) {
+ this.language = language;
+ }
+ public void setReport(Report report) {
+ this.report = report;
+ }
+
+ public Report getReport() {
+ return this.report;
+ }
+
+ public void writeSolutionOutputs(Map filesToSave) {
+ for (Map.Entry entry : outputs.entrySet()) {
+ Path p = entry.getKey();
+ if (p.getName(p.getNameCount() - 1).toString().equals("_errors"))
+ return;
+ }
+ for (Map.Entry entry : outputs.entrySet()) {
+ Path p = entry.getKey();
+ if (p.getName(0).toString().startsWith("solution")) {
+ filesToSave.put(Path.of("_outputs").resolve(p), entry.getValue());
+ }
+ }
+ }
+
+ public void readSolutionOutputs(Map savedFiles) {
+ boolean removeOnly = false;
+ for (Map.Entry entry : savedFiles.entrySet()) {
+ Path p = entry.getKey();
+ if (p.getName(p.getNameCount() - 1).toString().equals("_errors"))
+ removeOnly = true;
+ }
+ Set toRemove = new HashSet<>();
+ for (Map.Entry entry : savedFiles.entrySet()) {
+ Path p = entry.getKey();
+ if (p.getName(0).toString().equals("_outputs")) {
+ if (!removeOnly) outputs.put(p.subpath(1, p.getNameCount()), entry.getValue());
+ toRemove.add(p);
+ }
+ }
+ savedFiles.keySet().removeAll(toRemove);
+ }
+
public String nextID(String prefix) {
nextID++;
return prefix + nextID;
@@ -65,7 +111,7 @@ public boolean checkSolutionCompiled(String compileDir, Report report, Score sco
String errorReport = getOutputString(compileDir, "_errors");
if (errorReport == null) return true;
if (errorReport.trim().equals(""))
- report.systemError("Compilation of solution ailed");
+ report.systemError("Compilation of solution failed");
else
report.systemError(errorReport);
score.setInvalid();
@@ -120,7 +166,8 @@ public void compile(String compileDir, String sourceDirs, List sourceFiles
allSourceFiles.addAll(sourceFiles);
allSourceFiles.addAll(dependentSourceFiles);
addScript("prepare " + compileDir + " use " + sourceDirs);
- addScript("compile " + compileDir + " " + language.getLanguage() + " " + Util.join(allSourceFiles, " "));
+ if (!outputs.containsKey(Paths.get(compileDir).resolve("_compile")))
+ addScript("compile " + compileDir + " " + language.getLanguage() + " " + Util.join(allSourceFiles, " "));
}
// TODO maxOutputLen
@@ -133,10 +180,12 @@ public void run(String compileDir, String runDir, String runID, Path mainFile, S
if (!compileDir.equals(runDir))
addScript("prepare " + runDir + " " + compileDir);
addFile(Paths.get("in").resolve(runID), input == null ? "" : input);
- addScript("run " + runDir + " " + runID + " " + Math.max(MIN_TIMEOUT, (timeout + 500) / 1000) + " " + maxOutputLen + " " + interleaveIO + " " + language.getLanguage() + " " + mainFile + (args == null ? "" : " " + args));
+ if (!outputs.containsKey(Paths.get(runID).resolve("_run")))
+ addScript("run " + runDir + " " + runID + " " + Math.max(MIN_TIMEOUT, (timeout + 500) / 1000) + " " + maxOutputLen + " " + interleaveIO + " " + language.getLanguage() + " " + mainFile + (args == null ? "" : " " + args));
}
public void run(String compileDir, String runDir, Path mainFile, String args, String input, Collection outfiles, int timeout, int maxOutputLen, boolean interleaveIO) {
+ if (outputs.containsKey(Paths.get(runDir).resolve("_run"))) return;
run(compileDir, runDir, mainFile, input, args, timeout, maxOutputLen, interleaveIO);
if (outfiles.size() > 0)
addScript("collect " + runDir + " " + Util.join(outfiles, " "));
@@ -179,7 +228,7 @@ private void executeLocally(String scriptCommand, Report report)
responseZip = Paths.get(lines[n]);
if (!Files.exists(responseZip))
throw new CodeCheckException("comrun failed.\n" + result);
- outputs = Util.unzip(Files.readAllBytes(responseZip));
+ outputs.putAll(Util.unzip(Files.readAllBytes(responseZip)));
} finally {
if (!debug) {
Files.deleteIfExists(requestZip);
@@ -195,7 +244,9 @@ private void executeRemotely(String remoteURL, Report report)
while (retries > 0) {
try {
byte[] responseZip = Util.fileUpload(remoteURL, "job", "job.zip", requestZip);
- outputs = Util.unzip(responseZip);
+ if (responseZip.length < 2 || !(responseZip[0] == 0x50 && responseZip[1] == 0x4b))
+ throw new IOException("Remote result not a zip file");
+ outputs.putAll(Util.unzip(responseZip));
if (debug) {
Path temp = Files.createTempFile("codecheck-request", ".zip");
System.out.println("Remote request at " + temp);
diff --git a/app/com/horstmann/codecheck/Problem.java b/app/com/horstmann/codecheck/Problem.java
index dc908c55..1ee448d4 100644
--- a/app/com/horstmann/codecheck/Problem.java
+++ b/app/com/horstmann/codecheck/Problem.java
@@ -61,7 +61,7 @@ public static class DisplayData {
public Map useFiles = new LinkedHashMap<>();
public String description;
}
-
+
private Map problemFiles;
private Map useFiles = new Util.FileMap();
// the files (sources and inputs) from problemFiles that must be copied to the directory
@@ -79,11 +79,15 @@ public static class DisplayData {
private static final Pattern IMG_PATTERN = Pattern
.compile("[<]\\s*[iI][mM][gG]\\s*[sS][rR][cC]\\s*[=]\\s*['\"]([^'\"]*)['\"][^>]*[>]");
+ private static final Pattern LINK_START = Pattern
+ .compile("<\\s*[aA]\\s+[^>]*[hH][rR][eE][fF]\\s*=\\s*['\"]([^'\"]+)['\"][^>]*>");
+ private static final Pattern LINK_END = Pattern.compile("<\\s*/\\s*[aA]\\s*>");
public Problem(Map problemFiles) throws IOException {
- this.problemFiles = problemFiles;
language = Language.languageFor(problemFiles.keySet());
if (language == null) throw new CodeCheckException("Cannot find language from " + problemFiles.keySet());
+
+ this.problemFiles = problemFiles;
annotations = new Annotations(language);
String[] delims = language.pseudoCommentDelimiters();
start = delims[0];
@@ -135,9 +139,9 @@ else if (initial.equals("solution")) {
}
}
inputFiles.put(inputPath, problemFiles.get(inputPath));
- for (String runargs : annotations.findKeys("ARGS"))
+ for (String runargs : annotations.findAll("ARGS"))
for (String arg : runargs.split("\\s+"))
- if (isTextFile(arg)) {
+ if (isTextFile(arg)) { // TODO: would also make sense to display used image files
Path argPath = Paths.get(arg);
if (useFiles.containsKey(argPath)) {
inputFiles.put(argPath, useFiles.get(argPath));
@@ -201,6 +205,26 @@ private String readDescription(String descriptionFile) {
if (start != -1)
result.replace(0, start, "");
+ // Check if links are relative or not, if relative links, change it to normal text
+ Matcher linkMatcherStart = LINK_START.matcher(result);
+ Matcher linkMatcherEnd = LINK_END.matcher(result);
+ int startLink = 0;
+ int endLink = 0;
+ while (linkMatcherStart.find(startLink) && linkMatcherEnd.find(startLink)) {
+ startLink = linkMatcherStart.start();
+ endLink = linkMatcherEnd.end();
+ String hrefLink = result.substring(linkMatcherStart.start(1), linkMatcherStart.end(1)).toLowerCase();
+ if (!(hrefLink.startsWith("http://") || hrefLink.startsWith("https://"))) {
+ int startContent = linkMatcherStart.end();
+ int endContent = linkMatcherEnd.start();
+ String contentOfLink = result.substring(startContent, endContent);
+ result.replace(startLink, endLink, contentOfLink);
+ startLink += contentOfLink.length();
+ }
+ else
+ startLink = endLink;
+ }
+
Matcher matcher = IMG_PATTERN.matcher(result);
start = 0;
while (matcher.find(start)) {
@@ -284,13 +308,15 @@ private EditorState processHideShow(String contents) {
boolean hasEdit = false;
boolean hasShow = false;
boolean hasTile = false;
+ boolean firstHide = false;
for (int i = 0; i < lines.length && !hasTile && !hasEdit; i++) {
- Annotations.Annotation ann = Annotations.parse(lines[i], start, end);
- if (ann.key.equals("EDIT")) hasEdit = true;
+ Annotations.Annotation ann = Annotations.parse(lines[i], start, end);
+ if (i == 0 && (ann.key.equals("HIDE") || ann.key.equals("HIDDEN"))) firstHide = true;
+ else if (ann.key.equals("EDIT")) hasEdit = true;
else if (ann.key.equals("SHOW")) hasShow = true;
else if (ann.key.equals("TILE")) hasTile = true;
}
- if (lines.length == 0 || Annotations.parse(lines[0], start, end).key.equals("HIDE") && !hasShow && !hasEdit) {
+ if (lines.length == 0 || firstHide && !hasShow && !hasEdit) {
EditorState state = new EditorState();
state.editors = new ArrayList(); // Empty list means file is hidden
return state;
@@ -420,17 +446,6 @@ private EditorState hideEditMode(String[] lines) {
hiding = true;
if (hiding)
lines[i] = null;
- if (ann.key.equals("SHOW")) {
- hiding = false;
- String showString = start + "SHOW";
- int n1 = lines[i].indexOf(showString);
- int n2 = showString.length();
- int n3 = lines[i].lastIndexOf(end);
- if (n1 + n2 < n3)
- lines[i] = lines[i].substring(0, n1) + lines[i].substring(n1 + n2 + 1, n3);
- else
- lines[i] = null;
- }
}
}
// Emit final section
@@ -677,6 +692,7 @@ private EditorState tileMode(String[] lines) {
return state;
}
+ // TODO: This could be more liberal--see HTMLReport for identifying text vs. binary
private static boolean isTextFile(String p) { return p.toLowerCase().endsWith(".txt"); }
private static boolean isTextFile(Path p) { return isTextFile(p.toString()); }
@@ -721,7 +737,7 @@ public Problem.DisplayData getProblemData() {
}
public String getId() {
- String problemId = annotations.findUniqueKey("ID");
+ String problemId = annotations.findUnique("ID");
if (problemId == null) { // TODO: Move to Problem
problemId = Util.removeExtension(solutionFiles.keySet().iterator().next().getFileName());
}
diff --git a/app/com/horstmann/codecheck/PythonLanguage.java b/app/com/horstmann/codecheck/PythonLanguage.java
index bfa7aba2..93673bcb 100644
--- a/app/com/horstmann/codecheck/PythonLanguage.java
+++ b/app/com/horstmann/codecheck/PythonLanguage.java
@@ -5,6 +5,7 @@
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
+import java.util.ArrayList;
public class PythonLanguage implements Language {
@@ -51,7 +52,7 @@ public boolean isMain(Path p, String contents) {
@Override
public Map writeTester(Path file, String contents, List calls, ResourceLoader resourceLoader) {
String moduleName = moduleOf(file);
- List lines = Util.lines(contents);
+ List lines = new ArrayList<>();
int i = 0;
lines.add(i++, "from sys import argv");
lines.add(i++, "import " + moduleName);
@@ -61,27 +62,9 @@ public Map writeTester(Path file, String contents, List[A-Za-z][A-Za-z0-9]*)\\s*=\\s*(?.+)");
+ private static Pattern varPattern = Pattern.compile("(?[A-Za-z][A-Za-z0-9_]*)\\s*=\\s*(?.+)");
@Override public Pattern variableDeclPattern() { return varPattern; }
private static Pattern errPattern = Pattern.compile("(?.*)[\"(](?[A-Za-z0-9_]+\\.py)\"?, line (?[0-9]+).*");
@Override public Pattern errorPattern() { return errPattern; }
- public boolean isUnitTest(Path fileName) { return fileName.toString().matches(".*Test[0-9]*.py"); }
+ public boolean isUnitTest(Path fileName) { return fileName.toString().matches(".*(T|_t)est[0-9]*.py"); }
private static final Pattern successPattern = Pattern.compile("Ran (?[0-9]+) tests? in [0-9.]+s\\s+OK");
private static final Pattern failurePattern = Pattern.compile("Ran (?[0-9]+) tests? in [0-9.]+s\\s+FAILED \\([^=]+=(?[0-9]+)\\)");
diff --git a/app/com/horstmann/codecheck/RacketLanguage.java b/app/com/horstmann/codecheck/RacketLanguage.java
index aabb67fa..012a8fc5 100644
--- a/app/com/horstmann/codecheck/RacketLanguage.java
+++ b/app/com/horstmann/codecheck/RacketLanguage.java
@@ -46,12 +46,10 @@ public boolean isMain(Path p, String contents) {
@Override
public Map writeTester(Path file, String contents, List calls, ResourceLoader resourceLoader) {
String moduleName = moduleOf(file);
- // Copy source/module.rkt to target/module-solution.rkt
StringBuilder out = new StringBuilder();
out.append("#lang racket\n");
- out.append("(require (prefix-in solution:: \"" + moduleName + "-solution.rkt\"))\n");
- out.append("(require (prefix-in student:: \"" + moduleName + ".rkt\"))\n");
+ out.append("(require (prefix-in submission:: \"" + moduleName + ".rkt\"))\n");
out.append("(provide main)\n");
out.append("(define (main . args)\n");
out.append("(let ((arg (car args))) (cond\n");
@@ -61,29 +59,27 @@ public Map writeTester(Path file, String contents, List testerFiles = new HashMap<>();
testerFiles.put(Paths.get(moduleName + "CodeCheck.rkt"), out.toString());
- testerFiles.put(Paths.get(moduleName+ "-solution.rkt"), contents);
return testerFiles;
}
-
- private static String patternString = ".*\\S\\s+(?\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*)\\s*=\\s*(?[^;]+);.*";
- private static Pattern pattern = Pattern.compile(patternString);
- @Override public Pattern variableDeclPattern() { return pattern; }
+ // CAUTION: Because the rhs is likely to contain (), there must be a space
+ // before the final ), e.g. (define l '(1 2 3) )
+ private static Pattern VARIABLE_DECL_PATTERN = Pattern.compile(
+ "\\(\\s*define\\s+(?[A-Za-z][A-Za-z0-9_]*)\\s+(?.+)\\s+\\)");
+ @Override public Pattern variableDeclPattern() { return VARIABLE_DECL_PATTERN; }
+
@Override
public boolean isUnitTest(Path fileName) {
- return fileName.toString().matches(".*Test[0-9]*.rkt");
+ return fileName.toString().matches(".*(T|_t)est[0-9]*.rkt");
}
private static final Pattern successPattern = Pattern.compile("All (?[0-9]+) tests passed");
diff --git a/app/com/horstmann/codecheck/Report.java b/app/com/horstmann/codecheck/Report.java
index 387711f6..c88a4419 100644
--- a/app/com/horstmann/codecheck/Report.java
+++ b/app/com/horstmann/codecheck/Report.java
@@ -1,7 +1,6 @@
package com.horstmann.codecheck;
import java.awt.image.BufferedImage;
-import java.io.IOException;
import java.nio.file.Path;
import java.util.List;
import java.util.Set;
@@ -18,7 +17,7 @@ static class Match
Report header(String section, String text);
- Report run(String caption);
+ Report run(String caption, String mainclass, boolean hidden);
Report output(CharSequence text);
@@ -27,33 +26,43 @@ static class Match
Report systemError(String message);
Report systemError(Throwable t);
+
+ default Report condition(boolean passed, boolean forbidden, Path path, String regex, String message) {
+ if (!passed) {
+ if (message == null) message = (forbidden ? "Found " : "Did not find ") + regex;
+ error(path + ": " + message);
+ }
+ return this;
+ }
- Report image(String caption, BufferedImage image) throws IOException;
-
- Report image(BufferedImage image) throws IOException;
-
+ Report image(String caption, String filename, BufferedImage image);
+
Report file(String file, String contents);
+ Report file(String file, byte[] contents, boolean hidden);
Report args(String args);
Report input(String input);
Report add(Score score);
-
- Report save(Path dir, String out) throws IOException;
Report pass(boolean b);
Report compareTokens(String filename, List matches);
Report output(List lines, Set matches, Set mismatches);
- Report runTable(String[] functionNames, String[] argNames, String[][] args, String[] actual, String[] expected, boolean[] outcomes);
- Report comment(String key, String value);
+ // TODO: record for RunTableRow
+ Report runTable(String[] functionNames, String[] argNames, String[][] args, String[] actual, String[] expected, boolean[] outcomes, boolean[] hidden, String mainclass);
+ Report comment(String key, String value);
+ default Report attribute(String key, Object value) { return this; }
+
Report footnote(String text);
default void close() {}
String getText();
default Report errors(List errors) { return this; }
+
+ String extension();
}
\ No newline at end of file
diff --git a/app/com/horstmann/codecheck/RustLanguage.java b/app/com/horstmann/codecheck/RustLanguage.java
new file mode 100644
index 00000000..02b2d4dc
--- /dev/null
+++ b/app/com/horstmann/codecheck/RustLanguage.java
@@ -0,0 +1,58 @@
+package com.horstmann.codecheck;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+public class RustLanguage implements Language {
+ public String getExtension() { return "rs"; };
+
+ private static Pattern mainPattern = Pattern.compile("fn\\s+main\\s*\\([^)]*\\)\\s*(\\{\\s*)?");
+ @Override public Pattern mainPattern() { return mainPattern; }
+
+ private static Pattern VARIABLE_DECL_PATTERN =Pattern.compile("let\\s*(mut\\s*)?(?[A-Za-z][A-Za-z0-9_]*)\\s*(:\\s*(((i|u)(8|16|32|64|128|size))|(f32|f64|bool|char)|(\\[(((i|u)(8|16|32|64|128|size))|(f32|f64|bool|char))\\s*;\\s*[0-9]*\\s*\\]))\\s*)?=\\s*(?.+);\\s*");
+ @Override public Pattern variableDeclPattern() { return VARIABLE_DECL_PATTERN; }
+
+ @Override
+ public boolean isUnitTest(Path fileName) {
+ return fileName.toString().matches(".*(T|_t)est[0-9]*.rs");
+ }
+
+ @Override
+ public Map writeTester(Path file, String contents, List calls, ResourceLoader resourceLoader) {
+ String moduleName = moduleOf(file);
+ List lines = new ArrayList<>();
+ lines.add("use std::env;");
+ lines.add("mod " + moduleName + ";");
+ lines.add("fn main() {");
+ lines.add(" let args: Vec = env::args().collect();");
+ for (int k = 0; k < calls.size(); k++) {
+ Calls.Call call = calls.get(k);
+ lines.add(" if args[1] == \"" + (k + 1) + "\" {");
+ lines.add(" let result = " + moduleName + "::" + call.name + "(" + call.args + ");");
+ lines.add(" println!(\"{:?}\", result);");
+ lines.add(" }");
+ }
+ lines.add("}");
+ Path p = pathOf(moduleName + "CodeCheck");
+ Map testFiles = new HashMap<>();
+ testFiles.put(p, Util.join(lines, "\n"));
+ return testFiles;
+ }
+
+ private static final Pattern successPattern = Pattern.compile("running (?[0-9]+) tests?[\\s\\S]*test result: ok. [0-9]+ passed; (?[0-9]+) failed;");
+ @Override public Pattern unitTestSuccessPattern() { return successPattern; }
+ private static final Pattern failurePattern = Pattern.compile("running (?[0-9]+) tests?[\\s\\S]*test result: FAILED. [0-9]+ passed; (?[0-9]+) failed;");
+ @Override public Pattern unitTestFailurePattern() { return failurePattern; }
+
+ // TODO: Change regex to include error message
+ private static Pattern ERROR_PATTERN = Pattern.compile("--> (?[^\\s\\S]+\\.rs):(?[0-9]+)");
+ @Override public Pattern errorPattern() { return ERROR_PATTERN; }
+
+
+
+
+}
diff --git a/app/com/horstmann/codecheck/SMLLanguage.java b/app/com/horstmann/codecheck/SMLLanguage.java
index 9f306d43..e9622e1d 100644
--- a/app/com/horstmann/codecheck/SMLLanguage.java
+++ b/app/com/horstmann/codecheck/SMLLanguage.java
@@ -40,50 +40,24 @@ public Map writeTester(Path file, String contents, List NONE ;\n");
- out.append("fun comp expr1 expr2 = let\n");
- out.append(" val actual = eval expr1\n");
- out.append(" val expected = eval expr2\n");
- out.append(" in\n");
- out.append(" (case (actual, expected) of\n");
- out.append(" (NONE, NONE) => \"exception\\nexception\\ntrue\\n\" |\n");
- out.append(" (NONE, SOME y) => \"exception\\n\" ^ (PolyML.makestring y) ^ \"\\nfalse\\n\" |\n");
- out.append(" (SOME x, NONE) => (PolyML.makestring x) ^ \"\\nexception\\nfalse\\n\" |\n");
- out.append(" (SOME x, SOME y) => (PolyML.makestring x) ^ \"\\n\" ^ (PolyML.makestring y) ^ \"\\n\" ^ (PolyML.makestring (x = y)) ^ \"\\n\")\n");
- out.append("end;\n");
- out.append("fun main() = print (case hd(CommandLine.arguments()) of \n");
+ out.append("fun main() = print (PolyML.makestring (case hd(CommandLine.arguments()) of \n");
for (int k = 0; k < calls.size(); k++) {
Calls.Call call = calls.get(k);
if (k < calls.size() - 1)
- out.append(" \"" + (k + 1) + "\" => comp (fn () => (Solution." +
- call.name + " " + call.args + ")) (fn () => (" +
- call.name + " " + call.args + ")) |\n");
+ out.append(" \"" + (k + 1) + "\" => (" +
+ call.name + " " + call.args + ") |\n");
else
- out.append(" _ => comp (fn () => (Solution." +
- call.name + " " + call.args + ")) (fn () => (" +
- call.name + " " + call.args + ")));\n");
+ out.append(" _ => (" +
+ call.name + " " + call.args + ")) handle exn => \"exception\");\n");
}
Map result = new HashMap<>();
result.put(testFile, out.toString());
return result;
}
- private static String variablePatternString = "\\s*val\\s+(?\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*)\\s*=\\s*(?.+)";
- private static Pattern variablePattern = Pattern.compile(variablePatternString);
-
- /*
- * (non-Javadoc)
- *
- * @see com.horstmann.codecheck.Language#variablePattern()
- */
- @Override
- public Pattern variableDeclPattern() {
- return variablePattern;
- }
+ private static Pattern VARIABLE_DECL_PATTERN = Pattern.compile(
+ "val\\s+(?\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*)\\s*=\\s*(?[^;]+);?");
+ @Override public Pattern variableDeclPattern() { return VARIABLE_DECL_PATTERN; }
private static Pattern ERROR_PATTERN = Pattern.compile("(?[^/]+\\.sml):(?[0-9]+):(?[0-9]+): (?.+)");
@Override public Pattern errorPattern() { return ERROR_PATTERN; }
diff --git a/app/com/horstmann/codecheck/ScalaLanguage.java b/app/com/horstmann/codecheck/ScalaLanguage.java
index d113e654..9e7e4c70 100644
--- a/app/com/horstmann/codecheck/ScalaLanguage.java
+++ b/app/com/horstmann/codecheck/ScalaLanguage.java
@@ -3,6 +3,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.HashMap;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
@@ -28,36 +29,19 @@ public boolean isMain(Path p, String contents) {
@Override
public Map writeTester(Path file, String contents, List calls, ResourceLoader resourceLoader) {
- List lines = Util.lines(contents);
-
- // Find class name
- int i = 0;
- while (i < lines.size() && !lines.get(i).contains("//CALL")) i++;
- if (i == lines.size())
- throw new CodeCheckException("Can't find object in " + file);
- while (i >= 0 && !lines.get(i).trim().startsWith("object")) i--;
- if (i < 0)
- throw new CodeCheckException("Can't find object in " + file);
- String[] tokens = lines.get(i).split("\\P{javaJavaIdentifierPart}+");
- int j = 0;
- if (tokens[0].length() == 0) j++;
- if (j + 1 >= tokens.length) throw new CodeCheckException("Can't find object name in " + file);
- String objectName = tokens[j + 1];
- lines.add(0, "object " + objectName + "CodeCheck extends App {");
- lines.add(1, "object Solution {");
- lines.add("}}");
- i = 0;
+ // Requirement: File name must equal to object containing called method
+ String objectName = moduleOf(file);
+ List lines = new ArrayList<>();
+ lines.add("object " + objectName + "CodeCheck extends App {");
for (int k = 0; k < calls.size(); k++) {
Calls.Call call = calls.get(k);
String submissionFun = objectName + "." + call.name;
- String solutionFun = "Solution." + submissionFun;
- lines.add(++i, "if (args(0) == \"" + (k + 1) + "\") {");
- lines.add(++i, "val actual = " + submissionFun + "(" + call.args + ")");
- lines.add(++i, "val expected = " + solutionFun + "(" + call.args + ")");
- lines.add(++i, "println(runtime.ScalaRunTime.stringOf(expected))");
- lines.add(++i, "println(runtime.ScalaRunTime.stringOf(actual))");
- lines.add(++i, "println(actual == expected) }");
- }
+ lines.add("if (args(0) == \"" + (k + 1) + "\") {");
+ lines.add(" val result = " + submissionFun + "(" + call.args + ")");
+ lines.add(" println(runtime.ScalaRunTime.stringOf(result))");
+ lines.add("}");
+ }
+ lines.add("}");
Path p = Paths.get(objectName + "CodeCheck.scala");
Map testModules = new HashMap<>();
testModules.put(p, Util.join(lines, "\n"));
@@ -73,9 +57,7 @@ public Map writeTester(Path file, String contents, List\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*)(\\s*:[^=]+\\s*)?\\s*=\\s*(?[^;]+);.*");
-
- @Override
- public Pattern variableDeclPattern() { return variablePattern; }
+ private static Pattern VARIABLE_DECL_PATTERN = Pattern.compile(
+ "(val|var)\\s+(?\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*)(\\s*:[^=]+\\s*)?\\s*=\\s*(?[^;]+);");
+ @Override public Pattern variableDeclPattern() { return VARIABLE_DECL_PATTERN; }
}
diff --git a/app/com/horstmann/codecheck/SetupReport.java b/app/com/horstmann/codecheck/SetupReport.java
new file mode 100644
index 00000000..2415f023
--- /dev/null
+++ b/app/com/horstmann/codecheck/SetupReport.java
@@ -0,0 +1,107 @@
+package com.horstmann.codecheck;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+public class SetupReport extends JSONReport {
+ private Problem problem;
+ private Map attributes = new HashMap<>();
+ private List conditions = new ArrayList<>();
+
+ static class Condition {
+ public boolean forbidden;
+ public String path;
+ public String regex;
+ public String message;
+ }
+
+ public SetupReport(String title) {
+ super(title);
+ }
+
+ public void setProblem(Problem problem) {
+ this.problem = problem;
+ }
+
+ @Override public JSONReport attribute(String key, Object value) {
+ attributes.put(key, value);
+ return this;
+ }
+
+ @Override public JSONReport condition(boolean passed, boolean forbidden, Path path, String regex, String message) {
+ Condition c = new Condition();
+ c.forbidden = forbidden;
+ c.path = path.toString();
+ c.regex = regex;
+ c.message = message;
+ conditions.add(c);
+ return this;
+ }
+
+ @Override public String getText() {
+ for (Section section : data.sections) {
+ for (Run run : section.runs) {
+ if (run.output == null || run.output == "") {
+ StringBuilder output = new StringBuilder();
+ for (Match match : run.matchedOutput) {
+ output.append(match.actual);
+ output.append("\n");
+ }
+ run.matchedOutput = null;
+ run.output = output.toString();
+ }
+ run.passed = null;
+ run.html = null;
+ }
+ }
+ data.metaData.clear();
+ data.score = null;
+ ObjectNode dataNode = Util.toJson(data);
+ if (problem != null) {
+ Problem.DisplayData displayData = problem.getProblemData();
+ ObjectNode problemNode = Util.toJson(displayData);
+ Iterator> fields = problemNode.fields();
+ while (fields.hasNext()) {
+ Map.Entry