Correct type attributions in before sources

Author: knutwannheden

src/test/java/org/openrewrite/java/testing/hamcrest/RemoveIsMatcherTest.java

@@ -135,8 +135,8 @@ void noReplacementForOtherMethodInvocations() {
           java(
             """
               import org.junit.jupiter.api.Test;
+              import org.hamcrest.Matcher;
               import static org.hamcrest.MatcherAssert.assertThat;
-              import static org.hamcrest.Matcher;
               import static org.hamcrest.Matchers.*;
               
               class ATest {

src/test/java/org/openrewrite/java/testing/mockito/CleanupMockitoImportsTest.java

@@ -80,7 +80,7 @@ void doNotRemoveImportsPossiblyAssociatedWithAnUntypedMockitoMethod() {
             """
               import static org.mockito.Mockito.when;
               import static org.mockito.BDDMockito.given;
-              import static org.mockito.Mockito.verifyNoInteractions;
+              import static org.mockito.Mockito.verifyZeroInteractions;
 
               class MyObjectTest {
                 MyObject myObject;
@@ -89,9 +89,14 @@ class MyObjectTest {
                 void test() {
                   when(myObject.getSomeField()).thenReturn("testValue");
                   given(myObject.getSomeField()).willReturn("testValue");
-                  verifyNoInteractions(myMock);
+                  verifyZeroInteractions(myMock);
                 }
               }
+              class MyObject {
+                String getSomeField() { return null; }
+              }
+              class MyMockClass {
+              }
               """
           )
         );
@@ -106,7 +111,7 @@ void doNotRemoveImportsAssociatedWithAnUntypedMockitoMethodMixed() {
               import org.mockito.Mockito;
               import static org.mockito.Mockito.when;
               import static org.mockito.BDDMockito.given;
-              import static org.mockito.Mockito.verifyNoInteractions;
+              import static org.mockito.Mockito.verifyZeroInteractions;
 
               class MyObjectTest {
                 MyObject myObject;
@@ -115,10 +120,15 @@ class MyObjectTest {
                 void test() {
                   when(myObject.getSomeField()).thenReturn("testValue");
                   given(myObject.getSomeField()).willReturn("testValue");
-                  verifyNoInteractions(myMock);
+                  verifyZeroInteractions(myMock);
                   Mockito.reset();
                 }
               }
+              class MyObject {
+                String getSomeField() { return null; }
+              }
+              class MyMockClass {
+              }
               """
           )
         );
@@ -133,7 +143,7 @@ void doNotRemoveImportsAssociatedWithATypedMockitoMethodMixed() {
               import org.mockito.Mockito;
               import static org.mockito.Mockito.when;
               import static org.mockito.BDDMockito.given;
-              import static org.mockito.Mockito.verifyNoInteractions;
+              import static org.mockito.Mockito.verifyZeroInteractions;
 
               class MyObjectTest {
                 MyObject myObject;
@@ -142,10 +152,17 @@ class MyObjectTest {
                 void test() {
                   when(myObject.getSomeField()).thenReturn("testValue");
                   given(myObject.getSomeField()).willReturn("testValue");
-                  verifyNoInteractions(myMock);
+                  verifyZeroInteractions(myMock);
                   Mockito.mock(OtherClass.class);
                 }
               }
+              class MyObject {
+                String getSomeField() { return null; }
+              }
+              class MyMockClass {
+              }
+              class OtherClass {
+              }
               """
           )
         );
@@ -157,7 +174,7 @@ void doNotRemoveStartImportsPossiblyAssociatedWithAnUntypedMockitoMethod() {
         rewriteRun(
           java(
             """
-              import static org.mockito.Mockito.*;
+              import static org.mockito.Mockito.when;
 
               class MyObjectTest {
                 MyObject myObject;
@@ -166,6 +183,9 @@ void test() {
                   when(myObject.getSomeField()).thenReturn("testValue");
                 }
               }
+              class MyObject {
+                String getSomeField() { return null; }
+              }
               """
           )
         );