svn commit: r447070 - in /jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test: ClasspathResourceTestCase.java MultiLoaderTestCase.java

[henning]

Author: henning
Date: Sun Sep 17 07:35:58 2006
New Revision: 447070

URL: http://svn.apache.org/viewvc?view=rev&rev=447070
Log:
Don't try to do name -> path conversions on templates that don't represent 
files.

Modified:
    
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ClasspathResourceTestCase.java
    
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/MultiLoaderTestCase.java

Modified: 
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ClasspathResourceTestCase.java
URL: 
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ClasspathResourceTestCase.java?view=diff&rev=447070&r1=447069&r2=447070
==============================================================================
--- 
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ClasspathResourceTestCase.java
 (original)
+++ 
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/ClasspathResourceTestCase.java
 Sun Sep 17 07:35:58 2006
@@ -113,8 +113,7 @@
          */
         assureResultsDirectoryExists(RESULTS_DIR);
 
-        Template template1 = RuntimeSingleton.getTemplate(
-            getFileName(null, "template/test1", TMPL_FILE_EXT));
+        Template template1 = RuntimeSingleton.getTemplate("template/test1." + 
TMPL_FILE_EXT);
 
         // Uncomment when http://jira.codehaus.org/browse/MPTEST-57 has been 
resolved
         //            Template template2 = RuntimeSingleton.getTemplate(

Modified: 
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/MultiLoaderTestCase.java
URL: 
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/MultiLoaderTestCase.java?view=diff&rev=447070&r1=447069&r2=447070
==============================================================================
--- 
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/MultiLoaderTestCase.java
 (original)
+++ 
jakarta/velocity/engine/trunk/src/test/org/apache/velocity/test/MultiLoaderTestCase.java
 Sun Sep 17 07:35:58 2006
@@ -148,14 +148,12 @@
         /*
          * Template to find with the classpath loader.
          */
-        Template template2 = Velocity.getTemplate(
-            getFileName(null, "template/test1", TMPL_FILE_EXT));
+        Template template2 = Velocity.getTemplate("template/test1." + 
TMPL_FILE_EXT);
 
         /*
          * Template to find with the jar loader
          */
-        Template template3 = Velocity.getTemplate(
-           getFileName(null, "template/test2", TMPL_FILE_EXT));
+        Template template3 = Velocity.getTemplate("template/test2." + 
TMPL_FILE_EXT);
 
         /*
          * and the results files



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]