Browse Source

document empty blocks in StashApplyCommandTest

Change-Id: I5b49bd00b00b86584b912fc5f503abf29db0f56e
stable-3.1
Tomasz Zarna 12 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
28ab9b8393
  1. 3
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java

3
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));
}

Loading…
Cancel
Save