svn commit: r691334 - in /velocity/engine/trunk/src/test/org/apache/velocity/test: ResourceExistsTestCase.java ResourceLoaderInstanceTestCase.java

[nbubna]

Author: nbubna
Date: Tue Sep  2 11:10:41 2008
New Revision: 691334

URL: http://svn.apache.org/viewvc?rev=691334&view=rev
Log:
more gump wrangling

Modified:
    
velocity/engine/trunk/src/test/org/apache/velocity/test/ResourceExistsTestCase.java
    
velocity/engine/trunk/src/test/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java

Modified: 
velocity/engine/trunk/src/test/org/apache/velocity/test/ResourceExistsTestCase.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/ResourceExistsTestCase.java?rev=691334&r1=691333&r2=691334&view=diff
==============================================================================
--- 
velocity/engine/trunk/src/test/org/apache/velocity/test/ResourceExistsTestCase.java
 (original)
+++ 
velocity/engine/trunk/src/test/org/apache/velocity/test/ResourceExistsTestCase.java
 Tue Sep  2 11:10:41 2008
@@ -20,9 +20,7 @@
  */
 
 import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.log.NullLogChute;
 import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.resource.loader.FileResourceLoader;
 import org.apache.velocity.runtime.resource.loader.StringResourceLoader;
 import org.apache.velocity.test.misc.TestLogChute;
 
@@ -45,9 +43,8 @@
     public void setUp() throws Exception
     {
         velocity = new VelocityEngine();
-        velocity.addProperty("resource.loader", "myfile,string");
-        velocity.setProperty("myfile.resource.loader.class", 
FileResourceLoader.class.getName());
-        velocity.setProperty("myfile.resource.loader.path", path);
+        velocity.setProperty("resource.loader", "file,string");
+        velocity.setProperty("file.resource.loader.path", path);
         velocity.setProperty("string.resource.loader.class", 
StringResourceLoader.class.getName());
 
         // actual instance of logger

Modified: 
velocity/engine/trunk/src/test/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java?rev=691334&r1=691333&r2=691334&view=diff
==============================================================================
--- 
velocity/engine/trunk/src/test/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java
 (original)
+++ 
velocity/engine/trunk/src/test/org/apache/velocity/test/ResourceLoaderInstanceTestCase.java
 Tue Sep  2 11:10:41 2008
@@ -30,8 +30,9 @@
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
+import org.apache.velocity.runtime.RuntimeConstants;
 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.FileResourceLoader;
 import org.apache.velocity.runtime.resource.loader.ResourceLoader;
 
@@ -74,6 +75,8 @@
      */
     private static final String COMPARE_DIR = TEST_COMPARE_DIR + 
"/resourceinstance/compare";
 
+    private TestLogChute logger = new TestLogChute();
+
     /**
      * Default constructor.
      */
@@ -89,12 +92,14 @@
         ResourceLoader rl = new FileResourceLoader();
 
         // pass in an instance to Velocity
-        Velocity.addProperty( "resource.loader", "testrl" );
+        Velocity.setProperty( "resource.loader", "testrl" );
         Velocity.setProperty( "testrl.resource.loader.instance", rl );
         Velocity.setProperty( "testrl.resource.loader.path", 
FILE_RESOURCE_LOADER_PATH );
 
-        Velocity.setProperty(
-                Velocity.RUNTIME_LOG_LOGSYSTEM_CLASS, 
NullLogChute.class.getName());
+        // actual instance of logger
+        logger.on();
+        Velocity.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM, logger);
+        Velocity.setProperty("runtime.log.logsystem.test.level", "debug");
 
         Velocity.init();
     }
@@ -111,7 +116,6 @@
             throws Exception
     {
 //caveman hacks to get gump to give more info
-System.out.println("Began resource loader instance test");
 try
 {
         assureResultsDirectoryExists(RESULTS_DIR);
@@ -139,6 +143,7 @@
 }
 catch (Exception e)
 {
+    System.out.println("Log was: "+logger.getLog());
     System.out.println(e);
     e.printStackTrace();
 }
@@ -154,9 +159,10 @@
                 "----Expected----\n"+ compare +
                 "----------------";
             
-            fail(msg);
 //caveman hack to get gump to give more info
 System.out.println(msg);
+System.out.println("Log was: "+logger.getLog());
+            fail(msg);
         }
     }
 }