From 35749faa8b9f588b3269f3bcf09a776c0889e883 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 9 Mar 2018 14:08:43 +0100 Subject: Fix some Java compiler warnings --- .../src/test/java/org/sonar/core/platform/ComponentKeysTest.java | 2 +- sonar-core/src/test/java/org/sonar/core/platform/ModuleTest.java | 2 +- .../src/test/java/org/sonar/core/timemachine/PeriodsTest.java | 8 ++++---- .../src/test/java/org/sonar/core/util/CloseableIteratorTest.java | 2 +- .../test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java | 4 ++-- sonar-core/src/test/java/org/sonar/core/util/HttpsTrustTest.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'sonar-core') diff --git a/sonar-core/src/test/java/org/sonar/core/platform/ComponentKeysTest.java b/sonar-core/src/test/java/org/sonar/core/platform/ComponentKeysTest.java index 98c8f1f9211..03a3c7eacbd 100644 --- a/sonar-core/src/test/java/org/sonar/core/platform/ComponentKeysTest.java +++ b/sonar-core/src/test/java/org/sonar/core/platform/ComponentKeysTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.sonar.api.utils.log.Logger; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.startsWith; +import static org.mockito.ArgumentMatchers.startsWith; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; diff --git a/sonar-core/src/test/java/org/sonar/core/platform/ModuleTest.java b/sonar-core/src/test/java/org/sonar/core/platform/ModuleTest.java index f983a71fee9..b8476abc34c 100644 --- a/sonar-core/src/test/java/org/sonar/core/platform/ModuleTest.java +++ b/sonar-core/src/test/java/org/sonar/core/platform/ModuleTest.java @@ -54,7 +54,7 @@ public class ModuleTest { new Module() { @Override protected void configureModule() { - add(null); + add((Object)null); } }.configure(container); diff --git a/sonar-core/src/test/java/org/sonar/core/timemachine/PeriodsTest.java b/sonar-core/src/test/java/org/sonar/core/timemachine/PeriodsTest.java index e718f724c05..cf9d3ec3b79 100644 --- a/sonar-core/src/test/java/org/sonar/core/timemachine/PeriodsTest.java +++ b/sonar-core/src/test/java/org/sonar/core/timemachine/PeriodsTest.java @@ -27,10 +27,10 @@ import org.junit.rules.ExpectedException; import org.sonar.api.config.internal.MapSettings; import org.sonar.api.i18n.I18n; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.isNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.sonar.api.utils.DateUtils.parseDate; diff --git a/sonar-core/src/test/java/org/sonar/core/util/CloseableIteratorTest.java b/sonar-core/src/test/java/org/sonar/core/util/CloseableIteratorTest.java index 507339e1ed5..6be93f670cd 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/CloseableIteratorTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/CloseableIteratorTest.java @@ -167,7 +167,7 @@ public class CloseableIteratorTest { @Test(expected = NullPointerException.class) public void wrap_fails_if_null_closeable() { - CloseableIterator.wrap(new SimpleCloseableIterator(), null); + CloseableIterator.wrap(new SimpleCloseableIterator(), (AutoCloseable)null); } private static class CloseableIt implements Iterator, AutoCloseable { diff --git a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java b/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java index ecb23275f2e..26717e80255 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java @@ -58,8 +58,8 @@ import org.sonar.api.utils.SonarException; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.internal.matchers.ThrowableCauseMatcher.hasCause; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.argThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/sonar-core/src/test/java/org/sonar/core/util/HttpsTrustTest.java b/sonar-core/src/test/java/org/sonar/core/util/HttpsTrustTest.java index 7f2809dd10b..ee3a445ebbb 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/HttpsTrustTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/HttpsTrustTest.java @@ -28,7 +28,7 @@ import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -- cgit v1.2.3