From 2f779df51e9da5b07ad6f837fe1c98eab9fbf439 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 20 Jun 2014 00:43:47 +0200 Subject: Upgrade hamcrest and fix conflicts with JUnit and Mockito --- sonar-deprecated/src/test/java/org/sonar/api/resources/MethodTest.java | 2 +- .../test/java/org/sonar/api/utils/CoberturaReportParserUtilsTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sonar-deprecated/src') diff --git a/sonar-deprecated/src/test/java/org/sonar/api/resources/MethodTest.java b/sonar-deprecated/src/test/java/org/sonar/api/resources/MethodTest.java index b4155c39a72..8d8c7b66f80 100644 --- a/sonar-deprecated/src/test/java/org/sonar/api/resources/MethodTest.java +++ b/sonar-deprecated/src/test/java/org/sonar/api/resources/MethodTest.java @@ -21,7 +21,7 @@ package org.sonar.api.resources; import org.junit.Test; -import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; public class MethodTest { diff --git a/sonar-deprecated/src/test/java/org/sonar/api/utils/CoberturaReportParserUtilsTest.java b/sonar-deprecated/src/test/java/org/sonar/api/utils/CoberturaReportParserUtilsTest.java index 8573d4c834c..60b63e84de1 100644 --- a/sonar-deprecated/src/test/java/org/sonar/api/utils/CoberturaReportParserUtilsTest.java +++ b/sonar-deprecated/src/test/java/org/sonar/api/utils/CoberturaReportParserUtilsTest.java @@ -35,7 +35,7 @@ import org.sonar.api.utils.CoberturaReportParserUtils.FileResolver; import java.io.File; import java.net.URISyntaxException; -import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.Matchers.is; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyDouble; import static org.mockito.Matchers.argThat; -- cgit v1.2.3