You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2014/07/27 12:48:53 UTC
[2/2] git commit: make tests use a real temp directory
make tests use a real temp directory
Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-svn/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-antlibs-svn/commit/36d339eb
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-svn/tree/36d339eb
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-svn/diff/36d339eb
Branch: refs/heads/master
Commit: 36d339eb9a3e9cc7e2a09052877afdc91e3bc758
Parents: c6b7ce9
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sun Jul 27 12:47:59 2014 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sun Jul 27 12:47:59 2014 +0200
----------------------------------------------------------------------
src/etc/testcases/abstractsvntask.xml | 2 +-
src/etc/testcases/changelog.xml | 2 +-
src/etc/testcases/revisiondiff.xml | 2 +-
src/etc/testcases/tagdiff.xml | 2 +-
src/tests/junit/org/apache/ant/svn/AbstractSvnTaskTest.java | 3 ++-
src/tests/junit/org/apache/ant/svn/SvnChangeLogTaskTest.java | 3 ++-
src/tests/junit/org/apache/ant/svn/SvnRevisionDiffTest.java | 3 ++-
src/tests/junit/org/apache/ant/svn/SvnTagDiffTest.java | 3 ++-
8 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-antlibs-svn/blob/36d339eb/src/etc/testcases/abstractsvntask.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/abstractsvntask.xml b/src/etc/testcases/abstractsvntask.xml
index 61d9d39..2876fe2 100644
--- a/src/etc/testcases/abstractsvntask.xml
+++ b/src/etc/testcases/abstractsvntask.xml
@@ -20,7 +20,7 @@
<project name="abstractsvntask-test" basedir="../../../"
default="all" xmlns:svn="antlib:org.apache.ant.svn">
- <property name="tmpdir" value="tmpdir"/>
+ <property name="tmpdir" value="${java.io.tmpdir}/svnantlib"/>
<property name="trunkdir" value="${tmpdir}/trunk"/>
<property name="file" value="build.xml"/>
http://git-wip-us.apache.org/repos/asf/ant-antlibs-svn/blob/36d339eb/src/etc/testcases/changelog.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/changelog.xml b/src/etc/testcases/changelog.xml
index 7c624b0..b186000 100644
--- a/src/etc/testcases/changelog.xml
+++ b/src/etc/testcases/changelog.xml
@@ -20,7 +20,7 @@
<project name="changelog-test" basedir="../../../"
default="log" xmlns:svn="antlib:org.apache.ant.svn">
- <property name="tmpdir" value="tmpdir"/>
+ <property name="tmpdir" value="${java.io.tmpdir}/svnantlib"/>
<property name="trunkdir" value="${tmpdir}/trunk"/>
<target name="setup">
http://git-wip-us.apache.org/repos/asf/ant-antlibs-svn/blob/36d339eb/src/etc/testcases/revisiondiff.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/revisiondiff.xml b/src/etc/testcases/revisiondiff.xml
index d7cdbcd..2db3fb8 100644
--- a/src/etc/testcases/revisiondiff.xml
+++ b/src/etc/testcases/revisiondiff.xml
@@ -20,7 +20,7 @@
<project name="revisiondiff-test" basedir="../../../"
default="diff" xmlns:svn="antlib:org.apache.ant.svn">
- <property name="tmpdir" value="tmpdir"/>
+ <property name="tmpdir" value="${java.io.tmpdir}/svnantlib"/>
<property name="trunkdir" value="${tmpdir}/trunk"/>
<target name="dir-prep">
http://git-wip-us.apache.org/repos/asf/ant-antlibs-svn/blob/36d339eb/src/etc/testcases/tagdiff.xml
----------------------------------------------------------------------
diff --git a/src/etc/testcases/tagdiff.xml b/src/etc/testcases/tagdiff.xml
index 3c2b850..26a8bad 100644
--- a/src/etc/testcases/tagdiff.xml
+++ b/src/etc/testcases/tagdiff.xml
@@ -21,7 +21,7 @@
default="diff-with-implicit-trunk"
xmlns:svn="antlib:org.apache.ant.svn">
- <property name="tmpdir" value="tmpdir"/>
+ <property name="tmpdir" value="${java.io.tmpdir}/svnantlib"/>
<property
name="baseURL"
value="http://svn.apache.org/repos/asf/ant/antlibs/antunit/"/>
http://git-wip-us.apache.org/repos/asf/ant-antlibs-svn/blob/36d339eb/src/tests/junit/org/apache/ant/svn/AbstractSvnTaskTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/ant/svn/AbstractSvnTaskTest.java b/src/tests/junit/org/apache/ant/svn/AbstractSvnTaskTest.java
index 5716ee1..e6a1627 100644
--- a/src/tests/junit/org/apache/ant/svn/AbstractSvnTaskTest.java
+++ b/src/tests/junit/org/apache/ant/svn/AbstractSvnTaskTest.java
@@ -46,7 +46,8 @@ public class AbstractSvnTaskTest extends BuildFileTest {
}
public void testRevisionAttribute() {
- File f = getProject().resolveFile("tmpdir/trunk/build.xml");
+ String tmpDir = getProject().getProperty("tmpdir");
+ File f = getProject().resolveFile(tmpDir + "/trunk/build.xml");
assertTrue("starting empty", !f.exists());
// used to be
http://git-wip-us.apache.org/repos/asf/ant-antlibs-svn/blob/36d339eb/src/tests/junit/org/apache/ant/svn/SvnChangeLogTaskTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/ant/svn/SvnChangeLogTaskTest.java b/src/tests/junit/org/apache/ant/svn/SvnChangeLogTaskTest.java
index d385190..67408da 100644
--- a/src/tests/junit/org/apache/ant/svn/SvnChangeLogTaskTest.java
+++ b/src/tests/junit/org/apache/ant/svn/SvnChangeLogTaskTest.java
@@ -75,8 +75,9 @@ public class SvnChangeLogTaskTest extends BuildFileTest {
private String executeTargetAndReadLogFully(String target)
throws IOException {
executeTarget(target);
+ String tmpDir = getProject().getProperty("tmpdir");
FileReader r = new FileReader(getProject()
- .resolveFile("tmpdir/log.xml"));
+ .resolveFile(tmpDir + "/log.xml"));
try {
return FileUtils.readFully(r);
} finally {
http://git-wip-us.apache.org/repos/asf/ant-antlibs-svn/blob/36d339eb/src/tests/junit/org/apache/ant/svn/SvnRevisionDiffTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/ant/svn/SvnRevisionDiffTest.java b/src/tests/junit/org/apache/ant/svn/SvnRevisionDiffTest.java
index b08f373..a82409e 100644
--- a/src/tests/junit/org/apache/ant/svn/SvnRevisionDiffTest.java
+++ b/src/tests/junit/org/apache/ant/svn/SvnRevisionDiffTest.java
@@ -60,8 +60,9 @@ public class SvnRevisionDiffTest extends BuildFileTest {
private String executeTargetAndReadLogFully(String target)
throws IOException {
executeTarget(target);
+ String tmpDir = getProject().getProperty("tmpdir");
FileReader r = new FileReader(getProject()
- .resolveFile("tmpdir/diff.xml"));
+ .resolveFile(tmpDir + "/diff.xml"));
try {
return FileUtils.readFully(r);
} finally {
http://git-wip-us.apache.org/repos/asf/ant-antlibs-svn/blob/36d339eb/src/tests/junit/org/apache/ant/svn/SvnTagDiffTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/ant/svn/SvnTagDiffTest.java b/src/tests/junit/org/apache/ant/svn/SvnTagDiffTest.java
index aa47066..c3002a0 100644
--- a/src/tests/junit/org/apache/ant/svn/SvnTagDiffTest.java
+++ b/src/tests/junit/org/apache/ant/svn/SvnTagDiffTest.java
@@ -67,8 +67,9 @@ public class SvnTagDiffTest extends BuildFileTest {
private String executeTargetAndReadLogFully(String target)
throws IOException {
executeTarget(target);
+ String tmpDir = getProject().getProperty("tmpdir");
FileReader r = new FileReader(getProject()
- .resolveFile("tmpdir/diff.xml"));
+ .resolveFile(tmpDir + "/diff.xml"));
try {
return FileUtils.readFully(r);
} finally {