From 1dcf2f8408c55ebc8594343ea555efed3c3df87d Mon Sep 17 00:00:00 2001
From: Tim te Beek <tim@moderne.io>
Date: Tue, 23 Jun 2026 09:37:57 +0200
Subject: [PATCH] Keep `mockStatic` import in `CleanupMockitoImports` when type
 info is incomplete

---
 .../mockito/CleanupMockitoImports.java        |  2 ++
 .../mockito/CleanupMockitoImportsTest.java    | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/main/java/org/openrewrite/java/testing/mockito/CleanupMockitoImports.java b/src/main/java/org/openrewrite/java/testing/mockito/CleanupMockitoImports.java
index 3c33db8b9..94ddd6dd7 100644
--- a/src/main/java/org/openrewrite/java/testing/mockito/CleanupMockitoImports.java
+++ b/src/main/java/org/openrewrite/java/testing/mockito/CleanupMockitoImports.java
@@ -67,6 +67,8 @@ private static class CleanupMockitoImportsVisitor extends JavaIsoVisitor<Executi
                 "ignoreStubs",
                 "inOrder",
                 "mock",
+                "mockConstruction",
+                "mockStatic",
                 "mockingDetails",
                 "never",
                 "only",
diff --git a/src/test/java/org/openrewrite/java/testing/mockito/CleanupMockitoImportsTest.java b/src/test/java/org/openrewrite/java/testing/mockito/CleanupMockitoImportsTest.java
index 73f2e361f..d7af8ec05 100755
--- a/src/test/java/org/openrewrite/java/testing/mockito/CleanupMockitoImportsTest.java
+++ b/src/test/java/org/openrewrite/java/testing/mockito/CleanupMockitoImportsTest.java
@@ -172,6 +172,27 @@ class OtherClass {
         );
     }
 
+    @Test
+    void doNotRemoveMockStaticImportPossiblyAssociatedWithAnUntypedMockitoMethod() {
+        //language=java
+        rewriteRun(
+          spec -> spec.typeValidationOptions(TypeValidation.all().methodInvocations(false)),
+          java(
+            """
+              import static org.mockito.Mockito.mockStatic;
+
+              class MyObjectTest {
+                void test() {
+                  mockStatic(MyObject.class);
+                }
+              }
+              class MyObject {
+              }
+              """
+          )
+        );
+    }
+
     @Test
     void doNotRemoveStartImportsPossiblyAssociatedWithAnUntypedMockitoMethod() {
         //language=java