velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nbu...@apache.org
Subject svn commit: r704299 - in /velocity/engine/trunk/src/test/org/apache/velocity/test: ./ issues/ sql/ util/introspection/
Date Tue, 14 Oct 2008 03:13:17 GMT
Author: nbubna
Date: Mon Oct 13 20:13:16 2008
New Revision: 704299

URL: http://svn.apache.org/viewvc?rev=704299&view=rev
Log:
testcase fall cleaning (use TestLogChute, don't be so noisy, beware java 5-ism's

Modified:
    velocity/engine/trunk/src/test/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/ArrayMethodsTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/BaseEvalTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/BuiltInEventHandlerTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/ClasspathResourceTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/ContextSafetyTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/EncodingTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/ForeachTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/IncludeEventHandlingTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/InlineScopeVMTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/Introspector2TestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/MethodInvocationExceptionTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/MultiLoaderTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/MultipleFileResourcePathTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/ParseWithMacroLibsTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/StrictMathTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/StrictReferenceTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/StringResourceLoaderTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/TemplateTestSuite.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/VMLibraryTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/VelocimacroTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/VelocityAppTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity285TestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity537TestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity580TestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity627TestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/util/introspection/ClassMapTestCase.java

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/AbsoluteFileResourceLoaderTestCase.java Mon Oct 13 20:13:16 2008
@@ -30,7 +30,7 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 
 /**
  * Test use of an absolute path with the FileResourceLoader
@@ -88,7 +88,7 @@
                 Velocity.FILE_RESOURCE_LOADER_PATH, "");
 
             Velocity.setProperty(
-                    Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                    Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
             Velocity.init();
         }

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/ArrayMethodsTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/ArrayMethodsTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/ArrayMethodsTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/ArrayMethodsTestCase.java Mon Oct 13 20:13:16 2008
@@ -31,7 +31,7 @@
  */
 public class ArrayMethodsTestCase extends BaseEvalTestCase
 {
-    private final static boolean PRINT_RESULTS = true;
+    private final static boolean PRINT_RESULTS = false;
 
     public ArrayMethodsTestCase(final String name)
     {

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/BaseEvalTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/BaseEvalTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/BaseEvalTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/BaseEvalTestCase.java Mon Oct 13 20:13:16 2008
@@ -99,6 +99,10 @@
     {
         try
         {
+            if (!DEBUG)
+            {
+                log.off();
+            }
             evaluate(evil);
             fail("Template '"+evil+"' should have thrown an exception.");
         }
@@ -109,6 +113,13 @@
                 fail("Was expecting template '"+evil+"' to throw "+exceptionType+" not "+e);
             }
         }
+        finally
+        {
+            if (!DEBUG)
+            {
+                log.on();
+            }
+        }
     }
 
     protected String evaluate(String template)

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/BuiltInEventHandlerTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/BuiltInEventHandlerTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/BuiltInEventHandlerTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/BuiltInEventHandlerTestCase.java Mon Oct 13 20:13:16 2008
@@ -52,6 +52,7 @@
  */
 public class BuiltInEventHandlerTestCase extends BaseTestCase {
 
+    protected boolean DEBUG = false;
 
     /**
     * VTL file extension.
@@ -102,7 +103,13 @@
        return new TestSuite(BuiltInEventHandlerTestCase.class);
     }
 
-
+    protected void log(String out)
+    {
+        if (DEBUG)
+        {
+            System.out.println (out);
+        }
+    }
 
     /**
      * Test reporting of invalid syntax
@@ -130,7 +137,7 @@
         assertEquals("$c1",((InvalidReferenceInfo) errors.get(0)).getInvalidReference());
         assertEquals("$a1.foobar()",((InvalidReferenceInfo) errors.get(1)).getInvalidReference());
 
-        System.out.println("Caught invalid references (local configuration).");
+        log("Caught invalid references (local configuration).");
     }
 
     public void testReportInvalidReferences2() throws Exception
@@ -157,7 +164,7 @@
         } catch (RuntimeException E) {}
 
 
-        System.out.println("Caught invalid references (global configuration).");
+        log("Caught invalid references (global configuration).");
 
     }
 
@@ -172,7 +179,7 @@
         assertEquals("&lt;&quot;&gt;",esc.referenceInsert("","<\">"));
         assertEquals("test string",esc.referenceInsert("","test string"));
 
-        System.out.println("Correctly escaped HTML");
+        log("Correctly escaped HTML");
 
     }
 
@@ -188,7 +195,7 @@
         assertEquals("&apos;",esc.referenceInsert("","'"));
         assertEquals("test string",esc.referenceInsert("","test string"));
 
-        System.out.println("Correctly escaped XML");
+        log("Correctly escaped XML");
 
     }
 
@@ -202,7 +209,7 @@
         assertEquals("Jimmy''s Pizza",esc.referenceInsert("","Jimmy's Pizza"));
         assertEquals("test string",esc.referenceInsert("","test string"));
 
-        System.out.println("Correctly escaped SQL");
+        log("Correctly escaped SQL");
 
     }
 
@@ -217,7 +224,7 @@
         assertEquals("test string",esc.referenceInsert("","test string"));
 
 
-        System.out.println("Correctly escaped Javascript");
+        log("Correctly escaped Javascript");
     }
 
     /**
@@ -247,7 +254,7 @@
         ve.evaluate(context,writer,"test","$bold.substring(0,1)");
         assertEquals("&lt;",writer.toString());
 
-        System.out.println("Escape matched all references (global configuration)");
+        log("Escape matched all references (global configuration)");
 
     }
 
@@ -290,7 +297,7 @@
 
         **/
         
-        System.out.println("Escape selected references (global configuration)");
+        log("Escape selected references (global configuration)");
 
         
 
@@ -347,7 +354,7 @@
         assertTrue(writer.toString().indexOf("IndexOutOfBoundsException") != -1);
         assertTrue(writer.toString().indexOf("ArrayList") != -1);
 
-        System.out.println("PrintException handler successful.");
+        log("PrintException handler successful.");
 
     }
 
@@ -380,7 +387,7 @@
             fail("Output incorrect.");
         }
 
