From 10804a6d0281c48d7f26a0e534094850b092a003 Mon Sep 17 00:00:00 2001 From: David Schlosnagle Date: Wed, 2 Oct 2019 11:00:35 -0400 Subject: [PATCH 1/2] Use Mockito verifyNoInteractions over deprecated verifyZeroInteractions --- baseline-refaster-rules/build.gradle | 1 + .../refaster/MockitoVerifyNoInteractions.java | 42 +++++++++ .../MockitoVerifyNoInteractionsTest.java | 88 +++++++++++++++++++ 3 files changed, 131 insertions(+) create mode 100644 baseline-refaster-rules/src/main/java/com/palantir/baseline/refaster/MockitoVerifyNoInteractions.java create mode 100644 baseline-refaster-rules/src/test/java/com/palantir/baseline/refaster/MockitoVerifyNoInteractionsTest.java diff --git a/baseline-refaster-rules/build.gradle b/baseline-refaster-rules/build.gradle index b0b9a2a22..e528e81f8 100644 --- a/baseline-refaster-rules/build.gradle +++ b/baseline-refaster-rules/build.gradle @@ -6,6 +6,7 @@ apply from: "${rootDir}/gradle/publish-jar.gradle" dependencies { implementation 'com.google.errorprone:error_prone_refaster' implementation 'org.assertj:assertj-core' + implementation 'org.mockito:mockito-core' testCompile 'junit:junit' testCompile project(':baseline-refaster-testing') 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/MockitoVerifyNoInteractions.java new file mode 100644 index 000000000..eff447c4a --- /dev/null +++ b/baseline-refaster-rules/src/main/java/com/palantir/baseline/refaster/MockitoVerifyNoInteractions.java @@ -0,0 +1,42 @@ +/* + * (c) Copyright 2019 Palantir Technologies Inc. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.palantir.baseline.refaster; + +import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; + +import com.google.errorprone.refaster.ImportPolicy; +import com.google.errorprone.refaster.annotation.AfterTemplate; +import com.google.errorprone.refaster.annotation.BeforeTemplate; +import com.google.errorprone.refaster.annotation.Repeated; +import com.google.errorprone.refaster.annotation.UseImportPolicy; + +public final class MockitoVerifyNoInteractions { + + @BeforeTemplate + @SuppressWarnings("deprecation") + // must use @Repeated for varargs per https://github.com/google/error-prone/issues/568 + void before(@Repeated Object varargs) { + verifyZeroInteractions(varargs); + } + + @AfterTemplate + @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS) + void after(@Repeated Object varargs) { + verifyNoInteractions(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/MockitoVerifyNoInteractionsTest.java new file mode 100644 index 000000000..6c79e22d7 --- /dev/null +++ b/baseline-refaster-rules/src/test/java/com/palantir/baseline/refaster/MockitoVerifyNoInteractionsTest.java @@ -0,0 +1,88 @@ +/* + * (c) Copyright 2019 Palantir Technologies Inc. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.palantir.baseline.refaster; + +import org.junit.Test; + +public class MockitoVerifyNoInteractionsTest { + + @Test + public void testSingleArg() { + RefasterTestHelper + .forRefactoring(MockitoVerifyNoInteractions.class) + .withInputLines( + "Test", + "import static org.mockito.Mockito.verifyZeroInteractions;", + "public class Test {", + " void test(Object mock) {", + " verifyZeroInteractions(mock);", + " }", + "}") + .hasOutputLines( + "import static org.mockito.Mockito.verifyNoInteractions;", + "import static org.mockito.Mockito.verifyZeroInteractions;", + "public class Test {", + " void test(Object mock) {", + " verifyNoInteractions(mock);", + " }", + "}"); + } + + @Test + public void testMultipleArgs() { + RefasterTestHelper + .forRefactoring(MockitoVerifyNoInteractions.class) + .withInputLines( + "Test", + "import static org.mockito.Mockito.verifyZeroInteractions;", + "public class Test {", + " void test(Object mock1, Object mock2) {", + " verifyZeroInteractions(mock1, mock2);", + " }", + "}") + .hasOutputLines( + "import static org.mockito.Mockito.verifyNoInteractions;", + "import static org.mockito.Mockito.verifyZeroInteractions;", + "public class Test {", + " void test(Object mock1, Object mock2) {", + " verifyNoInteractions(mock1, mock2);", + " }", + "}"); + } + + @Test + public void testVarArgs() { + RefasterTestHelper + .forRefactoring(MockitoVerifyNoInteractions.class) + .withInputLines( + "Test", + "import static org.mockito.Mockito.verifyZeroInteractions;", + "public class Test {", + " void test(Object... mocks) {", + " verifyZeroInteractions(mocks);", + " }", + "}") + .hasOutputLines( + "import static org.mockito.Mockito.verifyNoInteractions;", + "import static org.mockito.Mockito.verifyZeroInteractions;", + "public class Test {", + " void test(Object... mocks) {", + " verifyNoInteractions(mocks);", + " }", + "}"); + } +} From ce3b65d27f5f08200d2ca83129b6b8b7a4bedfce Mon Sep 17 00:00:00 2001 From: David Schlosnagle Date: Wed, 2 Oct 2019 15:00:35 +0000 Subject: [PATCH 2/2] Add generated changelog entries --- changelog/@unreleased/pr-924.v2.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/@unreleased/pr-924.v2.yml diff --git a/changelog/@unreleased/pr-924.v2.yml b/changelog/@unreleased/pr-924.v2.yml new file mode 100644 index 000000000..6eac5e3bd --- /dev/null +++ b/changelog/@unreleased/pr-924.v2.yml @@ -0,0 +1,5 @@ +type: improvement +improvement: + description: Use Mockito verifyNoInteractions over deprecated verifyZeroInteractions + links: + - https://github.com/palantir/gradle-baseline/pull/924