improving synthax for error reports. Handling case where no error was thrown during the target execution

3 files changed, 13 insertions, 3 deletions

diff --git a/src/main/java/org/schemaspy/DBFuzzer.java b/src/main/java/org/schemaspy/DBFuzzer.java
index e4071c1..f9b5c86 100755
--- a/src/main/java/org/schemaspy/DBFuzzer.java
+++ b/src/main/java/org/schemaspy/DBFuzzer.java
@@ -224,7 +224,10 @@ public class DBFuzzer
                     mutationReport.parseFile("errorReports/parsedStackTrace_" + currentMutation.getId()); // initialises the reportVector stacktrace
                     mutationReport.setStackTraceHash(mutationReport.hashStackTrace(mutationTree));
                     currentMutation.setReportVector(mutationReport);
-                    mark = new Scorer().score(currentMutation, mutationTree);
+                    if(currentMutation.getReportVector().isErrorTriggered() == true)
+                        mark = new Scorer().score(currentMutation, mutationTree);
+                    else
+                        mark = 0;
                     currentMutation.setInterest_mark(mark);
                     currentMutation.setWeight(mark);
                     currentMutation.propagateWeight();
diff --git a/src/main/java/org/schemaspy/model/ReportVector.java b/src/main/java/org/schemaspy/model/ReportVector.java
index ba41bd9..95519b9 100755
--- a/src/main/java/org/schemaspy/model/ReportVector.java
+++ b/src/main/java/org/schemaspy/model/ReportVector.java
@@ -7,6 +7,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class ReportVector {
+    private boolean errorTriggered;
     private ArrayList<StackTraceLine> stackTrace;
     private double[] stackTraceHash;
     private int codeCoverage; //unused right now
@@ -14,10 +15,15 @@ public class ReportVector {
 
     public ReportVector(GenericTreeNode parentMutation)
     {
+        this.errorTriggered = false;
         this.parentMutation = parentMutation;
         stackTrace = new ArrayList<StackTraceLine>();
     }
 
+    public boolean isErrorTriggered() { return errorTriggered; }
+
+    public void setErrorTriggered(boolean errorTriggered) {this.errorTriggered = errorTriggered; }
+
     public double[] getStackTraceHash() { return stackTraceHash; }
 
     public void setStackTraceHash(double[] stackTraceHash) { this.stackTraceHash = stackTraceHash; }
@@ -61,6 +67,7 @@ public class ReportVector {
 
         try {
             BufferedReader infile = new BufferedReader(new FileReader(pathToFile));
+            if((data = infile.readLine()) != null && data.equals("0"))
             while ((data = infile.readLine()) != null) {
                 if (data.contains(":"))
                 {
@@ -74,7 +81,7 @@ public class ReportVector {
                     currentArray.add(data.replace(",",""));
                 }
             }
-
+            this.errorTriggered = true;
             storeLines(allLists);
         }
         catch(Exception e)
diff --git a/src/main/java/org/schemaspy/model/SingleChange.java b/src/main/java/org/schemaspy/model/SingleChange.java
index 53951a9..a4a0e01 100755
--- a/src/main/java/org/schemaspy/model/SingleChange.java
+++ b/src/main/java/org/schemaspy/model/SingleChange.java
@@ -55,7 +55,7 @@ public class SingleChange
     @Override
    public String toString()
    {
-     return "\n[SG - attachedToMutation : "+this.getAttachedToMutation().getId()+" | parentTable : "+this.getParentTableColumn().getTable()+" | parentTableColumn : "+this.getParentTableColumn().toString()+" | OV : "+oldValue+" | NV : "+newValue+" ]\n";
+     return "\n[SG - attachedToMutation : "+this.getAttachedToMutation().getId()+" | parentTable : "+this.getParentTableColumn().getTable()+" | parentTableColumn : "+this.getParentTableColumn().getName().toString()+" | OV : "+oldValue+" | NV : "+newValue+" ]\n";
    }
 
    public Object getOldValue()