Changes in the pattern of Uncategorized Exception Error (#552)

diff --git a/framework/src/main/java/org/apache/drill/test/framework/DrillTestDefaults.java b/framework/src/main/java/org/apache/drill/test/framework/DrillTestDefaults.java
index f160aee..4f2b2f1 100644
--- a/framework/src/main/java/org/apache/drill/test/framework/DrillTestDefaults.java
+++ b/framework/src/main/java/org/apache/drill/test/framework/DrillTestDefaults.java
@@ -119,7 +119,7 @@
        SYSTEM_ERROR_ILLEGAL_ARGUMENT_EXCEPTION,
        SYSTEM_ERROR_CHANNEL_CLOSED_EXCEPTION,
        NULL_POINTER_EXCEPTION, 
-       UNCATEGORIZED_ERROR;
+       UNCATEGORIZED;
   }
 
   public static final String DRILL_EXCEPTION_REGEXES[] = { "Schema \\[.*\\] is not valid with respect to either root schema or current default schema.*",
diff --git a/framework/src/main/java/org/apache/drill/test/framework/TestDriver.java b/framework/src/main/java/org/apache/drill/test/framework/TestDriver.java
index 5e376f1..31a8960 100644
--- a/framework/src/main/java/org/apache/drill/test/framework/TestDriver.java
+++ b/framework/src/main/java/org/apache/drill/test/framework/TestDriver.java
@@ -372,7 +372,9 @@
 	       regexFound = true;
 	       int index = Arrays.asList(DrillTestDefaults.DRILL_EXCEPTION_REGEXES).indexOf(regexStr);
 	       if(executionFailureExceptions.size()==0){
-	         executionFailureExceptions.add(new ArrayList<DrillTest>());
+                 List newList = new ArrayList<DrillTest>();
+                 newList.add(test);
+                 executionFailureExceptions.add(newList);
                }
 	       else if(executionFailureExceptions.get(index)==null){
                  List listAtIndex = new ArrayList<DrillTest>();
@@ -389,8 +391,10 @@
 
           }
 	if(regexFound == false){
-          executionFailureExceptions.add(new ArrayList<DrillTest>());
-	}
+          List newList = executionFailureExceptions.get(DrillTestDefaults.DRILL_EXCEPTION_REGEXES.length-1);
+          newList.add(test);
+          executionFailureExceptions.set(DrillTestDefaults.DRILL_EXCEPTION_REGEXES.length-1,newList);
+        }
         }
       }
 
@@ -448,16 +452,17 @@
             else if(executionFailureExceptions.get(ii)!=null && executionFailureExceptions.get(ii).size()!=0){
               if(ii<DrillTestDefaults.DRILL_EXCEPTION.VALIDATION_ERROR_INVALID_SCHEMA.values().length){
                 if(ii==0)
-                  LOG.info("CATEGORY - "+DrillTestDefaults.DRILL_EXCEPTION.VALIDATION_ERROR_INVALID_SCHEMA.values()[ii]+" count("+executionFailureExceptions.get(ii).size()+")");
+                  LOG.info("CATEGORY - "+DrillTestDefaults.DRILL_EXCEPTION.VALIDATION_ERROR_INVALID_SCHEMA.values()[ii]+" ("+executionFailureExceptions.get(ii).size()+")");
+                else if(ii<executionFailureExceptions.size()-1)
+                  LOG.info("\nCATEGORY - "+DrillTestDefaults.DRILL_EXCEPTION.VALIDATION_ERROR_INVALID_SCHEMA.values()[ii]+" ("+executionFailureExceptions.get(ii).size()+")");
                 else
-                  LOG.info("\nCATEGORY - "+DrillTestDefaults.DRILL_EXCEPTION.VALIDATION_ERROR_INVALID_SCHEMA.values()[ii]+" count("+executionFailureExceptions.get(ii).size()+")");
-                  
+                  LOG.info("\n"+DrillTestDefaults.DRILL_EXCEPTION.VALIDATION_ERROR_INVALID_SCHEMA.values()[ii]+" ("+executionFailureExceptions.get(ii).size()+")");  
               }
               else{ 
                 if(ii==0)
-                  LOG.info("UNCATEGORIZED: "+(ii-DrillTestDefaults.DRILL_EXCEPTION.VALIDATION_ERROR_INVALID_SCHEMA.values().length+1)+" count("+executionFailureExceptions.get(ii).size()+")");
+                  LOG.info("UNCATEGORIZED "+(ii-DrillTestDefaults.DRILL_EXCEPTION.VALIDATION_ERROR_INVALID_SCHEMA.values().length+1)+"("+executionFailureExceptions.get(ii).size()+")");
                 else
-                  LOG.info("\nUNCATEGORIZED: "+(ii-DrillTestDefaults.DRILL_EXCEPTION.VALIDATION_ERROR_INVALID_SCHEMA.values().length+1)+" count("+executionFailureExceptions.get(ii).size()+")");
+                  LOG.info("\nUNCATEGORIZED "+(ii-DrillTestDefaults.DRILL_EXCEPTION.VALIDATION_ERROR_INVALID_SCHEMA.values().length+1)+"("+executionFailureExceptions.get(ii).size()+")");
               }
               for(DrillTest t:executionFailureExceptions.get(ii)){
                 LOG.info(t.getInputFile());