diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-06-20 00:43:47 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-06-20 00:45:34 +0200 |
| commit | 2f779df51e9da5b07ad6f837fe1c98eab9fbf439 (patch) | |
| tree | d2be9202eb947ecb005c72368bbcb4f1b86e8e68 /plugins/sonar-cpd-plugin/src | |
| parent | 24ec2501f751dc2a122f1e5f905ee4151ec8b891 (diff) | |
| download | sonarqube-2f779df51e9da5b07ad6f837fe1c98eab9fbf439.tar.gz sonarqube-2f779df51e9da5b07ad6f837fe1c98eab9fbf439.zip | |
Upgrade hamcrest and fix conflicts with JUnit and Mockito
Diffstat (limited to 'plugins/sonar-cpd-plugin/src')
| -rw-r--r-- | plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/decorators/SumDuplicationsDecoratorTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/decorators/SumDuplicationsDecoratorTest.java b/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/decorators/SumDuplicationsDecoratorTest.java index 7ebae1da257..0c733e9227a 100644 --- a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/decorators/SumDuplicationsDecoratorTest.java +++ b/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/decorators/SumDuplicationsDecoratorTest.java @@ -27,8 +27,8 @@ import org.sonar.api.resources.File; import org.sonar.api.resources.Qualifiers; import org.sonar.api.test.IsMeasure; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.number.OrderingComparisons.greaterThan; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.argThat; |