Merge branch 'main' into bugfix/cope_with_redundant_modifier_this_bef…

…ore_identifier
openrewrite · Oct 7, 2024 · 2137491 · 2137491
2 parents e0a06f5 + 058d2ff
commit 2137491
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -53,7 +53,7 @@ dependencies {
 
     annotationProcessor("org.openrewrite:rewrite-templating:${rewriteVersion}")
     implementation("org.openrewrite:rewrite-templating:${rewriteVersion}")
-    compileOnly("com.google.errorprone:error_prone_core:2.19.1:with-dependencies") {
+    compileOnly("com.google.errorprone:error_prone_core:2.+:with-dependencies") {
         exclude("com.google.auto.service", "auto-service-annotations")
     }
 

diff --git a/src/main/java/org/openrewrite/java/testing/mockito/PowerMockitoMockStaticToMockito.java b/src/main/java/org/openrewrite/java/testing/mockito/PowerMockitoMockStaticToMockito.java
@@ -190,7 +190,9 @@ public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx)
 
             if (MOCKED_STATIC_MATCHER.matches(mi)) {
                 determineTestGroups();
-                if (!getCursor().getPath(o -> o instanceof J.Assignment || o instanceof J.Try.Resource).hasNext()) {
+                if (!getCursor().getPath(o -> o instanceof J.VariableDeclarations ||
+                                              o instanceof J.Assignment ||
+                                              o instanceof J.Try.Resource).hasNext()) {
                     //noinspection DataFlowIssue
                     return null;
                 }

diff --git a/src/test/java/org/openrewrite/java/testing/mockito/PowerMockitoMockStaticToMockitoTest.java b/src/test/java/org/openrewrite/java/testing/mockito/PowerMockitoMockStaticToMockitoTest.java
@@ -681,6 +681,25 @@ public void testStaticMethod() {
         );
     }
 
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite-testing-frameworks/issues/611")
+    void existingMockitoMockStaticShouldNotBeTouched() {
+        //language=java
+        rewriteRun(
+          java(
+            """
+            import static org.mockito.Mockito.mockStatic;
+
+            import org.mockito.MockedStatic;
+
+            class TestClass {
+                MockedStatic<String> mocked = mockStatic(String.class);
+            }
+            """
+          )
+        );
+    }
+
     @Test
     @Issue("https://github.com/openrewrite/rewrite-testing-frameworks/issues/358")
     void doesNotExplodeOnTopLevelMethodDeclaration() {

diff --git a/suppressions.xml b/suppressions.xml
@@ -1,3 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
+    <suppress until="2024-11-25Z">
+        <notes><![CDATA[
+                file name: rewrite-testing-frameworks-2.20.0-SNAPSHOT.jar: wiremock-jre8-2.35.0.jar: swagger-ui-bundle.js
+                false positive: js library that is shipped as part of this jar
+            ]]></notes>
+        <packageUrl regex="true">^pkg:javascript/DOMPurify@.*$</packageUrl>
+        <vulnerabilityName>CVE-2024-45801</vulnerabilityName>
+    </suppress>
 </suppressions>