Browse Source

Merge "Provide a convenient read() in RepositoryTestCase"

stable-2.2
Christian Halstrick 12 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
83e7554e17
  1. 22
      org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/JGitTestUtil.java
  2. 14
      org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java
  3. 4
      org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryTestCase.java

22
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.storage.file.FileRepository;
import org.eclipse.jgit.util.FileUtils; import org.eclipse.jgit.util.FileUtils;
import org.eclipse.jgit.util.IO;
import org.eclipse.jgit.util.RawParseUtils; import org.eclipse.jgit.util.RawParseUtils;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; 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, public static void deleteTrashFile(final FileRepository db,
final String name) throws IOException { final String name) throws IOException {
File path = new File(db.getWorkTree(), name); File path = new File(db.getWorkTree(), name);

14
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.storage.file.WindowCacheConfig;
import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.FileUtils; import org.eclipse.jgit.util.FileUtils;
import org.eclipse.jgit.util.IO;
import org.eclipse.jgit.util.SystemReader; import org.eclipse.jgit.util.SystemReader;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
@ -435,19 +434,8 @@ public abstract class LocalDiskRepositoryTestCase {
JGitTestUtil.write(f, body); 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 { protected String read(final File f) throws IOException {
final byte[] body = IO.readFully(f); return JGitTestUtil.read(f);
return new String(body, 0, body.length, "UTF-8");
} }
private static String[] toEnvArray(final Map<String, String> env) { private static String[] toEnvArray(final Map<String, String> env) {

4
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); 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 { protected void deleteTrashFile(final String name) throws IOException {
JGitTestUtil.deleteTrashFile(db, name); JGitTestUtil.deleteTrashFile(db, name);
} }

Loading…
Cancel
Save