motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Add tests for more coverage of CheckoutCommand"

This commit is contained in:
Matthias Sohn 2012-09-03 02:52:41 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent 51c20b27ac 11533f5d1d
commit 9d3110e72d
1 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.java
View File

@ -43,6 +43,8 @@
*/
package org.eclipse.jgit.api;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@ -234,6 +236,69 @@ public void testCheckoutOfFileWithInexistentParentDir() throws Exception {
assertTrue(a.exists());
}
@Test
public void testCheckoutOfDirectoryShouldBeRecursive() throws Exception {
File a = writeTrashFile("dir/a.txt", "A");
File b = writeTrashFile("dir/sub/b.txt", "B");
git.add().addFilepattern("dir").call();
git.commit().setMessage("Added dir").call();
write(a, "modified");
write(b, "modified");
git.checkout().addPath("dir").call();
assertThat(read(a), is("A"));
assertThat(read(b), is("B"));
}
@Test
public void testCheckoutAllPaths() throws Exception {
File a = writeTrashFile("dir/a.txt", "A");
File b = writeTrashFile("dir/sub/b.txt", "B");
git.add().addFilepattern("dir").call();
git.commit().setMessage("Added dir").call();
write(a, "modified");
write(b, "modified");
git.checkout().setAllPaths(true).call();
assertThat(read(a), is("A"));
assertThat(read(b), is("B"));
}
@Test
public void testCheckoutWithStartPoint() throws Exception {
File a = writeTrashFile("a.txt", "A");
git.add().addFilepattern("a.txt").call();
RevCommit first = git.commit().setMessage("Added a").call();
write(a, "other");
git.commit().setAll(true).setMessage("Other").call();
git.checkout().setCreateBranch(true).setName("a")
.setStartPoint(first.getId().getName()).call();
assertThat(read(a), is("A"));
}
@Test
public void testCheckoutWithStartPointOnlyCertainFiles() throws Exception {
File a = writeTrashFile("a.txt", "A");
File b = writeTrashFile("b.txt", "B");
git.add().addFilepattern("a.txt").addFilepattern("b.txt").call();
RevCommit first = git.commit().setMessage("First").call();
write(a, "other");
write(b, "other");
git.commit().setAll(true).setMessage("Other").call();
git.checkout().setCreateBranch(true).setName("a")
.setStartPoint(first.getId().getName()).addPath("a.txt").call();
assertThat(read(a), is("A"));
assertThat(read(b), is("other"));
}
@Test
public void testDetachedHeadOnCheckout() throws JGitInternalException,
IOException, GitAPIException {