From 8145e8be9acfdab3bddaec23cc337969ea1ce8dd Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Mon, 26 Aug 2024 16:05:47 +0200 Subject: [PATCH] Apply formatter to PowerMockitoMockStaticToMockito --- .../PowerMockitoMockStaticToMockito.java | 1 + .../PowerMockitoMockStaticToMockitoTest.java | 151 +++++++++--------- 2 files changed, 77 insertions(+), 75 deletions(-) diff --git a/src/main/java/org/openrewrite/java/testing/mockito/PowerMockitoMockStaticToMockito.java b/src/main/java/org/openrewrite/java/testing/mockito/PowerMockitoMockStaticToMockito.java index 4c8def8f0..b6d0712d5 100644 --- a/src/main/java/org/openrewrite/java/testing/mockito/PowerMockitoMockStaticToMockito.java +++ b/src/main/java/org/openrewrite/java/testing/mockito/PowerMockitoMockStaticToMockito.java @@ -69,6 +69,7 @@ private static class PowerMockitoToMockitoVisitor extends JavaVisitor mockedCalendar; @BeforeEach @@ -219,38 +219,38 @@ void tearDownMethodOfTestNGHasAnnotationWithArgument() { java( """ import java.util.Calendar; - + import org.testng.annotations.Test; import org.powermock.core.classloader.annotations.PrepareForTest; - + @PrepareForTest({Calendar.class}) public class MyTest { - + @Test void testSomething() { } - + } """, """ import java.util.Calendar; - + import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - + public class MyTest { - + @BeforeMethod void setUpStaticMocks() { } - + @AfterMethod(alwaysRun = true) void tearDownStaticMocks() { } - + @Test void testSomething() { } - + } """ ) @@ -264,41 +264,41 @@ void tearDownMethodOfTestNGWithAnnotationRemainsUntouched() { java( """ import java.util.Calendar; - + import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; import org.powermock.core.classloader.annotations.PrepareForTest; - + @PrepareForTest({Calendar.class}) public class MyTest { - + @AfterMethod(groups = "irrelevant") void tearDown() {} - + @Test void testSomething() { } - + } """, """ import java.util.Calendar; - + import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - + public class MyTest { - + @AfterMethod(groups = "irrelevant") void tearDown() {} - + @BeforeMethod void setUpStaticMocks() { } - + @Test void testSomething() { } - + } """ ) @@ -312,22 +312,22 @@ void tearDownMethodOfTestNGHasAnnotationWithSameArgumentsAsTheTestThatCallsMockS java( """ import java.util.Calendar; - + import static org.mockito.Mockito.*; - + import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.powermock.core.classloader.annotations.PrepareForTest; - + @PrepareForTest({Calendar.class}) public class MyTest { - + private Calendar calendarMock; - + @Test(groups = "irrelevant") void testSomethingIrrelevantForCheckin() { } - + @Test(groups = "checkin") void testStaticMethod() { calendarMock = mock(Calendar.class); @@ -338,33 +338,33 @@ void testStaticMethod() { """, """ import java.util.Calendar; - + import static org.mockito.Mockito.*; - + import org.mockito.MockedStatic; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; - + public class MyTest { - + private MockedStatic mockedCalendar; - + private Calendar calendarMock; - + @BeforeMethod(groups = "checkin") void setUpStaticMocks() { mockedCalendar = mockStatic(Calendar.class); } - + @AfterMethod(groups = "checkin") void tearDownStaticMocks() { mockedCalendar.closeOnDemand(); } - + @Test(groups = "irrelevant") void testSomethingIrrelevantForCheckin() { } - + @Test(groups = "checkin") void testStaticMethod() { calendarMock = mock(Calendar.class); @@ -383,19 +383,19 @@ void argumentOfWhenOnStaticMethodWithParametersIsReplacedByLambda() { java( """ import static org.mockito.Mockito.*; - + import java.util.Calendar; import java.util.Locale; - + import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; - + public class MyTest { - + private MockedStatic mockedCalendar; - + private Calendar calendarMock = mock(Calendar.class); - + @Test void testStaticMethod() { when(Calendar.getInstance(Locale.ENGLISH)).thenReturn(calendarMock); @@ -404,19 +404,19 @@ void testStaticMethod() { """, """ import static org.mockito.Mockito.*; - + import java.util.Calendar; import java.util.Locale; - + import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; - + public class MyTest { - + private MockedStatic mockedCalendar; - + private Calendar calendarMock = mock(Calendar.class); - + @Test void testStaticMethod() { mockedCalendar.when(() -> Calendar.getInstance(Locale.ENGLISH)).thenReturn(calendarMock); @@ -434,16 +434,16 @@ void argumentOfWhenOnInstanceMethodsAreNotReplaced() { java( """ import static org.mockito.Mockito.*; - + import java.util.Calendar; import java.util.Locale; - + import org.junit.jupiter.api.Test; - + public class MyTest { - + private Calendar calendarMock = mock(Calendar.class); - + @Test void testStaticMethod() { when(calendarMock.toString()).thenReturn(null); @@ -461,19 +461,19 @@ void argumentOfVerifyOnParameterlessStaticMethodIsReplacedBySimpleLambda() { java( """ import static org.mockito.Mockito.*; - + import java.util.Currency; import java.util.Locale; - + import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; - + public class MyTest { - + private MockedStatic mockedCurrency; - + private Currency currencyMock = mock(Currency.class); - + @Test void testStaticMethod() { verify(Currency.getInstance(Locale.ENGLISH), never()); @@ -483,19 +483,19 @@ void testStaticMethod() { """, """ import static org.mockito.Mockito.*; - + import java.util.Currency; import java.util.Locale; - + import org.junit.jupiter.api.Test; import org.mockito.MockedStatic; - + public class MyTest { - + private MockedStatic mockedCurrency; - + private Currency currencyMock = mock(Currency.class); - + @Test void testStaticMethod() { mockedCurrency.verify(() -> Currency.getInstance(Locale.ENGLISH), never()); @@ -519,13 +519,13 @@ public interface MyInterface { } """) , java( - """ + """ public abstract class MyAbstractClass { - + public boolean isItTrue() { return true; } - + public abstract boolean isItImplemented(); - + } """ )); @@ -537,14 +537,14 @@ void extensionOfPowerMockTestCaseGetsRemoved() { rewriteRun(java( """ package org.powermock.modules.testng; - + public class PowerMockTestCase {} """ ), java( """ import org.powermock.modules.testng.PowerMockTestCase; - + public class MyPowerMockTestCase extends PowerMockTestCase {} """, """ @@ -560,14 +560,14 @@ void extensionOfPowerMockConfigurationGetsRemoved() { java( """ package org.powermock.configuration; - + public class PowerMockConfiguration {} """ ), java( """ import org.powermock.configuration.PowerMockConfiguration; - + public class MyPowerMockConfiguration extends PowerMockConfiguration {} """, """ @@ -608,6 +608,7 @@ void doesNotExplodeOnTopLevelMethodDeclaration() { rewriteRun( groovy( "def myFun() { }" - )); + ) + ); } }