diff --git a/baseline-refaster-rules/src/main/java/com/palantir/baseline/refaster/MockitoVerifyNoInteractions.java b/baseline-refaster-rules/src/main/java/com/palantir/baseline/refaster/MockitoVerifyZeroInteractions.java similarity index 90% rename from baseline-refaster-rules/src/main/java/com/palantir/baseline/refaster/MockitoVerifyNoInteractions.java rename to baseline-refaster-rules/src/main/java/com/palantir/baseline/refaster/MockitoVerifyZeroInteractions.java index eff447c4a..9676791bf 100644 --- a/baseline-refaster-rules/src/main/java/com/palantir/baseline/refaster/MockitoVerifyNoInteractions.java +++ b/baseline-refaster-rules/src/main/java/com/palantir/baseline/refaster/MockitoVerifyZeroInteractions.java @@ -16,7 +16,7 @@ package com.palantir.baseline.refaster; -import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import com.google.errorprone.refaster.ImportPolicy; @@ -25,7 +25,7 @@ import com.google.errorprone.refaster.annotation.Repeated; import com.google.errorprone.refaster.annotation.UseImportPolicy; -public final class MockitoVerifyNoInteractions { +public final class MockitoVerifyZeroInteractions { @BeforeTemplate @SuppressWarnings("deprecation") @@ -37,6 +37,6 @@ void before(@Repeated Object varargs) { @AfterTemplate @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS) void after(@Repeated Object varargs) { - verifyNoInteractions(varargs); + verifyNoMoreInteractions(varargs); } } diff --git a/baseline-refaster-rules/src/test/java/com/palantir/baseline/refaster/MockitoVerifyNoInteractionsTest.java b/baseline-refaster-rules/src/test/java/com/palantir/baseline/refaster/MockitoVerifyZeroInteractionsTest.java similarity index 85% rename from baseline-refaster-rules/src/test/java/com/palantir/baseline/refaster/MockitoVerifyNoInteractionsTest.java rename to baseline-refaster-rules/src/test/java/com/palantir/baseline/refaster/MockitoVerifyZeroInteractionsTest.java index 6c79e22d7..a8626abd8 100644 --- a/baseline-refaster-rules/src/test/java/com/palantir/baseline/refaster/MockitoVerifyNoInteractionsTest.java +++ b/baseline-refaster-rules/src/test/java/com/palantir/baseline/refaster/MockitoVerifyZeroInteractionsTest.java @@ -18,12 +18,12 @@ import org.junit.Test; -public class MockitoVerifyNoInteractionsTest { +public class MockitoVerifyZeroInteractionsTest { @Test public void testSingleArg() { RefasterTestHelper - .forRefactoring(MockitoVerifyNoInteractions.class) + .forRefactoring(MockitoVerifyZeroInteractions.class) .withInputLines( "Test", "import static org.mockito.Mockito.verifyZeroInteractions;", @@ -33,11 +33,11 @@ public void testSingleArg() { " }", "}") .hasOutputLines( - "import static org.mockito.Mockito.verifyNoInteractions;", + "import static org.mockito.Mockito.verifyNoMoreInteractions;", "import static org.mockito.Mockito.verifyZeroInteractions;", "public class Test {", " void test(Object mock) {", - " verifyNoInteractions(mock);", + " verifyNoMoreInteractions(mock);", " }", "}"); } @@ -45,7 +45,7 @@ public void testSingleArg() { @Test public void testMultipleArgs() { RefasterTestHelper - .forRefactoring(MockitoVerifyNoInteractions.class) + .forRefactoring(MockitoVerifyZeroInteractions.class) .withInputLines( "Test", "import static org.mockito.Mockito.verifyZeroInteractions;", @@ -55,11 +55,11 @@ public void testMultipleArgs() { " }", "}") .hasOutputLines( - "import static org.mockito.Mockito.verifyNoInteractions;", + "import static org.mockito.Mockito.verifyNoMoreInteractions;", "import static org.mockito.Mockito.verifyZeroInteractions;", "public class Test {", " void test(Object mock1, Object mock2) {", - " verifyNoInteractions(mock1, mock2);", + " verifyNoMoreInteractions(mock1, mock2);", " }", "}"); } @@ -67,7 +67,7 @@ public void testMultipleArgs() { @Test public void testVarArgs() { RefasterTestHelper - .forRefactoring(MockitoVerifyNoInteractions.class) + .forRefactoring(MockitoVerifyZeroInteractions.class) .withInputLines( "Test", "import static org.mockito.Mockito.verifyZeroInteractions;", @@ -77,11 +77,11 @@ public void testVarArgs() { " }", "}") .hasOutputLines( - "import static org.mockito.Mockito.verifyNoInteractions;", + "import static org.mockito.Mockito.verifyNoMoreInteractions;", "import static org.mockito.Mockito.verifyZeroInteractions;", "public class Test {", " void test(Object... mocks) {", - " verifyNoInteractions(mocks);", + " verifyNoMoreInteractions(mocks);", " }", "}"); } diff --git a/changelog/@unreleased/pr-975.v2.yml b/changelog/@unreleased/pr-975.v2.yml new file mode 100644 index 000000000..fca46d41b --- /dev/null +++ b/changelog/@unreleased/pr-975.v2.yml @@ -0,0 +1,6 @@ +type: fix +fix: + description: The deprecated `verifyZeroInteractions` now gets rewritten to `verifyNoMoreInteractions`, + which has the same behaviour. + links: + - https://github.com/palantir/gradle-baseline/pull/975