-        System.out.println("IncludeNotFound handler successful.");
+        log("IncludeNotFound handler successful.");
 
     }
 
@@ -413,7 +420,7 @@
             fail("Output incorrect.");
         }
 
-        System.out.println("IncludeRelativePath handler successful.");
+        log("IncludeRelativePath handler successful.");
 
     }
 }

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/ClasspathResourceTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/ClasspathResourceTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/ClasspathResourceTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/ClasspathResourceTestCase.java Mon Oct 13 20:13:16 2008
@@ -31,7 +31,7 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 
 /**
  * Load templates from the Classpath.
@@ -99,7 +99,7 @@
                 "2");
 
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         Velocity.init();
     }

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/ContextSafetyTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/ContextSafetyTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/ContextSafetyTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/ContextSafetyTestCase.java Mon Oct 13 20:13:16 2008
@@ -32,7 +32,7 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 
 /**
  * Tests if we are context safe : can we switch objects in the context
@@ -61,7 +61,7 @@
                 Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH);
 
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         Velocity.init();
     }

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/EncodingTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/EncodingTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/EncodingTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/EncodingTestCase.java Mon Oct 13 20:13:16 2008
@@ -30,7 +30,7 @@
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 
 /**
  * Tests input encoding handling.  The input target is UTF-8, having
@@ -58,7 +58,7 @@
         Velocity.setProperty( Velocity.INPUT_ENCODING, "UTF-8" );
 
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         Velocity.init();
     }

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/ForeachTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/ForeachTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/ForeachTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/ForeachTestCase.java Mon Oct 13 20:13:16 2008
@@ -29,7 +29,7 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 import org.apache.velocity.test.provider.ForeachMethodCallHelper;
 
 /**
@@ -55,7 +55,7 @@
                              new Integer(3));
 
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         Velocity.init();
 

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/IncludeEventHandlingTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/IncludeEventHandlingTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/IncludeEventHandlingTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/IncludeEventHandlingTestCase.java Mon Oct 13 20:13:16 2008
@@ -35,7 +35,7 @@
 import org.apache.velocity.context.Context;
 import org.apache.velocity.runtime.RuntimeServices;
 import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 import org.apache.velocity.util.RuntimeServicesAware;
 
 /**
@@ -102,7 +102,7 @@
             Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH);
 
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         Velocity.init();
 

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/InlineScopeVMTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/InlineScopeVMTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/InlineScopeVMTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/InlineScopeVMTestCase.java Mon Oct 13 20:13:16 2008
@@ -31,7 +31,7 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 
 /**
  * Tests if the VM template-locality is working.
@@ -65,7 +65,7 @@
             Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH);
         
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         Velocity.init();
     }

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/Introspector2TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/Introspector2TestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/Introspector2TestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/Introspector2TestCase.java Mon Oct 13 20:13:16 2008
@@ -26,7 +26,7 @@
 
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 
 /**
  * Test case for the Velocity Introspector which
@@ -61,7 +61,7 @@
             throws Exception
     {
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         Velocity.init();
 

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/MethodInvocationExceptionTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/MethodInvocationExceptionTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/MethodInvocationExceptionTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/MethodInvocationExceptionTestCase.java Mon Oct 13 20:13:16 2008
@@ -28,7 +28,7 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 
 /**
  * Tests if we can hand Velocity an arbitrary class for logging.
@@ -38,7 +38,9 @@
  */
 public class MethodInvocationExceptionTestCase extends TestCase
 {
-   /**
+    protected boolean DEBUG = false;
+
+    /**
      * Default constructor.
      * @param name
      */
@@ -55,7 +57,7 @@
          */
 
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         Velocity.init();
     }
