jvanzyl 01/03/25 14:56:04
Modified: src/java/org/apache/velocity/test ClasspathResourceTest.java
MultiLoaderTestCase.java
MultipleFileResourcePathTest.java
Log:
- changing the way the tests set their config to match up with
the changes in the Configuration class.
Revision Changes Path
1.6 +2 -2
jakarta-velocity/src/java/org/apache/velocity/test/ClasspathResourceTest.java
Index: ClasspathResourceTest.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/ClasspathResourceTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ClasspathResourceTest.java 2001/03/19 22:38:57 1.5
+++ ClasspathResourceTest.java 2001/03/25 22:56:03 1.6
@@ -77,7 +77,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Dave Bryson</a>
- * @version $Id: ClasspathResourceTest.java,v 1.5 2001/03/19 22:38:57 jvanzyl Exp $
+ * @version $Id: ClasspathResourceTest.java,v 1.6 2001/03/25 22:56:03 jvanzyl Exp $
*/
public class ClasspathResourceTest extends BaseTestCase
{
@@ -124,7 +124,7 @@
* be in the default config file.
*/
- Velocity.setProperty(
+ Velocity.addProperty(
"classpath." + Velocity.RESOURCE_LOADER + ".class",
"org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
1.2 +2 -2
jakarta-velocity/src/java/org/apache/velocity/test/MultiLoaderTestCase.java
Index: MultiLoaderTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/MultiLoaderTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MultiLoaderTestCase.java 2001/03/19 23:47:12 1.1
+++ MultiLoaderTestCase.java 2001/03/25 22:56:03 1.2
@@ -77,7 +77,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Dave Bryson</a>
- * @version $Id: MultiLoaderTestCase.java,v 1.1 2001/03/19 23:47:12 jvanzyl Exp $
+ * @version $Id: MultiLoaderTestCase.java,v 1.2 2001/03/25 22:56:03 jvanzyl Exp $
*/
public class MultiLoaderTestCase extends BaseTestCase
{
@@ -132,7 +132,7 @@
Velocity.setProperty(
Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH);
- Velocity.setProperty(Velocity.RESOURCE_LOADER, "classpath");
+ Velocity.addProperty(Velocity.RESOURCE_LOADER, "classpath");
/*
* I don't think I should have to do this, these should
1.6 +3 -3
jakarta-velocity/src/java/org/apache/velocity/test/MultipleFileResourcePathTest.java
Index: MultipleFileResourcePathTest.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/MultipleFileResourcePathTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MultipleFileResourcePathTest.java 2001/03/19 22:38:58 1.5
+++ MultipleFileResourcePathTest.java 2001/03/25 22:56:03 1.6
@@ -77,7 +77,7 @@
* Multiple paths in the file resource loader.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: MultipleFileResourcePathTest.java,v 1.5 2001/03/19 22:38:58
jvanzyl Exp $
+ * @version $Id: MultipleFileResourcePathTest.java,v 1.6 2001/03/25 22:56:03
jvanzyl Exp $
*/
public class MultipleFileResourcePathTest extends BaseTestCase
{
@@ -129,10 +129,10 @@
{
assureResultsDirectoryExists(RESULTS_DIR);
- Velocity.setProperty(
+ Velocity.addProperty(
Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH1);
- Velocity.setProperty(
+ Velocity.addProperty(
Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH2);
Velocity.init();
