Author: henning
Date: Thu Sep 22 03:38:53 2005
New Revision: 290927
URL: http://svn.apache.org/viewcvs?rev=290927&view=rev
Log:
Update test directory references for maven driven unit tests.
Modified:
jakarta/velocity/core/trunk/project.properties
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/AnakiaTestCase.java
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/BuiltInEventHandlerTest.java
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/CommonsExtPropTestCase.java
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/ConfigurationTestCase.java
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/MultiLoaderTestCase.java
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TemplateTestBase.java
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TexenClasspathTestCase.java
jakarta/velocity/core/trunk/test/texen-classpath/jar-contents/service.props
jakarta/velocity/core/trunk/test/texen-classpath/test.jar
jakarta/velocity/core/trunk/test/texen/service.props
Modified: jakarta/velocity/core/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/project.properties?rev=290927&r1=290926&r2=290927&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/project.properties (original)
+++ jakarta/velocity/core/trunk/project.properties Thu Sep 22 03:38:53 2005
@@ -36,4 +36,6 @@
# No ideology without asking
maven.xdoc.developmentProcessUrl=
+# The unit tests load a number of templates from the test directory.
+maven.test.classpath=
${basedir}/test/cpload/test1.jar;${basedir}/test/cpload/test2.jar;${basedir}/test/multiloader/test1.jar
Modified:
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/AnakiaTestCase.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/AnakiaTestCase.java?rev=290927&r1=290926&r2=290927&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/AnakiaTestCase.java
(original)
+++
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/AnakiaTestCase.java
Thu Sep 22 03:38:53 2005
@@ -26,8 +26,8 @@
*/
public class AnakiaTestCase extends BaseTestCase
{
- private static final String COMPARE_DIR = "../test/anakia/compare";
- private static final String RESULTS_DIR = "../test/anakia/results";
+ private static final String COMPARE_DIR = "test/anakia/compare";
+ private static final String RESULTS_DIR = "target/test/anakia";
private static final String FILE_EXT = "html";
private static final String CONTEXT_FILE_EXT = "context.html";
Modified:
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/BuiltInEventHandlerTest.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/BuiltInEventHandlerTest.java?rev=290927&r1=290926&r2=290927&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/BuiltInEventHandlerTest.java
(original)
+++
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/BuiltInEventHandlerTest.java
Thu Sep 22 03:38:53 2005
@@ -65,17 +65,17 @@
* Path for templates. This property will override the
* value in the default velocity properties file.
*/
- private final static String FILE_RESOURCE_LOADER_PATH =
"../test/includeevent";
+ private final static String FILE_RESOURCE_LOADER_PATH = "test/includeevent";
/**
* Results relative to the build directory.
*/
- private static final String RESULTS_DIR = "../test/includeevent/results";
+ private static final String RESULTS_DIR = "test/includeevent/results";
/**
* Results relative to the build directory.
*/
- private static final String COMPARE_DIR = "../test/includeevent/compare";
+ private static final String COMPARE_DIR = "test/includeevent/compare";
/**
* Default constructor.
Modified:
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/CommonsExtPropTestCase.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/CommonsExtPropTestCase.java?rev=290927&r1=290926&r2=290927&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/CommonsExtPropTestCase.java
(original)
+++
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/CommonsExtPropTestCase.java
Thu Sep 22 03:38:53 2005
@@ -39,19 +39,19 @@
* Comparison directory.
*/
private static final String COMPARE_DIR =
- "../test/configuration/compare";
+ "test/configuration/compare";
/**
* Results directory.
*/
private static final String RESULTS_DIR =
- "../test/configuration/results";
+ "target/test/configuration";
/**
* Test configuration
*/
private static final String TEST_CONFIG =
- "../test/configuration/test.config";
+ "test/configuration/test.config";
/**
* Creates a new instance.
Modified:
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/ConfigurationTestCase.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/ConfigurationTestCase.java?rev=290927&r1=290926&r2=290927&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/ConfigurationTestCase.java
(original)
+++
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/ConfigurationTestCase.java
Thu Sep 22 03:38:53 2005
@@ -18,6 +18,7 @@
import java.io.FileWriter;
+
import java.util.Iterator;
import java.util.Vector;
@@ -37,19 +38,19 @@
* Comparison directory.
*/
private static final String COMPARE_DIR =
- "../test/configuration/compare";
+ "test/configuration/compare";
/**
* Results directory.
*/
private static final String RESULTS_DIR =
- "../test/configuration/results";
+ "target/test/configuration";
/**
* Test configuration
*/
private static final String TEST_CONFIG =
- "../test/configuration/test.config";
+ "test/configuration/test.config";
/**
* Creates a new instance.
Modified:
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/MultiLoaderTestCase.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/MultiLoaderTestCase.java?rev=290927&r1=290926&r2=290927&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/MultiLoaderTestCase.java
(original)
+++
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/MultiLoaderTestCase.java
Thu Sep 22 03:38:53 2005
@@ -60,18 +60,18 @@
/**
* Results relative to the build directory.
*/
- private static final String RESULTS_DIR = "../test/multiloader/results";
+ private static final String RESULTS_DIR = "target/test/multiloader";
/**
* Path for templates. This property will override the
* value in the default velocity properties file.
*/
- private final static String FILE_RESOURCE_LOADER_PATH =
"../test/multiloader";
+ private final static String FILE_RESOURCE_LOADER_PATH = "test/multiloader";
/**
* Results relative to the build directory.
*/
- private static final String COMPARE_DIR = "../test/multiloader/compare";
+ private static final String COMPARE_DIR = "test/multiloader/compare";
/**
* Default constructor.
Modified:
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TemplateTestBase.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TemplateTestBase.java?rev=290927&r1=290926&r2=290927&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TemplateTestBase.java
(original)
+++
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TemplateTestBase.java
Thu Sep 22 03:38:53 2005
@@ -45,7 +45,7 @@
* value in the default velocity properties file.
*/
public final static String FILE_RESOURCE_LOADER_PATH =
- "../test/templates";
+ "test/templates";
/**
* Properties file that lists which template tests to run.
@@ -57,7 +57,7 @@
* Results relative to the build directory.
*/
public final static String RESULT_DIR =
- FILE_RESOURCE_LOADER_PATH + "/results";
+ "target/test/templates";
/**
* Results relative to the build directory.
@@ -65,4 +65,4 @@
public final static String COMPARE_DIR =
FILE_RESOURCE_LOADER_PATH + "/compare";
-}
\ No newline at end of file
+}
Modified:
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TexenClasspathTestCase.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TexenClasspathTestCase.java?rev=290927&r1=290926&r2=290927&view=diff
==============================================================================
---
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TexenClasspathTestCase.java
(original)
+++
jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TexenClasspathTestCase.java
Thu Sep 22 03:38:53 2005
@@ -34,12 +34,12 @@
/**
* Directory where results are generated.
*/
- private static final String RESULTS_DIR =
"../test/texen-classpath/results";
+ private static final String RESULTS_DIR = "target/test/texen-classpath";
/**
* Directory where comparison output is stored.
*/
- private static final String COMPARE_DIR =
"../test/texen-classpath/compare";
+ private static final String COMPARE_DIR = "test/texen-classpath/compare";
/**
* Creates a new instance.
Modified:
jakarta/velocity/core/trunk/test/texen-classpath/jar-contents/service.props
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/texen-classpath/jar-contents/service.props?rev=290927&r1=290926&r2=290927&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/texen-classpath/jar-contents/service.props
(original)
+++ jakarta/velocity/core/trunk/test/texen-classpath/jar-contents/service.props
Thu Sep 22 03:38:53 2005
@@ -7,7 +7,7 @@
## will be available in the context
## as $license.
-license.file.contents = ../test/texen/license.txt
+license.file.contents = test/texen/license.txt
# Test some properties that have be give some boolean
# values.
Modified: jakarta/velocity/core/trunk/test/texen-classpath/test.jar
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/texen-classpath/test.jar?rev=290927&r1=290926&r2=290927&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/velocity/core/trunk/test/texen/service.props
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/test/texen/service.props?rev=290927&r1=290926&r2=290927&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/test/texen/service.props (original)
+++ jakarta/velocity/core/trunk/test/texen/service.props Thu Sep 22 03:38:53
2005
@@ -7,7 +7,7 @@
## will be available in the context
## as $license.
-license.file.contents = ../test/texen/license.txt
+license.file.contents = test/texen/license.txt
# Test some properties that have be give some boolean
# values.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
