svn commit: r749684 - in /velocity/engine/trunk/src/test/org/apache/velocity/test: MacroForwardDefineTestCase.java misc/TestLogChute.java

[nbubna]

Author: nbubna
Date: Tue Mar  3 18:38:16 2009
New Revision: 749684

URL: http://svn.apache.org/viewvc?rev=749684&view=rev
Log:
don't suppress when capturing

Modified:
    
velocity/engine/trunk/src/test/org/apache/velocity/test/MacroForwardDefineTestCase.java
    
velocity/engine/trunk/src/test/org/apache/velocity/test/misc/TestLogChute.java

Modified: 
velocity/engine/trunk/src/test/org/apache/velocity/test/MacroForwardDefineTestCase.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/MacroForwardDefineTestCase.java?rev=749684&r1=749683&r2=749684&view=diff
==============================================================================
--- 
velocity/engine/trunk/src/test/org/apache/velocity/test/MacroForwardDefineTestCase.java
 (original)
+++ 
velocity/engine/trunk/src/test/org/apache/velocity/test/MacroForwardDefineTestCase.java
 Tue Mar  3 18:38:16 2009
@@ -81,12 +81,10 @@
         
Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_REFERENCE_LOG_INVALID,"true");
 
         // actual instance of logger
-        logger = new TestLogChute();
-        logger.off();
+        logger = new TestLogChute(true, false);
         Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM,logger);
         Velocity.setProperty(TestLogChute.TEST_LOGGER_LEVEL, "debug");
         Velocity.init();
-        // DEBUG = true;
     }
 
     public static Test suite()
@@ -101,9 +99,9 @@
         Template template = Velocity.getTemplate("macros.vm");
 
         // try to get only messages during merge
-        logger.on();
+        logger.startCapture();
         template.merge(context, new StringWriter());
-        logger.off();
+        logger.stopCapture();
 
         String resultLog = logger.getLog();
         if ( !isMatch(resultLog, COMPARE_DIR, "velocity.log", "cmp"))

Modified: 
velocity/engine/trunk/src/test/org/apache/velocity/test/misc/TestLogChute.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/misc/TestLogChute.java?rev=749684&r1=749683&r2=749684&view=diff
==============================================================================
--- 
velocity/engine/trunk/src/test/org/apache/velocity/test/misc/TestLogChute.java 
(original)
+++ 
velocity/engine/trunk/src/test/org/apache/velocity/test/misc/TestLogChute.java 
Tue Mar  3 18:38:16 2009
@@ -90,7 +90,7 @@
 
     public boolean isLevelEnabled(int level)
     {
-        return !suppress && super.isLevelEnabled(level);
+        return (!suppress || capture) && super.isLevelEnabled(level);
     }