From 204de176c4ee379e243796498b0d0696d6d35b4d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Apr 2021 06:52:17 +0000 Subject: [PATCH 1/2] Bump versions.errorprone from 2.5.1 to 2.6.0 Bumps `versions.errorprone` from 2.5.1 to 2.6.0. Updates `error_prone_core` from 2.5.1 to 2.6.0 - [Release notes](https://github.com/google/error-prone/releases) - [Commits](https://github.com/google/error-prone/compare/v2.5.1...v2.6.0) Updates `error_prone_test_helpers` from 2.5.1 to 2.6.0 - [Release notes](https://github.com/google/error-prone/releases) - [Commits](https://github.com/google/error-prone/compare/v2.5.1...v2.6.0) Signed-off-by: dependabot[bot] --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 4c9a52544d..9b5ff29552 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -6,7 +6,7 @@ def versions = [:] versions.bytebuddy = '1.10.20' versions.junitJupiter = '5.7.1' -versions.errorprone = '2.5.1' +versions.errorprone = '2.6.0' libraries.junit4 = 'junit:junit:4.13.2' libraries.junitJupiterApi = "org.junit.jupiter:junit-jupiter-api:${versions.junitJupiter}" From 1e42b82bbb33d2aa4a76a2b77ddb75f5d52038e5 Mon Sep 17 00:00:00 2001 From: Tim van der Lippe Date: Thu, 1 Apr 2021 12:20:22 +0100 Subject: [PATCH 2/2] Fix ErrorProne errors --- .../configuration/plugins/PluginFinderTest.java | 12 +++++++++--- .../errorprone/bugpatterns/MockitoInternalUsage.java | 4 +--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/mockito/internal/configuration/plugins/PluginFinderTest.java b/src/test/java/org/mockito/internal/configuration/plugins/PluginFinderTest.java index 97535dfc6d..dcfc7f6dc8 100644 --- a/src/test/java/org/mockito/internal/configuration/plugins/PluginFinderTest.java +++ b/src/test/java/org/mockito/internal/configuration/plugins/PluginFinderTest.java @@ -117,16 +117,22 @@ public void multiple_empty_implementations() throws Exception { @Test public void problems_loading_impl() throws Exception { + String fileName = "xxx"; + File f = tmp.newFile(fileName); + + // when + IOUtil.writeText("Bar", f); + when(switcher.isEnabled(anyString())).thenThrow(new RuntimeException("Boo!")); try { // when - finder.findPluginClass(asList(new File("xxx").toURI().toURL())); + finder.findPluginClass(asList(f.toURI().toURL())); // then fail(); } catch (Exception e) { - assertThat(e).hasMessageContaining("xxx"); - e.getCause().getMessage().equals("Boo!"); + assertThat(e).hasMessageContaining(fileName); + assertThat(e.getCause()).hasMessage("Boo!"); } } } diff --git a/subprojects/errorprone/src/main/java/org/mockito/errorprone/bugpatterns/MockitoInternalUsage.java b/subprojects/errorprone/src/main/java/org/mockito/errorprone/bugpatterns/MockitoInternalUsage.java index fbc9b381ec..52b1d10718 100644 --- a/subprojects/errorprone/src/main/java/org/mockito/errorprone/bugpatterns/MockitoInternalUsage.java +++ b/subprojects/errorprone/src/main/java/org/mockito/errorprone/bugpatterns/MockitoInternalUsage.java @@ -8,7 +8,6 @@ import com.google.auto.service.AutoService; import com.google.errorprone.BugPattern; -import com.google.errorprone.BugPattern.ProvidesFix; import com.google.errorprone.BugPattern.SeverityLevel; import com.google.errorprone.VisitorState; import com.google.errorprone.bugpatterns.BugChecker; @@ -38,8 +37,7 @@ + " https://www.javadoc.io/doc/org.mockito/mockito-core/. If you believe that there" + " is no replacement available in the public API for your use-case, contact the" + " Mockito team at https://github.com/mockito/mockito/issues.", - severity = SeverityLevel.WARNING, - providesFix = ProvidesFix.REQUIRES_HUMAN_ATTENTION) + severity = SeverityLevel.WARNING) public class MockitoInternalUsage extends BugChecker implements MemberSelectTreeMatcher { private static final Matcher INSIDE_MOCKITO = packageStartsWith("org.mockito");