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>tags/v3.0.0.201306101825-r
@@ -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; |
@@ -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; |
@@ -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 @@ public class DirCacheCheckoutMaliciousPathTest extends RepositoryTestCase { | |||
} catch (InvalidPathException e) { | |||
if (good) | |||
throw e; | |||
assertThat(e.getMessage(), startsWith("Invalid path: ")); | |||
assertTrue(e.getMessage().startsWith("Invalid path: ")); | |||
} | |||
} | |||
@@ -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 class FileUtilTest { | |||
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()); | |||
} |