Browse Source

Merge "document empty blocks in StashApplyCommandTest"

tags/v3.1.0.201309270735-rc1
Matthias Sohn 11 years ago
parent
commit
4b68f2a532

+ 3
- 0
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashApplyCommandTest.java View File

git.stashApply().call(); git.stashApply().call();
fail("Exception not thrown"); fail("Exception not thrown");
} catch (StashApplyFailureException e) { } catch (StashApplyFailureException e) {
// expected
} }
assertEquals("content3", read(PATH)); assertEquals("content3", read(PATH));
} }
git.stashApply().call(); git.stashApply().call();
fail("Expected conflict"); fail("Expected conflict");
} catch (StashApplyFailureException e) { } catch (StashApplyFailureException e) {
// expected
} }
Status status = new StatusCommand(db).call(); Status status = new StatusCommand(db).call();
assertEquals(1, status.getConflicting().size()); assertEquals(1, status.getConflicting().size());
git.stashApply().call(); git.stashApply().call();
fail("Exception not thrown"); fail("Exception not thrown");
} catch (StashApplyFailureException e) { } catch (StashApplyFailureException e) {
// expected
} }
assertEquals("content2", read(PATH)); assertEquals("content2", read(PATH));
} }

Loading…
Cancel
Save