refactored UniversalTestSuite

Author: isidore

build/properties/approvaltests.properties

@@ -2,7 +2,7 @@ home=C:/Users/Llewellyn/Documents/GitHub/ApprovalTests.Java
 src=${home}/java
 build_home=C:/temp/builds
 build=${build_home}/build
-targetJavaClass=org/approvaltests/**,com/spun/util/persistence/*,com/spun/util/Colors*, org/lambda/**,org/jrack/**
+targetJavaClass=org/approvaltests/**,com/spun/util/persistence/*,com/spun/util/Colors*, org/lambda/**,org/jrack/**,com/spun/util/UniversalTestSuite*
 jars=${src}/jars
 jar=${build}/ApprovalTests.jar
 zip=${build}/ApprovalTests.013.zip

java/com/spun/util/tests/UniversalTestSuite.java renamed to java/com/spun/util/UniversalTestSuite.java

@@ -1,12 +1,11 @@
-package com.spun.util.tests;
+package com.spun.util;
 
 import java.lang.reflect.InvocationTargetException;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import com.spun.util.ObjectUtils;
 import com.spun.util.introspection.ClassGetter;
 
 public class UniversalTestSuite

java/com/spun/util/tests/UtilsTestSuite.java

@@ -1,5 +1,7 @@
 package com.spun.util.tests;
 
+import com.spun.util.UniversalTestSuite;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
 

java/org/approvaltests/reporters/MultipleExceptions.java

@@ -20,7 +20,7 @@ public static void rethrowExceptions(ArrayList<Throwable> exceptions) throws Exc
     {
       return;
     }
-    else if (exceptions.size() == 0)
+    else if (exceptions.size() == 1)
     {
       Throwable t = exceptions.get(0);
       if (t instanceof Exception) { throw ((Exception) t); }

java/org/approvaltests/tests/TestApprovals.java

@@ -3,7 +3,7 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import com.spun.util.tests.UniversalTestSuite;
+import com.spun.util.UniversalTestSuite;
 
 public class TestApprovals extends TestSuite
 {