diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2013-06-14 18:57:59 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2013-06-14 18:57:59 -0400 |
| commit | 4b68f2a5327a0d7ec878bc339e5bb5b686a8d275 (patch) | |
| tree | 9426217df93dfb10e5e3a29ba3d8be89573cc52b /org.eclipse.jgit.test | |
| parent | 6b9c0d1232a61b74445849b70a70f8da319b009e (diff) | |
| parent | 28ab9b83937982a446fe09674e653e6d4e950cd4 (diff) | |
| download | jgit-4b68f2a5327a0d7ec878bc339e5bb5b686a8d275.tar.gz jgit-4b68f2a5327a0d7ec878bc339e5bb5b686a8d275.zip | |
Merge "document empty blocks in StashApplyCommandTest"
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java index a81beb009a..16e80f1bfa 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java @@ -368,6 +368,7 @@ public class StashApplyCommandTest extends RepositoryTestCase { git.stashApply().call(); fail("Exception not thrown"); } catch (StashApplyFailureException e) { + // expected } assertEquals("content3", read(PATH)); } @@ -398,6 +399,7 @@ public class StashApplyCommandTest extends RepositoryTestCase { git.stashApply().call(); fail("Expected conflict"); } catch (StashApplyFailureException e) { + // expected } Status status = new StatusCommand(db).call(); assertEquals(1, status.getConflicting().size()); @@ -446,6 +448,7 @@ public class StashApplyCommandTest extends RepositoryTestCase { git.stashApply().call(); fail("Exception not thrown"); } catch (StashApplyFailureException e) { + // expected } assertEquals("content2", read(PATH)); } |