Many improvements, and first deployment of Maria

Author: s-edwards

Properties

@@ -1,5 +1,5 @@
 #This file is automatically rewritten by ANT.  Hand-edits may be lost.
-#Sat Apr 20 13:24:36 GMT-05:00 2019
+#Fri Nov 15 18:15:31 GMT-05:00 2019
 version.minor=1
 timeoutMultiplier=2
 license.url="http\://www.gnu.org/licenses/agpl.html"
@@ -11,7 +11,7 @@ interpreter.prefix="${PerlForPlugins.perl.exe}"
 languages=( { name \= Java; version \= 1.4
 autoPublish=true
 version.major=4
-version.date=20190420
+version.date=20191115
 timeoutInternalPadding=400
 provider="Virginia Tech Computer Science"
 authorUid=edwards

java-src/net/sf/webcat/plugins/javatddplugin/BasicJUnitResultFormatter.java

@@ -173,11 +173,18 @@ public void endTestSuite(JUnitTest suite)
             }
             for (String message : messages)
             {
-                result = result.replaceFirst(
-                    "(Testcase:.*(?:\r\n|\n|\r)"
-                    + "\t(?:FAILED|Caused an ERROR)(?:\r\n|\n|\r))\\Q"
-                    + message
-                    + "\\E(?:\r\n|\n|\r)", "$1");
+                try
+                {
+                    result = result.replaceFirst(
+                        "(Testcase:.*(?:\r\n|\n|\r)"
+                        + "\t(?:FAILED|Caused an ERROR)(?:\r\n|\n|\r))\\Q"
+                        + message
+                        + "\\E(?:\r\n|\n|\r)", "$1");
+                }
+                catch (java.util.regex.PatternSyntaxException e)
+                {
+                    // ignore problems with message including illegal chars
+                }
             }
             messages.clear();
             result += "--------------------\n"

src/JavaTddPluginSupport.jar

@@ -216,6 +216,7 @@ staticAnalysisSrcExclusionPattern = ${staticAnalysisSrcExclusionPattern}
            debuglevel="lines,vars,source"
     	   includeAntRuntime="false"
     	   encoding="UTF-8"
+    	   compiler="modern"
       >
       <classpath refid="student.classpath"/>
       <compilerarg value="-Xlint:unchecked"/>
@@ -234,6 +235,7 @@ staticAnalysisSrcExclusionPattern = ${staticAnalysisSrcExclusionPattern}
            debuglevel="lines,vars,source"
            casesensitive="no"
            includeAntRuntime="false"
+    	   compiler="modern"
     	>
     	<!-- Should include:, but not until we have a viable UTF-8-ifier
            encoding="UTF-8"
@@ -320,7 +322,7 @@ staticAnalysisSrcExclusionPattern = ${staticAnalysisSrcExclusionPattern}
                includes="*-out.txt"
                casesensitive="false"/>
     </concat>
-    <delete dir="${instr.results.dir}"/>
+    <delete failonerror="false" dir="${instr.results.dir}"/>
   </target>
 
 
@@ -393,7 +395,7 @@ staticAnalysisSrcExclusionPattern = ${staticAnalysisSrcExclusionPattern}
                includes="*-out.txt"
                casesensitive="false"/>
     </concat>
-    <delete dir="${student.results.dir}"/>
+    <delete  failonerror="false" dir="${student.results.dir}"/>
     <condition property="no.coverage.data">
       <not>
         <available file="${jacoco.db}"/>
@@ -646,7 +648,7 @@ staticAnalysisSrcExclusionPattern = ${staticAnalysisSrcExclusionPattern}
       <arg value="${psfile}"/>
       <arg value="${PDF.dest}"/>
     </exec>
-    <delete file="${psfile}"/>
+    <delete failonerror="false" file="${psfile}"/>
   </target>
 
 
@@ -679,18 +681,19 @@ staticAnalysisSrcExclusionPattern = ${staticAnalysisSrcExclusionPattern}
 
     <!-- Delete the Doxygen generated files from the working dir so they
          don't all get copied into the result dir -->
-    <delete dir="${basedir}/doxygen"/>
+    <delete failonerror="false" dir="${basedir}/doxygen"/>
   </target>
 
 
   <target name="final.clean"
           unless="doNotDelete"
           description="removes unnecessary derived files">
-    <delete includeEmptyDirs="true" quiet="true">
+    <delete failonerror="false" includeEmptyDirs="true">
       <fileset dir="${resultDir}" casesensitive="false">
         <include name="studentbin/"/>
         <include name="studentbin.raw/"/>
         <include name="instructorbin/"/>
+        <include name="instr.results/"/>
         <include name="jacoco.db"/>
       </fileset>
     </delete>

src/build.xml

@@ -707,6 +707,16 @@
             description =
   "Set to true to show Maria (experimental), the virtual teaching assistant
   chatbot.";
+        },
+        {
+            property    = useMariaExplanations;
+            type        = boolean;
+            advanced    = true;
+            default     = false;
+            name        = "Use Maria Explanations (Experimental)";
+            category    = "Developer Settings";
+            description =
+  "Set to true to show \"Explain...\" links (experimental) by error messages.";
         },
         {
             property    = useDailyMissions;