From 90e3652e6e8c6412aba22ff39a36a6ed5b2244ad Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Thu, 13 Jul 2017 14:19:39 +0100 Subject: [PATCH] {builder,plugin}:*Test: replace deprecated org.mockito.Matchers.* imports --- .../checkstyle/ruleset/builder/CheckstyleWriterTest.java | 2 +- .../net/kemitix/checkstyle/ruleset/plugin/CheckMojoTest.java | 2 +- .../ruleset/plugin/DefaultCheckstyleExecutorTest.java | 4 ++-- .../checkstyle/ruleset/plugin/DefaultPluginExecutorTest.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/CheckstyleWriterTest.java b/builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/CheckstyleWriterTest.java index 5cd29f1..9f057ff 100644 --- a/builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/CheckstyleWriterTest.java +++ b/builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/CheckstyleWriterTest.java @@ -22,8 +22,8 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; -import static org.mockito.Matchers.any; /** * Tests for {@link CheckstyleWriter}. diff --git a/plugin/src/test/java/net/kemitix/checkstyle/ruleset/plugin/CheckMojoTest.java b/plugin/src/test/java/net/kemitix/checkstyle/ruleset/plugin/CheckMojoTest.java index 0008532..86e540f 100644 --- a/plugin/src/test/java/net/kemitix/checkstyle/ruleset/plugin/CheckMojoTest.java +++ b/plugin/src/test/java/net/kemitix/checkstyle/ruleset/plugin/CheckMojoTest.java @@ -16,9 +16,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.then; -import static org.mockito.Matchers.any; /** * Tests for {@link CheckMojo}. diff --git a/plugin/src/test/java/net/kemitix/checkstyle/ruleset/plugin/DefaultCheckstyleExecutorTest.java b/plugin/src/test/java/net/kemitix/checkstyle/ruleset/plugin/DefaultCheckstyleExecutorTest.java index 8abc7b1..b7de3cb 100644 --- a/plugin/src/test/java/net/kemitix/checkstyle/ruleset/plugin/DefaultCheckstyleExecutorTest.java +++ b/plugin/src/test/java/net/kemitix/checkstyle/ruleset/plugin/DefaultCheckstyleExecutorTest.java @@ -29,10 +29,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.then; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; /** * Tests for {@link DefaultCheckstyleExecutor}. diff --git a/plugin/src/test/java/net/kemitix/checkstyle/ruleset/plugin/DefaultPluginExecutorTest.java b/plugin/src/test/java/net/kemitix/checkstyle/ruleset/plugin/DefaultPluginExecutorTest.java index 9ce752c..ba5f6b2 100644 --- a/plugin/src/test/java/net/kemitix/checkstyle/ruleset/plugin/DefaultPluginExecutorTest.java +++ b/plugin/src/test/java/net/kemitix/checkstyle/ruleset/plugin/DefaultPluginExecutorTest.java @@ -26,10 +26,10 @@ import org.twdata.maven.mojoexecutor.MojoExecutor; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.BDDMockito.given; import static org.mockito.BDDMockito.then; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; /** * Tests for {@link DefaultPluginExecutor}.