motiejus
/
jgit
1
Fork 0
Code Releases Activity

Make JGit test work with both hamcrest 1.1 (juno) and 1.3 (kepler) 

The hamcrest library has moved things around. This problem applies only
to the test, not plugin runtime.

Change-Id: I5b97f356d8595dbdc9e91d157558e40561a6a30d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Robin Rosenberg 2013-05-26 22:07:24 +02:00 committed by Matthias Sohn
parent 79a2e28a93
commit b83c269369
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.java
View File

@ -44,7 +44,7 @@
package org.eclipse.jgit.api;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java
View File

@ -43,8 +43,8 @@
package org.eclipse.jgit.api;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;

5
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutMaliciousPathTest.java
View File

@ -37,8 +37,7 @@
*/
package org.eclipse.jgit.lib;
import static org.hamcrest.Matchers.startsWith;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File;
@ -399,7 +398,7 @@ private void testMaliciousPath(boolean good, boolean secondCheckout,
} catch (InvalidPathException e) {
if (good)
throw e;
assertThat(e.getMessage(), startsWith("Invalid path: "));
assertTrue(e.getMessage().startsWith("Invalid path: "));
}
}

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/util/FileUtilTest.java
View File

@ -43,8 +43,6 @@
package org.eclipse.jgit.util;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.endsWith;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@ -332,7 +330,7 @@ public void testDeleteNotEmptyTreeNotOk() throws IOException {
FileUtils.delete(t, FileUtils.EMPTY_DIRECTORIES_ONLY | FileUtils.RECURSIVE);
fail("expected failure to delete f");
} catch (IOException e) {
assertThat(e.getMessage(), endsWith(f.getAbsolutePath()));
assertTrue(e.getMessage().endsWith(f.getAbsolutePath()));
}
assertTrue(t.exists());
}