aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2013-05-06 13:27:42 (EDT)
committerGerrit Code Review @ Eclipse.org2013-06-13 10:25:43 (EDT)
commit28ab9b83937982a446fe09674e653e6d4e950cd4 (patch)
tree3a83b5811aa3dce7ce72c2dcbdf93482ffcdc1e7
parent06ba0f6df15868e3d2e1cb0b5f928a68b2f188bb (diff)
downloadjgit-28ab9b83937982a446fe09674e653e6d4e950cd4.zip
jgit-28ab9b83937982a446fe09674e653e6d4e950cd4.tar.gz
jgit-28ab9b83937982a446fe09674e653e6d4e950cd4.tar.bz2
document empty blocks in StashApplyCommandTestrefs/changes/44/12544/2
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java3
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 a81beb0..16e80f1 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));
}