Fixed bug in ErrorMapper module, many other minor changes

Author: s-edwards

.classpath

@@ -4,5 +4,8 @@
 	<classpathentry kind="lib" path="src/JavaTddPluginSupport.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ant"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="src/gzoltar/gzoltar-0.0.10.jar"/>
+	<classpathentry kind="lib" path="src/gzoltar/javaparser-core-2.2.1.jar"/>
+	<classpathentry kind="lib" path="src/gzoltar/log4j-1.2.17.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Properties

@@ -1,5 +1,5 @@
 #This file is automatically rewritten by ANT.  Hand-edits may be lost.
-#Sun Jul 29 13:35:09 GMT-05:00 2018
+#Sat Apr 20 13:24:36 GMT-05:00 2019
 version.minor=1
 timeoutMultiplier=2
 license.url="http\://www.gnu.org/licenses/agpl.html"
@@ -11,10 +11,10 @@ interpreter.prefix="${PerlForPlugins.perl.exe}"
 languages=( { name \= Java; version \= 1.4
 autoPublish=true
 version.major=4
-version.date=20180729
+version.date=20190420
 timeoutInternalPadding=400
 provider="Virginia Tech Computer Science"
 authorUid=edwards
 provider.url="http\://web-cat.org/updates"
-version.revision=1
+version.revision=2
 name="JavaTddPlugin"

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

@@ -246,6 +246,10 @@ else if (result.code == 10)
             // Look for explicit hint first
             if (hint == null
                 && result.message != null
+                && (result.code == 29
+                    || result.code == 30
+                    || result.level == 2
+                    || result.message.toLowerCase().startsWith("hint:"))
                 && !Pattern.compile("In file .*( which reads|on this line):")
                     .matcher(result.message).find()
                 /* && result.message.matches(HINT_MARKER_PLUS_ALL_RE) */)
@@ -323,7 +327,7 @@ else if (result.code == 10)
             }
 
             // Generate output for hint feedback
-            System.out.println(currentSuite + ", hint = " + hint);
+            // System.out.println(currentSuite + ", hint = " + hint);
             if (output != null && hint != null)
             {
                 synchronized (output)
@@ -333,7 +337,33 @@ else if (result.code == 10)
                     outBuffer.append(", ");
                     outBuffer.append(result.priority);
                     outBuffer.append(", ");
-                    outBuffer.append(perlStringLiteral(hint));
+//                    outBuffer.append(result.code);
+//                    outBuffer.append(", ");
+//                    outBuffer.append(result.level);
+//                    outBuffer.append(", ");
+//                    if (hint == null)
+//                    {
+//                        outBuffer.append(" undef");
+//                    }
+//                    else
+//                    {
+                        outBuffer.append(perlStringLiteral(hint));
+//                    }
+//                    if (result.error == null)
+//                    {
+//                        outBuffer.append(", undef");
+//                    }
+//                    else
+//                    {
+//                        Throwable t = result.error;
+//                        while (t.getCause() != null)
+//                        {
+//                            t = t.getCause();
+//                        }
+//                        outBuffer.append(", '");
+//                        outBuffer.append(t.getClass().getName());
+//                        outBuffer.append("'");
+//                    }
                     if ( traceMsg == null )
                     {
                         outBuffer.append( ", undef);" );

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

@@ -320,7 +320,7 @@ else if (actual.length() > MAX_MSG_LENGTH)
      */
     protected void formatTestResultAsPlist(Test test, Throwable error)
     {
-        formatTestResultAsPlist( describe(test, error));
+        formatTestResultAsPlist(describe(test, error));
     }
 
 
@@ -343,6 +343,15 @@ private void appendResults(String str)
     // ----------------------------------------------------------
     private void appendResultsQuotedValue(String str)
     {
+        if (str == null)
+        {
+            str = "";
+        }
+        if (str.length() > 1024)
+        {
+            str = str.substring(0, 1024) + "...";
+        }
+
         testResultsPlist.append('"');
         testResultsPlist.append(str.replace("\"", "\\\""));
         testResultsPlist.append('"');