diff options
| author | Shawn Pearce <sop@google.com> | 2013-11-01 16:04:44 +0100 |
|---|---|---|
| committer | Shawn Pearce <sop@google.com> | 2013-11-01 19:57:47 -0700 |
| commit | cc3ec72734fc442499cca60df957c4ef6749c4c3 (patch) | |
| tree | c252db20424be55e8a7955e9f85f3dea92c0acae /org.eclipse.jgit.java7.test | |
| parent | e59b3240957e852bfb1c35fa6250ca667743583e (diff) | |
| download | jgit-cc3ec72734fc442499cca60df957c4ef6749c4c3.tar.gz jgit-cc3ec72734fc442499cca60df957c4ef6749c4c3.zip | |
Remove hardcoded target/trash from test cases
Buck does not create a target directory for the build output, this
is Maven specific and the project unit tests should not rely on it.
Instead follow the pattern used by org.eclipse.jgit.test which is to
create a temporary directory in the system temporary folder, and
configure the Maven surefire plugin to use the target directory.
Change-Id: Iebe5093332343a90f51080614e083aac0d29c26d
Diffstat (limited to 'org.eclipse.jgit.java7.test')
| -rw-r--r-- | org.eclipse.jgit.java7.test/pom.xml | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit.java7.test/src/org/eclipse/jgit/util/FSJava7Test.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.jgit.java7.test/pom.xml b/org.eclipse.jgit.java7.test/pom.xml index 6c0dd33bc0..3641f59aef 100644 --- a/org.eclipse.jgit.java7.test/pom.xml +++ b/org.eclipse.jgit.java7.test/pom.xml @@ -118,7 +118,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>-Xmx256m -Dfile.encoding=UTF-8</argLine> + <argLine>-Xmx256m -Dfile.encoding=UTF-8 -Djava.io.tmpdir=${project.build.directory}</argLine> </configuration> </plugin> </plugins> diff --git a/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/util/FSJava7Test.java b/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/util/FSJava7Test.java index d735bd3ce5..4b5fe5979e 100644 --- a/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/util/FSJava7Test.java +++ b/org.eclipse.jgit.java7.test/src/org/eclipse/jgit/util/FSJava7Test.java @@ -58,13 +58,13 @@ import org.junit.Before; import org.junit.Test; public class FSJava7Test { - - private final File trash = new File(new File("target"), "trash"); + private File trash; @Before public void setUp() throws Exception { - FileUtils.delete(trash, FileUtils.RECURSIVE | FileUtils.RETRY | FileUtils.SKIP_MISSING); - assertTrue(trash.mkdirs()); + trash = File.createTempFile("tmp_", ""); + trash.delete(); + assertTrue("mkdir " + trash, trash.mkdir()); } @After |