@@ -65,6 +67,15 @@
         return new TestSuite(MethodInvocationExceptionTestCase.class);
     }
 
+    protected void log(String out)
+    {
+        Velocity.getLog().debug(out);
+        if (DEBUG)
+        {
+            System.out.println(out);
+        }
+    }
+
     /**
      * Runs the test :
      *
@@ -91,16 +102,16 @@
         }
         catch( MethodInvocationException mie )
         {
-            System.out.println("Caught MIE (good!) :" );
-            System.out.println("  reference = " + mie.getReferenceName() );
-            System.out.println("  method    = " + mie.getMethodName() );
+            log("Caught MIE (good!) :" );
+            log("  reference = " + mie.getReferenceName() );
+            log("  method    = " + mie.getMethodName() );
 
             Throwable t = mie.getWrappedThrowable();
-            System.out.println("  throwable = " + t );
+            log("  throwable = " + t );
 
             if( t instanceof Exception)
             {
-                System.out.println("  exception = " + ( (Exception) t).getMessage() );
+                log("  exception = " + ( (Exception) t).getMessage() );
             }
         }
     }
@@ -128,16 +139,16 @@
         }
         catch( MethodInvocationException mie )
         {
-            System.out.println("Caught MIE (good!) :" );
-            System.out.println("  reference = " + mie.getReferenceName() );
-            System.out.println("  method    = " + mie.getMethodName() );
+            log("Caught MIE (good!) :" );
+            log("  reference = " + mie.getReferenceName() );
+            log("  method    = " + mie.getMethodName() );
 
             Throwable t = mie.getWrappedThrowable();
-            System.out.println("  throwable = " + t );
+            log("  throwable = " + t );
 
             if( t instanceof Exception)
             {
-                System.out.println("  exception = " + ( (Exception) t).getMessage() );
+                log("  exception = " + ( (Exception) t).getMessage() );
             }
         }
     }
@@ -160,16 +171,16 @@
         }
         catch( MethodInvocationException mie )
         {
-            System.out.println("Caught MIE (good!) :" );
-            System.out.println("  reference = " + mie.getReferenceName() );
-            System.out.println("  method    = " + mie.getMethodName() );
+            log("Caught MIE (good!) :" );
+            log("  reference = " + mie.getReferenceName() );
+            log("  method    = " + mie.getMethodName() );
 
             Throwable t = mie.getWrappedThrowable();
-            System.out.println("  throwable = " + t );
+            log("  throwable = " + t );
 
             if( t instanceof Exception)
             {
-                System.out.println("  exception = " + ( (Exception) t).getMessage() );
+                log("  exception = " + ( (Exception) t).getMessage() );
             }
         }
     }
@@ -191,16 +202,16 @@
         }
         catch( MethodInvocationException mie )
         {
-            System.out.println("Caught MIE (good!) :" );
-            System.out.println("  reference = " + mie.getReferenceName() );
-            System.out.println("  method    = " + mie.getMethodName() );
+            log("Caught MIE (good!) :" );
+            log("  reference = " + mie.getReferenceName() );
+            log("  method    = " + mie.getMethodName() );
 
             Throwable t = mie.getWrappedThrowable();
-            System.out.println("  throwable = " + t );
+            log("  throwable = " + t );
 
             if( t instanceof Exception)
             {
-                System.out.println("  exception = " + ( (Exception) t).getMessage() );
+                log("  exception = " + ( (Exception) t).getMessage() );
             }
         }
     }
@@ -229,16 +240,16 @@
         }
         catch( MethodInvocationException mie )
         {
-            System.out.println("Caught MIE (good!) :" );
-            System.out.println("  reference = " + mie.getReferenceName() );
-            System.out.println("  method    = " + mie.getMethodName() );
+            log("Caught MIE (good!) :" );
+            log("  reference = " + mie.getReferenceName() );
+            log("  method    = " + mie.getMethodName() );
 
             Throwable t = mie.getWrappedThrowable();
-            System.out.println("  throwable = " + t );
+            log("  throwable = " + t );
 
             if( t instanceof Exception)
             {
-                System.out.println("  exception = " + ( (Exception) t).getMessage() );
+                log("  exception = " + ( (Exception) t).getMessage() );
             }
         }
         catch( Exception e)

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/MultiLoaderTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/MultiLoaderTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/MultiLoaderTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/MultiLoaderTestCase.java Mon Oct 13 20:13:16 2008
@@ -30,7 +30,7 @@
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 
 /**
  * Load templates from the Classpath.
@@ -126,7 +126,7 @@
 
 
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         Velocity.init();
     }

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/MultipleFileResourcePathTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/MultipleFileResourcePathTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/MultipleFileResourcePathTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/MultipleFileResourcePathTestCase.java Mon Oct 13 20:13:16 2008
@@ -31,7 +31,7 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 
 /**
  * Multiple paths in the file resource loader.
@@ -89,7 +89,7 @@
                 Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH2);
 
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         Velocity.init();
     }

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/ParseWithMacroLibsTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/ParseWithMacroLibsTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/ParseWithMacroLibsTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/ParseWithMacroLibsTestCase.java Mon Oct 13 20:13:16 2008
@@ -2,7 +2,7 @@
 
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.Template;
@@ -192,7 +192,7 @@
                 new Boolean(local));
         ve.setProperty("file.resource.loader.cache", new Boolean(cache));
         ve.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
         ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "file");
         ve.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH,
                 TEST_COMPARE_DIR + "/parsemacros");
@@ -221,7 +221,7 @@
                 Boolean.FALSE);
         ve1.setProperty("file.resource.loader.cache", Boolean.TRUE);
         ve1.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
         ve1.setProperty(RuntimeConstants.RESOURCE_LOADER, "file");
         ve1.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH,
                 TEST_COMPARE_DIR + "/parsemacros");
@@ -271,7 +271,7 @@
                 Boolean.FALSE);
         ve1.setProperty("file.resource.loader.cache", Boolean.TRUE);
         ve1.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
         ve1.setProperty(RuntimeConstants.RESOURCE_LOADER, "file");
         ve1.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH,
                 TEST_COMPARE_DIR + "/parsemacros");

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/StrictMathTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/StrictMathTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/StrictMathTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/StrictMathTestCase.java Mon Oct 13 20:13:16 2008
@@ -41,71 +41,46 @@
         context.put("zero", new Integer(0));
     }
 
-    public boolean nullmath(String operation)
+    protected void assertNullMathEx(String operation)
     {
-        try
-        {
-            evaluate("#set( $foo = $null "+operation+" $num )");
-            fail("Doing "+operation+" with $null left side should have thrown a MathException");
-        }
-        catch (MathException me)
-        {
-            // success!
-        }
-        try
-        {
-            evaluate("#set( $foo = $num "+operation+" $null )");
-            fail("Doing "+operation+" with $null right side should have thrown a MathException");
-            return false;
-        }
-        catch (MathException me)
-        {
-            // success!
-            return true;
-        }
-    }
-
-    public boolean imaginarymath(String operation)
-    {
-        try
-        {
-            evaluate("#set( $foo = $num "+operation+" $zero )");
-            fail("Doing "+operation+" with $zero right side should have thrown a MathException");
-            return false;
-        }
-        catch (MathException me)
-        {
-            // success!
-            return true;
-        }
+        String leftnull = "#set( $foo = $null "+operation+" $num )";
+        assertEvalException(leftnull, MathException.class);
+        String rightnull = "#set( $foo = $num "+operation+" $null )";
+        assertEvalException(rightnull, MathException.class);
+    }
+
+    protected void assertImaginaryMathEx(String operation)
+    {
+        String infinity = "#set( $foo = $num "+operation+" $zero )";
+        assertEvalException(infinity, MathException.class);
     }
    
 
     public void testAdd()
     {
-        assertTrue(nullmath("+"));
+        assertNullMathEx("+");
     }
 
     public void testSub()
     {
-        assertTrue(nullmath("-"));
+        assertNullMathEx("-");
     }
 
     public void testMul()
     {
-        assertTrue(nullmath("*"));
+        assertNullMathEx("*");
     }
 
     public void testMod()
     {
-        assertTrue(nullmath("%"));
-        assertTrue(imaginarymath("%"));
+        assertNullMathEx("%");
+        assertImaginaryMathEx("%");
     }
 
     public void testDiv()
     {
-        assertTrue(nullmath("/"));
-        assertTrue(imaginarymath("/"));
+        assertNullMathEx("/");
+        assertImaginaryMathEx("/");
     }
 
 }

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/StrictReferenceTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/StrictReferenceTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/StrictReferenceTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/StrictReferenceTestCase.java Mon Oct 13 20:13:16 2008
@@ -18,7 +18,7 @@
     public void setUp() throws Exception
     {
         super.setUp();
-        engine.setProperty(RuntimeConstants.RUNTIME_REFERENCES_STRICT, true);
+        engine.setProperty(RuntimeConstants.RUNTIME_REFERENCES_STRICT, Boolean.TRUE);
         context.put("NULL", null);
         context.put("bar", null);
         context.put("TRUE", Boolean.TRUE);

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/StringResourceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/StringResourceLoaderTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/StringResourceLoaderTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/StringResourceLoaderTestCase.java Mon Oct 13 20:13:16 2008
@@ -31,7 +31,7 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 import org.apache.velocity.runtime.resource.loader.StringResourceLoader;
 
 /**
@@ -75,7 +75,7 @@
         Velocity.addProperty("string.resource.loader.modificationCheckInterval", "1");
 
         // Silence the logger.
-        Velocity.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+        Velocity.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         Velocity.init();
     }

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/TemplateTestSuite.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/TemplateTestSuite.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/TemplateTestSuite.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/TemplateTestSuite.java Mon Oct 13 20:13:16 2008
@@ -25,7 +25,7 @@
 import junit.framework.TestSuite;
 
 import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 
 /**
  * Test suite for Templates.
@@ -51,7 +51,7 @@
                 Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH);
 
             Velocity.setProperty(
-                    Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                    Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
             Velocity.init();
 

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/VMLibraryTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/VMLibraryTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/VMLibraryTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/VMLibraryTestCase.java Mon Oct 13 20:13:16 2008
@@ -34,7 +34,7 @@
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 
 /**
  * Macro library inclution via the Template.merge method is tested using this
@@ -77,7 +77,7 @@
         ve1.setProperty("file.resource.loader.cache", Boolean.TRUE);
 
         ve1.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         ve1.setProperty(RuntimeConstants.RESOURCE_LOADER, "file");
         ve1.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH,
@@ -96,7 +96,7 @@
         ve2.setProperty("file.resource.loader.cache", Boolean.FALSE);
 
         ve2.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         ve2.setProperty(RuntimeConstants.RESOURCE_LOADER, "file");
         ve2.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH,

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/VelocimacroTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/VelocimacroTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/VelocimacroTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/VelocimacroTestCase.java Mon Oct 13 20:13:16 2008
@@ -28,7 +28,7 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.exception.MacroOverflowException;
 import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 
 /**
  * This class tests strange Velocimacro issues.
@@ -58,7 +58,7 @@
         Velocity.setProperty( Velocity.VM_PERM_INLINE_LOCAL, Boolean.TRUE);
         Velocity.setProperty( Velocity.VM_MAX_DEPTH, new Integer(5));
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
         Velocity.init();
     }
 

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/VelocityAppTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/VelocityAppTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/VelocityAppTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/VelocityAppTestCase.java Mon Oct 13 20:13:16 2008
@@ -26,7 +26,7 @@
 
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 
 /**
  * This class is intended to test the app.Velocity.java class.
@@ -53,7 +53,7 @@
                 Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH);
 
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         Velocity.init();
     }

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java Mon Oct 13 20:13:16 2008
@@ -28,7 +28,7 @@
 
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.runtime.RuntimeInstance;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 import org.apache.velocity.test.BaseTestCase;
 import org.apache.velocity.util.introspection.Introspector;
 
@@ -38,6 +38,8 @@
 public class VelTools66TestCase
         extends BaseTestCase
 {
+    protected static boolean DEBUG = false;
+
     public VelTools66TestCase(final String name)
             throws Exception
     {
@@ -53,13 +55,22 @@
             throws Exception
     {
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         Velocity.init();
         System.setSecurityManager(new TestSecurityManager());
 
     }
 
+    protected static void log(String out)
+    {
+        Velocity.getLog().debug(out);
+        if (DEBUG)
+        {
+            System.out.println(out);
+        }
+    }
+
     public void tearDown()
     {
         System.setSecurityManager(null);
@@ -117,7 +128,7 @@
 
         public void checkMemberAccess(final Class c, final int i)
         {
-            System.out.println("checkMemberAccess(" + c.getName() + ", " + i + ")");
+            log("checkMemberAccess(" + c.getName() + ", " + i + ")");
 
             if (c.equals(clazz))
             {
@@ -127,22 +138,22 @@
 
         public void checkRead(final String file)
         {
-            System.out.println("checkRead(" + file + ")");
+            log("checkRead(" + file + ")");
         }
 
         public void checkPackageAccess(final String s)
         {
-            System.out.println("checkPackageAccess(" + s + ")");
+            log("checkPackageAccess(" + s + ")");
         }
 
         public void checkPropertyAccess(final String s)
         {
-            System.out.println("checkPropertyAccess(" + s + ")");
+            log("checkPropertyAccess(" + s + ")");
         }
 
         public void checkPermission(final Permission p)
         {
-            System.out.println("checkPermission(" + p + ")");
+            log("checkPermission(" + p + ")");
         }
     }
 }

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity285TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity285TestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity285TestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity285TestCase.java Mon Oct 13 20:13:16 2008
@@ -31,8 +31,8 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.runtime.log.NullLogChute;
 import org.apache.velocity.test.BaseTestCase;
+import org.apache.velocity.test.misc.TestLogChute;
 
 /**
  * Test Case for <a href="https://issues.apache.org/jira/browse/VELOCITY-285">Velocity Issue 285</a>.
@@ -87,7 +87,7 @@
                 Velocity.FILE_RESOURCE_LOADER_PATH, TEMPLATE_DIR);
 
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         Velocity.init();
     }

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity537TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity537TestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity537TestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity537TestCase.java Mon Oct 13 20:13:16 2008
@@ -24,7 +24,7 @@
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 import org.apache.velocity.test.BaseTestCase;
 
 /**
@@ -76,7 +76,7 @@
         velocityEngine = new VelocityEngine();
         velocityEngine.addProperty(Velocity.FILE_RESOURCE_LOADER_PATH, TEMPLATE_DIR);
 
-        velocityEngine.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+        velocityEngine.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         velocityEngine.init();
     }

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity580TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity580TestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity580TestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity580TestCase.java Mon Oct 13 20:13:16 2008
@@ -23,7 +23,7 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 import org.apache.velocity.test.BaseTestCase;
 
 /**
@@ -73,7 +73,7 @@
 
         Velocity.addProperty(Velocity.FILE_RESOURCE_LOADER_PATH, TEMPLATE_DIR);
 
-        Velocity.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+        Velocity.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         Velocity.init();
     }

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity627TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity627TestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity627TestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity627TestCase.java Mon Oct 13 20:13:16 2008
@@ -37,7 +37,7 @@
     public void setUp() throws Exception
     {
         super.setUp();
-        engine.setProperty(RuntimeConstants.SKIP_INVALID_ITERATOR, false);
+        engine.setProperty(RuntimeConstants.SKIP_INVALID_ITERATOR, Boolean.FALSE);
     }
   
     public void test627()

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/sql/DataSourceResourceLoaderTestCase.java Mon Oct 13 20:13:16 2008
@@ -34,7 +34,7 @@
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.runtime.RuntimeSingleton;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 import org.apache.velocity.runtime.resource.loader.DataSourceResourceLoader;
 
 
@@ -110,7 +110,7 @@
         Velocity.setProperty( "ds.resource.loader.resource.timestampcolumn", "timestamp");
 
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
         Velocity.init();
     }

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/util/introspection/ChainedUberspectorsTestCase.java Mon Oct 13 20:13:16 2008
@@ -22,7 +22,7 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 import org.apache.velocity.util.introspection.*;
 import org.apache.velocity.test.BaseTestCase;
 import org.apache.velocity.VelocityContext;
@@ -48,7 +48,7 @@
     public void setUp()
             throws Exception
     {
-        Velocity.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+        Velocity.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
         Velocity.addProperty(Velocity.UBERSPECT_CLASSNAME,"org.apache.velocity.util.introspection.UberspectImpl");
         Velocity.addProperty(Velocity.UBERSPECT_CLASSNAME,"org.apache.velocity.test.util.introspection.ChainedUberspectorsTestCase$ChainedUberspector");
         Velocity.addProperty(Velocity.UBERSPECT_CLASSNAME,"org.apache.velocity.test.util.introspection.ChainedUberspectorsTestCase$LinkedUberspector");

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/util/introspection/ClassMapTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/util/introspection/ClassMapTestCase.java?rev=704299&r1=704298&r2=704299&view=diff
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/util/introspection/ClassMapTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/util/introspection/ClassMapTestCase.java Mon Oct 13 20:13:16 2008
@@ -24,7 +24,7 @@
 
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.runtime.log.Log;
-import org.apache.velocity.runtime.log.NullLogChute;
+import org.apache.velocity.test.misc.TestLogChute;
 import org.apache.velocity.test.BaseTestCase;
 import org.apache.velocity.util.introspection.ClassMap;
 
@@ -49,7 +49,7 @@
             throws Exception
     {
         Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, NullLogChute.class.getName());
+                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, TestLogChute.class.getName());
 
 	Velocity.init();
     }



Mime
View raw message