Skip to content

Commit fe70f4d

Browse files
vishesh92vishesh92
authored
Remove powermock from services (apache#7860)
1 parent 5559668 commit fe70f4d

7 files changed

Lines changed: 45 additions & 49 deletions

File tree

‎plugins/affinity-group-processors/non-strict-host-anti-affinity/src/test/java/org/apache/cloudstack/affinity/NonStrictHostAntiAffinityProcessorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.mockito.Mock;
3636
import org.mockito.Mockito;
3737
import org.mockito.Spy;
38-
import org.powermock.modules.junit4.PowerMockRunner;
38+
import org.mockito.junit.MockitoJUnitRunner;
3939
import org.springframework.test.util.ReflectionTestUtils;
4040

4141
import java.util.ArrayList;
@@ -47,7 +47,7 @@
4747
import static org.mockito.ArgumentMatchers.nullable;
4848
import static org.mockito.Mockito.when;
4949

50-
@RunWith(PowerMockRunner.class)
50+
@RunWith(MockitoJUnitRunner.class)
5151
public class NonStrictHostAntiAffinityProcessorTest {
5252

5353
@Spy

‎services/console-proxy/rdpconsole/src/test/java/common/ClientTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@
2121

2222
import org.junit.Test;
2323
import org.junit.runner.RunWith;
24-
import org.powermock.modules.junit4.PowerMockRunner;
25-
import org.powermock.reflect.Whitebox;
24+
import org.mockito.junit.MockitoJUnitRunner;
2625

26+
import org.springframework.test.util.ReflectionTestUtils;
2727
import streamer.Element;
2828
import streamer.SocketWrapper;
2929

30-
@RunWith(PowerMockRunner.class)
30+
@RunWith(MockitoJUnitRunner.class)
3131
public class ClientTest {
3232

3333
@Test(expected = NullPointerException.class)
3434
public void testAssemblePipelineWhenMainElementIsNull() throws Exception {
3535
SocketWrapper socketMock = mock(SocketWrapper.class);
3636
when(socketMock.getId()).thenReturn("socket");
37-
Whitebox.setInternalState(Client.class, "socket", socketMock);
37+
ReflectionTestUtils.setField(Client.class, "socket", socketMock);
3838
Element main = null;
3939

4040
Client.assemblePipeline(main);

‎services/console-proxy/rdpconsole/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mock-maker-inline

‎services/console-proxy/server/src/test/java/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelperTest.java‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,30 @@
1919
import org.junit.Assert;
2020
import org.junit.Test;
2121
import org.junit.runner.RunWith;
22-
import org.mockito.Mock;
22+
import org.mockito.MockedConstruction;
23+
import org.mockito.MockedStatic;
2324
import org.mockito.Mockito;
24-
import org.powermock.api.mockito.PowerMockito;
25-
import org.powermock.core.classloader.annotations.PrepareForTest;
26-
import org.powermock.modules.junit4.PowerMockRunner;
25+
import org.mockito.junit.MockitoJUnitRunner;
2726

2827
import java.util.Map;
2928

30-
@RunWith(PowerMockRunner.class)
29+
@RunWith(MockitoJUnitRunner.class)
3130
public class ConsoleProxyHttpHandlerHelperTest {
3231

33-
@Mock
34-
ConsoleProxyPasswordBasedEncryptor encryptor;
35-
3632
@Test
37-
@PrepareForTest({ConsoleProxy.class, ConsoleProxyHttpHandlerHelper.class})
3833
public void testQueryMapExtraParameter() throws Exception {
39-
PowerMockito.mockStatic(ConsoleProxy.class);
40-
PowerMockito.when(ConsoleProxy.getEncryptorPassword()).thenReturn("password");
41-
PowerMockito.whenNew(ConsoleProxyPasswordBasedEncryptor.class).withArguments(Mockito.anyString()).thenReturn(encryptor);
42-
Mockito.when(encryptor.decryptObject(Mockito.eq(ConsoleProxyClientParam.class), Mockito.anyString())).thenReturn(null);
34+
try (MockedStatic<ConsoleProxy> ignore = Mockito.mockStatic(ConsoleProxy.class);
35+
MockedConstruction<ConsoleProxyPasswordBasedEncryptor> ignored = Mockito.mockConstruction(ConsoleProxyPasswordBasedEncryptor.class, (mock, context) -> {
36+
Mockito.when(mock.decryptObject(Mockito.eq(ConsoleProxyClientParam.class), Mockito.anyString())).thenReturn(null);
37+
});) {
38+
Mockito.when(ConsoleProxy.getEncryptorPassword()).thenReturn("password");
4339

44-
String extraValidationToken = "test-token";
45-
String query = String.format("token=SOME_TOKEN&extra=%s", extraValidationToken);
40+
String extraValidationToken = "test-token";
41+
String query = String.format("token=SOME_TOKEN&extra=%s", extraValidationToken);
4642

47-
Map<String, String> queryMap = ConsoleProxyHttpHandlerHelper.getQueryMap(query);
48-
Assert.assertTrue(queryMap.containsKey("extra"));
49-
Assert.assertEquals(extraValidationToken, queryMap.get("extra"));
43+
Map<String, String> queryMap = ConsoleProxyHttpHandlerHelper.getQueryMap(query);
44+
Assert.assertTrue(queryMap.containsKey("extra"));
45+
Assert.assertEquals(extraValidationToken, queryMap.get("extra"));
46+
}
5047
}
5148
}

‎services/console-proxy/server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mock-maker-inline

‎services/secondary-storage/server/src/test/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResourceTest.java‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -22,54 +22,50 @@
2222
import static org.mockito.Mockito.doThrow;
2323
import static org.mockito.Mockito.spy;
2424

25-
import java.io.BufferedWriter;
2625
import java.io.File;
27-
import java.io.FileWriter;
28-
import java.io.StringWriter;
2926

3027
import org.apache.cloudstack.storage.command.DeleteCommand;
3128
import org.apache.cloudstack.storage.to.TemplateObjectTO;
3229
import org.apache.log4j.Level;
3330
import org.junit.Assert;
34-
import org.junit.Before;
3531
import org.junit.Test;
3632
import org.junit.runner.RunWith;
3733
import org.mockito.Mockito;
38-
import org.powermock.api.mockito.PowerMockito;
39-
import org.powermock.core.classloader.annotations.PowerMockIgnore;
40-
import org.powermock.core.classloader.annotations.PrepareForTest;
41-
import org.powermock.modules.junit4.PowerMockRunner;
34+
import org.mockito.Spy;
35+
import org.mockito.junit.MockitoJUnitRunner;
4236

4337
import com.cloud.test.TestAppender;
4438

45-
@RunWith(PowerMockRunner.class)
46-
@PowerMockIgnore({ "javax.xml.*", "org.xml.*"})
39+
@RunWith(MockitoJUnitRunner.class)
4740
public class NfsSecondaryStorageResourceTest {
4841

42+
@Spy
4943
private NfsSecondaryStorageResource resource;
5044

51-
@Before
52-
public void setUp() {
53-
resource = new NfsSecondaryStorageResource();
54-
}
55-
5645
@Test
57-
@PrepareForTest(NfsSecondaryStorageResource.class)
5846
public void testSwiftWriteMetadataFile() throws Exception {
59-
String filename = "testfile";
47+
String metaFileName = "test_metadata_file";
6048
try {
61-
String expected = "uniquename=test\nfilename=" + filename + "\nsize=100\nvirtualsize=1000";
49+
String uniqueName = "test_unique_name";
50+
String filename = "test_filename";
51+
long size = 1024L;
52+
long virtualSize = 2048L;
53+
54+
File metaFile = resource.swiftWriteMetadataFile(metaFileName, uniqueName, filename, size, virtualSize);
6255

63-
StringWriter stringWriter = new StringWriter();
64-
BufferedWriter bufferWriter = new BufferedWriter(stringWriter);
65-
PowerMockito.whenNew(BufferedWriter.class).withArguments(any(FileWriter.class)).thenReturn(bufferWriter);
56+
Assert.assertTrue(metaFile.exists());
57+
Assert.assertEquals(metaFileName, metaFile.getName());
6658

67-
resource.swiftWriteMetadataFile(filename, "test", filename, 100, 1000);
59+
String expectedContent = "uniquename=" + uniqueName + "\n" +
60+
"filename=" + filename + "\n" +
61+
"size=" + size + "\n" +
62+
"virtualsize=" + virtualSize;
6863

69-
Assert.assertEquals(expected, stringWriter.toString());
64+
String actualContent = new String(java.nio.file.Files.readAllBytes(metaFile.toPath()));
65+
Assert.assertEquals(expectedContent, actualContent);
7066
} finally {
71-
File remnance = new File(filename);
72-
remnance.delete();
67+
File metaFile = new File(metaFileName);
68+
metaFile.delete();
7369
}
7470
}
7571

‎services/secondary-storage/server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mock-maker-inline

0 commit comments

Comments
 (0)