summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorAdrian Goerler2011-07-07 17:16:40 (EDT)
committer Matthias Sohn2011-07-07 17:16:40 (EDT)
commitad74bbf9c1744823e32c96a9de9d53576ddb7d9d (patch)
treeb6cc940b59449c006d5a4a67f47045bef63de910
parent172a9f05216394f243805844b446cc357dd6b943 (diff)
downloadjgit-ad74bbf9c1744823e32c96a9de9d53576ddb7d9d.zip
jgit-ad74bbf9c1744823e32c96a9de9d53576ddb7d9d.tar.gz
jgit-ad74bbf9c1744823e32c96a9de9d53576ddb7d9d.tar.bz2
Cleanup directories leftover by test.refs/changes/15/3815/5
Use the temporary file management from superclass. Change-Id: I3042951dc21860b4b85dd72a6bf41ee7cfe2aba4 Signed-off-by: Adrian Goerler <adrian.goerler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java32
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java17
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/api/InitCommandTest.java10
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LsRemoteCommandTest.java17
4 files changed, 27 insertions, 49 deletions
diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java
index 6e74a04..0c7ae7d 100644
--- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java
+++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java
@@ -307,6 +307,26 @@ public abstract class LocalDiskRepositoryTestCase {
toClose.add(r);
}
+ private String createUniqueTestFolderPrefix() {
+ return "test" + (System.currentTimeMillis() + "_" + (testCount++));
+ }
+
+ /**
+ * Creates a unique directory for a test
+ *
+ * @param name
+ * a subdirectory
+ * @return a unique directory for a test
+ * @throws IOException
+ */
+ protected File createTempDirectory(String name) throws IOException {
+ String gitdirName = createUniqueTestFolderPrefix();
+ File parent = new File(trash, gitdirName);
+ File directory = new File(parent, name);
+ FileUtils.mkdirs(directory);
+ return directory.getCanonicalFile();
+ }
+
/**
* Creates a new unique directory for a test repository
*
@@ -317,11 +337,12 @@ public abstract class LocalDiskRepositoryTestCase {
* @throws IOException
*/
protected File createUniqueTestGitDir(boolean bare) throws IOException {
- String uniqueId = System.currentTimeMillis() + "_" + (testCount++);
- String gitdirName = "test" + uniqueId + (bare ? "" : "/")
- + Constants.DOT_GIT;
- File gitdir = new File(trash, gitdirName).getCanonicalFile();
- return gitdir;
+ String gitdirName = createUniqueTestFolderPrefix();
+ if (!bare)
+ gitdirName += "/";
+ gitdirName += Constants.DOT_GIT;
+ File gitdir = new File(trash, gitdirName);
+ return gitdir.getCanonicalFile();
}
protected File createTempFile() throws IOException {
@@ -453,4 +474,5 @@ public abstract class LocalDiskRepositoryTestCase {
private String testId() {
return getClass().getName() + "." + testCount;
}
+
}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java
index e43ce34..76aed91 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java
@@ -235,21 +235,4 @@ public class CloneCommandTest extends RepositoryTestCase {
assertTrue(e.getMessage().contains(dirName));
}
}
-
- public static File createTempDirectory(String name) throws IOException {
- final File temp;
- temp = File.createTempFile(name, Long.toString(System.nanoTime()));
-
- if (!(temp.delete())) {
- throw new IOException("Could not delete temp file: "
- + temp.getAbsolutePath());
- }
-
- if (!(temp.mkdir())) {
- throw new IOException("Could not create temp directory: "
- + temp.getAbsolutePath());
- }
- return temp;
- }
-
}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/InitCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/InitCommandTest.java
index 797aad4..2823636 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/InitCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/InitCommandTest.java
@@ -50,7 +50,6 @@ import java.io.IOException;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.RepositoryTestCase;
-import org.eclipse.jgit.util.FileUtils;
import org.junit.Before;
import org.junit.Test;
@@ -97,13 +96,4 @@ public class InitCommandTest extends RepositoryTestCase {
assertNotNull(repository);
assertTrue(repository.isBare());
}
-
- public static File createTempDirectory(String name) throws IOException {
- final File temp;
- temp = File.createTempFile(name, Long.toString(System.nanoTime()));
- FileUtils.delete(temp);
- FileUtils.mkdir(temp);
- return temp;
- }
-
}
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LsRemoteCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LsRemoteCommandTest.java
index a4a5a26..7d3a55e 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LsRemoteCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LsRemoteCommandTest.java
@@ -47,7 +47,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import java.io.File;
-import java.io.IOException;
import java.util.Collection;
import org.eclipse.jgit.lib.Constants;
@@ -145,20 +144,4 @@ public class LsRemoteCommandTest extends RepositoryTestCase {
}
}
- public static File createTempDirectory(String name) throws IOException {
- final File temp;
- temp = File.createTempFile(name, Long.toString(System.nanoTime()));
-
- if (!(temp.delete())) {
- throw new IOException("Could not delete temp file: "
- + temp.getAbsolutePath());
- }
-
- if (!(temp.mkdir())) {
- throw new IOException("Could not create temp directory: "
- + temp.getAbsolutePath());
- }
- return temp;
- }
-
}