motiejus
/
jgit
1
Fork 0
Code Releases Activity

Allow commandline tests to use raw output 

Introduce a new CLIGitCommand.rawExecute() helper that behaves
just like execute() except that instead of processing its output
it returns it raw.

So now you can do

	final byte[] expect = { 0, 1, 2, 3 };
	final byte[] actual = CLIGitCommand.rawExecute(
			"git show HEAD:goo.raw", db);
	assertArrayEquals(expect, actual);

to test the output from "git show HEAD:goo.raw" without being
distracted by encoding issues.

Noticed while writing tests for a new "jgit archive" command that
writes its output in ZIP format.

Change-Id: I2fe6020a537975d0ccf414b7125d85d6cd86898c
This commit is contained in:
Jonathan Nieder 2012-11-16 15:16:18 -08:00
parent fa5231191d
commit 789ca39ade
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/pgm/CLIGitCommand.java
View File

@ -70,6 +70,16 @@ public List<String> getArguments() {
public static List<String> execute(String str, Repository db)
throws Exception {
try {
return IO.readLines(new String(rawExecute(str, db)));
} catch (Die e) {
return IO.readLines(MessageFormat.format(CLIText.get().fatalError,
e.getMessage()));
}
}
public static byte[] rawExecute(String str, Repository db)
throws Exception {
String[] args = split(str);
if (!args[0].equalsIgnoreCase("git") || args.length < 2)
throw new IllegalArgumentException(
@ -91,14 +101,11 @@ public static List<String> execute(String str, Repository db)
try {
cmd.execute(bean.getArguments().toArray(
new String[bean.getArguments().size()]));
} catch (Die e) {
return IO.readLines(MessageFormat.format(CLIText.get().fatalError,
e.getMessage()));
} finally {
if (cmd.outw != null)
cmd.outw.flush();
}
return IO.readLines(baos.toString());
return baos.toByteArray();
}
/**