summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorRobin Stocker2012-09-22 19:45:23 (EDT)
committer Robin Stocker2012-09-25 15:00:57 (EDT)
commit9ea38173ccc5e4ef76abb9317fd7a1a221a228c6 (patch)
treeb6ab4d8fd06d6134eb4814389ded18e4cc305994
parentbc66934a8317f4af1e8454560f8179a249026dcc (diff)
downloadjgit-9ea38173ccc5e4ef76abb9317fd7a1a221a228c6.zip
jgit-9ea38173ccc5e4ef76abb9317fd7a1a221a228c6.tar.gz
jgit-9ea38173ccc5e4ef76abb9317fd7a1a221a228c6.tar.bz2
Provide a convenient read() in RepositoryTestCaserefs/changes/83/7883/2
For reading a file by its repository-relative path, analogous to writeTrashFile. Change-Id: I112de0d57c2ee1bd425de6cbf561a57fea7147f0
-rw-r--r--org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/JGitTestUtil.java22
-rw-r--r--org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java14
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryTestCase.java4
3 files changed, 27 insertions, 13 deletions
diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/JGitTestUtil.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/JGitTestUtil.java
index b3376a5..4bf597a 100644
--- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/JGitTestUtil.java
+++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/JGitTestUtil.java
@@ -56,6 +56,7 @@ import java.net.URL;
import org.eclipse.jgit.storage.file.FileRepository;
import org.eclipse.jgit.util.FileUtils;
+import org.eclipse.jgit.util.IO;
import org.eclipse.jgit.util.RawParseUtils;
import org.junit.Assert;
import org.junit.Test;
@@ -174,6 +175,27 @@ public abstract class JGitTestUtil {
}
}
+ /**
+ * Fully read a UTF-8 file and return as a string.
+ *
+ * @param file
+ * file to read the content of.
+ * @return UTF-8 decoded content of the file, empty string if the file
+ * exists but has no content.
+ * @throws IOException
+ * the file does not exist, or could not be read.
+ */
+ public static String read(final File file) throws IOException {
+ final byte[] body = IO.readFully(file);
+ return new String(body, 0, body.length, "UTF-8");
+ }
+
+ public static String read(final FileRepository db, final String name)
+ throws IOException {
+ File file = new File(db.getWorkTree(), name);
+ return read(file);
+ }
+
public static void deleteTrashFile(final FileRepository db,
final String name) throws IOException {
File path = new File(db.getWorkTree(), name);
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 d8ae705..676698a 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
@@ -68,7 +68,6 @@ import org.eclipse.jgit.storage.file.WindowCache;
import org.eclipse.jgit.storage.file.WindowCacheConfig;
import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.FileUtils;
-import org.eclipse.jgit.util.IO;
import org.eclipse.jgit.util.SystemReader;
import org.junit.After;
import org.junit.Before;
@@ -435,19 +434,8 @@ public abstract class LocalDiskRepositoryTestCase {
JGitTestUtil.write(f, body);
}
- /**
- * Fully read a UTF-8 file and return as a string.
- *
- * @param f
- * file to read the content of.
- * @return UTF-8 decoded content of the file, empty string if the file
- * exists but has no content.
- * @throws IOException
- * the file does not exist, or could not be read.
- */
protected String read(final File f) throws IOException {
- final byte[] body = IO.readFully(f);
- return new String(body, 0, body.length, "UTF-8");
+ return JGitTestUtil.read(f);
}
private static String[] toEnvArray(final Map<String, String> env) {
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryTestCase.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryTestCase.java
index 457fd1a..dd03427 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryTestCase.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryTestCase.java
@@ -108,6 +108,10 @@ public abstract class RepositoryTestCase extends LocalDiskRepositoryTestCase {
return JGitTestUtil.writeTrashFile(db, subdir, name, data);
}
+ protected String read(final String name) throws IOException {
+ return JGitTestUtil.read(db, name);
+ }
+
protected void deleteTrashFile(final String name) throws IOException {
JGitTestUtil.deleteTrashFile(db, name);
}