You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@depot.apache.org by aj...@apache.org on 2004/04/12 18:39:23 UTC
svn commit: rev 9973 - in incubator/depot/trunk: common/src/test/org/apache/depot/common/junit update/src/test/org/apache/depot/update/ant/sandbox/chalko update/src/test/org/apache/depot/update/ant/task version/src/test/java/org/apache/depot/version/ant/available version/src/test/java/org/apache/depot/version/ant/constraint version/src/test/java/org/apache/depot/version/ant/environment version/src/test/java/org/apache/depot/version/ant/stamp
Author: ajack
Date: Mon Apr 12 11:39:22 2004
New Revision: 9973
Modified:
incubator/depot/trunk/common/src/test/org/apache/depot/common/junit/DepotBuildFileCase.java
incubator/depot/trunk/common/src/test/org/apache/depot/common/junit/DepotCase.java
incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/sandbox/chalko/UpdateSetTaskTest.java
incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/RepositoryToolTaskTests.java
incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/SynchronizeTaskTests.java
incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/available/VersionAvailableTaskTest.java
incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/available/available.xml
incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/ConstraintCheckTaskTest.java
incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/ConstraintGeneratorTaskTest.java
incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/constraint-check.xml
incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/constraint.xml
incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/environment/EnvironmentTaskTest.java
incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/environment/environment.xml
incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/VersionGeneratorTaskTest.java
incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/version.xml
Log:
More path change chasing...
Modified: incubator/depot/trunk/common/src/test/org/apache/depot/common/junit/DepotBuildFileCase.java
==============================================================================
--- incubator/depot/trunk/common/src/test/org/apache/depot/common/junit/DepotBuildFileCase.java (original)
+++ incubator/depot/trunk/common/src/test/org/apache/depot/common/junit/DepotBuildFileCase.java Mon Apr 12 11:39:22 2004
@@ -23,8 +23,7 @@
* @see junit.framework.TestCase#setUp()
*/
protected void setUp() throws Exception {
- super.setUp();
-
- Logger.testInit();
+ super.setUp();
+ //Logger.testInit();
}
}
Modified: incubator/depot/trunk/common/src/test/org/apache/depot/common/junit/DepotCase.java
==============================================================================
--- incubator/depot/trunk/common/src/test/org/apache/depot/common/junit/DepotCase.java (original)
+++ incubator/depot/trunk/common/src/test/org/apache/depot/common/junit/DepotCase.java Mon Apr 12 11:39:22 2004
@@ -29,8 +29,7 @@
* @see junit.framework.TestCase#setUp()
*/
protected void setUp() throws Exception {
- super.setUp();
-
- Logger.testInit();
+ super.setUp();
+ //Logger.testInit();
}
}
Modified: incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/sandbox/chalko/UpdateSetTaskTest.java
==============================================================================
--- incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/sandbox/chalko/UpdateSetTaskTest.java (original)
+++ incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/sandbox/chalko/UpdateSetTaskTest.java Mon Apr 12 11:39:22 2004
@@ -38,7 +38,7 @@
}
public void setUp() {
Logger.testInit();
- configureProject("update/src/test/org/apache/depot/update/ant/sandbox/chalko/build.xml");
+ configureProject("version/update/src/test/org/apache/depot/update/ant/sandbox/chalko/build.xml");
}
public void test1() {
executeTarget("test1");
Modified: incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/RepositoryToolTaskTests.java
==============================================================================
--- incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/RepositoryToolTaskTests.java (original)
+++ incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/RepositoryToolTaskTests.java Mon Apr 12 11:39:22 2004
@@ -38,7 +38,7 @@
}
public void setUp() {
- configureProject("src/test/org/apache/depot/update/ant/task/repotool.xml");
+ configureProject("version/src/test/org/apache/depot/update/ant/task/repotool.xml");
}
public void test1() {
Modified: incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/SynchronizeTaskTests.java
==============================================================================
--- incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/SynchronizeTaskTests.java (original)
+++ incubator/depot/trunk/update/src/test/org/apache/depot/update/ant/task/SynchronizeTaskTests.java Mon Apr 12 11:39:22 2004
@@ -41,7 +41,7 @@
}
public void setUp() {
- configureProject("src/test/org/apache/depot/update/ant/task/reposync.xml");
+ configureProject("version/src/test/org/apache/depot/update/ant/task/reposync.xml");
}
public void test1() {
Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/available/VersionAvailableTaskTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/available/VersionAvailableTaskTest.java (original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/available/VersionAvailableTaskTest.java Mon Apr 12 11:39:22 2004
@@ -29,7 +29,7 @@
}
public void setUp() {
- configureProject("src/test/ant/org/apache/version/ant/available/available.xml");
+ configureProject("version/src/test/java/org/apache/depot/version/ant/available/available.xml");
}
public void testExistence() {
Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/available/available.xml
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/available/available.xml (original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/available/available.xml Mon Apr 12 11:39:22 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
<project name="version-test" basedir="../../../../../../../.." default="testSimple">
- <taskdef resource="version"/>
+ <taskdef resource="depot-version-antlib.xml"/>
<target name="testExistence">
<version-available property="version.available" versionId="org.apache.version">
Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/ConstraintCheckTaskTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/ConstraintCheckTaskTest.java (original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/ConstraintCheckTaskTest.java Mon Apr 12 11:39:22 2004
@@ -30,7 +30,7 @@
}
public void setUp() {
- configureProject("src/test/ant/org/apache/version/ant/constraint/constraint-check.xml");
+ configureProject("version/src/test/org/apache/depot/version/ant/constraint/constraint-check.xml");
}
public void testSimple() {
Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/ConstraintGeneratorTaskTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/ConstraintGeneratorTaskTest.java (original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/ConstraintGeneratorTaskTest.java Mon Apr 12 11:39:22 2004
@@ -30,7 +30,7 @@
}
public void setUp() {
- configureProject("src/test/ant/org/apache/version/ant/constraint/constraint.xml");
+ configureProject("version/src/test/org/apache/depot/version/ant/constraint/constraint.xml");
}
public void testSimple() {
Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/constraint-check.xml
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/constraint-check.xml (original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/constraint-check.xml Mon Apr 12 11:39:22 2004
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<project name="constain-test" basedir="../../../../../../../.." default="testSimple">
- <taskdef resource="version"/>
+ <taskdef resource="depot-version-antlib.xml"/>
<target name="testSimple">
<version-constraint-check>
Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/constraint.xml
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/constraint.xml (original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/constraint/constraint.xml Mon Apr 12 11:39:22 2004
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<project name="constain-test" basedir="../../../../../../../.." default="testSimple">
- <taskdef resource="version"/>
+ <taskdef resource="depot-version-antlib.xml"/>
<target name="testSimple">
<version-constraint versionId="org.apache.acorn" dest="transient/test" overWrite="true">
Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/environment/EnvironmentTaskTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/environment/EnvironmentTaskTest.java (original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/environment/EnvironmentTaskTest.java Mon Apr 12 11:39:22 2004
@@ -29,7 +29,7 @@
}
public void setUp() {
- configureProject("src/test/ant/org/apache/version/ant/environment/environment.xml");
+ configureProject("version/src/test/org/apache/depot/version/ant/environment/environment.xml");
}
public void test() {
Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/environment/environment.xml
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/environment/environment.xml (original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/environment/environment.xml Mon Apr 12 11:39:22 2004
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<project name="environment-test" basedir="../../../../../../.." default="testMinimal">
- <taskdef resource="version"/>
+ <taskdef resource="depot-version-antlib.xml"/>
<target name="test">
<version-environment />
Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/VersionGeneratorTaskTest.java
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/VersionGeneratorTaskTest.java (original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/VersionGeneratorTaskTest.java Mon Apr 12 11:39:22 2004
@@ -29,7 +29,7 @@
}
public void setUp() {
- configureProject("src/test/java/ant/org/apache/version/ant/stamp/version.xml");
+ configureProject("version/src/test/java/ant/org/apache/version/ant/stamp/version.xml");
}
public void testComplex() {
executeTarget("testComplex");
Modified: incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/version.xml
==============================================================================
--- incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/version.xml (original)
+++ incubator/depot/trunk/version/src/test/java/org/apache/depot/version/ant/stamp/version.xml Mon Apr 12 11:39:22 2004
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<project name="version-test" basedir="../../../../../../../../.." default="testSimple">
- <taskdef resource="version-antlib.xml"/>
-
+ <taskdef resource="depot-version-antlib.xml"/>
+
<target name="init" >
<delete dir="transient/test"/>
<mkdir dir="transient/test"/>