aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@gmail.com>2018-09-29 12:59:03 +0900
committerDavid Pursehouse <david.pursehouse@gmail.com>2018-09-29 12:59:03 +0900
commitf02844caaefcb7450cde2e3ff64485eb87eef6be (patch)
tree5e9cfe7d312fd316061c92bd2f6470fa77cdb4cb
parent00698f9e27439a0a5a7556a8df1d5e94e0a7e8ba (diff)
downloadjgit-f02844caaefcb7450cde2e3ff64485eb87eef6be.tar.gz
jgit-f02844caaefcb7450cde2e3ff64485eb87eef6be.zip
DirCacheCheckoutTest#testCheckoutHierarchy: Add missing call to fail()
Error Prone reports: Not calling fail() when expecting an exception masks bugs See https://errorprone.info/bugpattern/MissingFail Change-Id: I463510342bb6e6b99b31a0fe264d953340784393 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java
index 7cb91a2064..534b323fe6 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java
@@ -929,6 +929,7 @@ public class DirCacheCheckoutTest extends RepositoryTestCase {
"e/g3"));
try {
checkout();
+ fail("did not throw CheckoutConflictException");
} catch (CheckoutConflictException e) {
assertWorkDir(mkmap("a", "a", "b/c", "b/c", "d", "d", "e/f",
"e/f", "e/g", "e/g3"));