Signed-off-by: Florian Koeberle <florianskarten@xxxxxx>
---
.../tst/org/spearce/jgit/lib/AbstractTestCase.java | 108 ++++++++++++++++++++
.../org/spearce/jgit/lib/RepositoryTestCase.java | 22 +----
2 files changed, 109 insertions(+), 21 deletions(-)
create mode 100644 org.spearce.jgit.test/tst/org/spearce/jgit/lib/AbstractTestCase.java
diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/lib/AbstractTestCase.java b/org.spearce.jgit.test/tst/org/spearce/jgit/lib/AbstractTestCase.java
new file mode 100644
index 0000000..c017fc0
--- /dev/null
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/lib/AbstractTestCase.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2006, Shawn Pearce <spearce@xxxxxxxxxxx>
+ * Copyright (C) 2008, Florian Köberle <florianskarten@xxxxxx>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * - Neither the name of the Git Development Community nor the
+ * names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.spearce.jgit.lib;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Stack;
+
+import junit.framework.TestCase;
+
+/**
+ * This class can be used as base testcase
+ *
+ */
+public abstract class AbstractTestCase extends TestCase {
+ private final Stack<File> directoriesToDelete = new Stack<File>();
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ // Do not delete directories from other test runs
+ // in order to avoid side effects between tests.
+ directoriesToDelete.clear();
+ }
+
+ /**
+ * Creates a new directory for test purposes. The directory and it's content
+ * will be deleted when the test is over.
+ *
+ * @return a temporary directory for the use in one test.
+ * @throws IOException
+ * if the creation of the temporary directory fails.
+ */
+ protected File createTemporaryDirectory() throws IOException {
+ File directory = null;
+ do {
+ directory = File.createTempFile("test", "");
+ if (!directory.delete())
+ throw new IOException("can't delete temporary file");
+
+ if (!directory.mkdir())
+ directory = null;
+
+ } while (directory == null);
+ return directory;
+ }
+
+ protected static void recursiveDelete(final File dir) {
+ final File[] ls = dir.listFiles();
+ if (ls != null) {
+ for (int k = 0; k < ls.length; k++) {
+ final File e = ls[k];
+ if (e.isDirectory()) {
+ recursiveDelete(e);
+ } else {
+ e.delete();
+ }
+ }
+ }
+ dir.delete();
+ if (dir.exists()) {
+ System.out.println("Warning: Failed to delete " + dir);
+ }
+ }
+
+ protected void tearDown() throws Exception {
+ while (!directoriesToDelete.isEmpty()) {
+ final File directory = directoriesToDelete.pop();
+ recursiveDelete(directory);
+ }
+ super.tearDown();
+ }
+}
diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/lib/RepositoryTestCase.java b/org.spearce.jgit.test/tst/org/spearce/jgit/lib/RepositoryTestCase.java
index aae9ed6..9719066 100644
--- a/org.spearce.jgit.test/tst/org/spearce/jgit/lib/RepositoryTestCase.java
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/lib/RepositoryTestCase.java
@@ -46,9 +46,7 @@ import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Reader;
-import junit.framework.TestCase;
-
-public abstract class RepositoryTestCase extends TestCase {
+public abstract class RepositoryTestCase extends AbstractTestCase {
protected final File trashParent = new File("trash");
@@ -65,24 +63,6 @@ public abstract class RepositoryTestCase extends TestCase {
jcommitter = new PersonIdent("J. Committer", "jcommitter@xxxxxxxxxxx");
}
- protected static void recursiveDelete(final File dir) {
- final File[] ls = dir.listFiles();
- if (ls != null) {
- for (int k = 0; k < ls.length; k++) {
- final File e = ls[k];
- if (e.isDirectory()) {
- recursiveDelete(e);
- } else {
- e.delete();
- }
- }
- }
- dir.delete();
- if (dir.exists()) {
- System.out.println("Warning: Failed to delete " + dir);
- }
- }
-
protected static void copyFile(final File src, final File dst)
throws IOException {
final FileInputStream fis = new FileInputStream(src);
--
1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
