Provide a convenient read() in RepositoryTestCase

For reading a file by its repository-relative path, analogous to
writeTrashFile.

Change-Id: I112de0d57c2ee1bd425de6cbf561a57fea7147f0

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 b3376a54be313302ded59711463cd9998a35a099..4bf597a807e66ee50163642a127e27fa162e7733 100644 (file)
--- 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 d8ae705c480a75d1d249c456dd46079a57abfcf4..676698a8e29a75a20a1b7ab4f4071390fc6dbef9 100644 (file)
--- 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 457fd1a7ef72c560e4595e6f8e5e20e57893fbb4..dd03427f9cdc3d0d16a034d5b7687ce17d8fe130 100644 (file)
--- 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);
        }