Skip to content

Remove powermock from services #7860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 1 commit into from
Aug 16, 2023
Merged

Remove powermock from services #7860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../src/test/java/org/apache/cloudstack/affinity/NonStrictHostAntiAffinityProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.Spy;
import org.powermock.modules.junit4.PowerMockRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;

import java.util.ArrayList;
Expand All @@ -47,7 +47,7 @@
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.when;

@RunWith(PowerMockRunner.class)
@RunWith(MockitoJUnitRunner.class)
public class NonStrictHostAntiAffinityProcessorTest {

@Spy
Expand Down
8 changes: 4 additions & 4 deletions services/console-proxy/rdpconsole/src/test/java/common/ClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@

import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.modules.junit4.PowerMockRunner;
import org.powermock.reflect.Whitebox;
import org.mockito.junit.MockitoJUnitRunner;

import org.springframework.test.util.ReflectionTestUtils;
import streamer.Element;
import streamer.SocketWrapper;

@RunWith(PowerMockRunner.class)
@RunWith(MockitoJUnitRunner.class)
public class ClientTest {

@Test(expected = NullPointerException.class)
public void testAssemblePipelineWhenMainElementIsNull() throws Exception {
SocketWrapper socketMock = mock(SocketWrapper.class);
when(socketMock.getId()).thenReturn("socket");
Whitebox.setInternalState(Client.class, "socket", socketMock);
ReflectionTestUtils.setField(Client.class, "socket", socketMock);
Element main = null;

Client.assemblePipeline(main);
Expand Down
1 change: 1 addition & 0 deletions ...sole-proxy/rdpconsole/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mock-maker-inline
33 changes: 15 additions & 18 deletions ...-proxy/server/src/test/java/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,30 @@
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockedConstruction;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.mockito.junit.MockitoJUnitRunner;

import java.util.Map;

@RunWith(PowerMockRunner.class)
@RunWith(MockitoJUnitRunner.class)
public class ConsoleProxyHttpHandlerHelperTest {

@Mock
ConsoleProxyPasswordBasedEncryptor encryptor;

@Test
@PrepareForTest({ConsoleProxy.class, ConsoleProxyHttpHandlerHelper.class})
public void testQueryMapExtraParameter() throws Exception {
PowerMockito.mockStatic(ConsoleProxy.class);
PowerMockito.when(ConsoleProxy.getEncryptorPassword()).thenReturn("password");
PowerMockito.whenNew(ConsoleProxyPasswordBasedEncryptor.class).withArguments(Mockito.anyString()).thenReturn(encryptor);
Mockito.when(encryptor.decryptObject(Mockito.eq(ConsoleProxyClientParam.class), Mockito.anyString())).thenReturn(null);
try (MockedStatic<ConsoleProxy> ignore = Mockito.mockStatic(ConsoleProxy.class);
MockedConstruction<ConsoleProxyPasswordBasedEncryptor> ignored = Mockito.mockConstruction(ConsoleProxyPasswordBasedEncryptor.class, (mock, context) -> {
Mockito.when(mock.decryptObject(Mockito.eq(ConsoleProxyClientParam.class), Mockito.anyString())).thenReturn(null);
});) {
Mockito.when(ConsoleProxy.getEncryptorPassword()).thenReturn("password");

String extraValidationToken = "test-token";
String query = String.format("token=SOME_TOKEN&extra=%s", extraValidationToken);
String extraValidationToken = "test-token";
String query = String.format("token=SOME_TOKEN&extra=%s", extraValidationToken);

Map<String, String> queryMap = ConsoleProxyHttpHandlerHelper.getQueryMap(query);
Assert.assertTrue(queryMap.containsKey("extra"));
Assert.assertEquals(extraValidationToken, queryMap.get("extra"));
Map<String, String> queryMap = ConsoleProxyHttpHandlerHelper.getQueryMap(query);
Assert.assertTrue(queryMap.containsKey("extra"));
Assert.assertEquals(extraValidationToken, queryMap.get("extra"));
}
}
}
1 change: 1 addition & 0 deletions .../console-proxy/server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mock-maker-inline
46 changes: 21 additions & 25 deletions ...src/test/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,54 +22,50 @@
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.spy;

import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
import java.io.StringWriter;

import org.apache.cloudstack.storage.command.DeleteCommand;
import org.apache.cloudstack.storage.to.TemplateObjectTO;
import org.apache.log4j.Level;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.mockito.Spy;
import org.mockito.junit.MockitoJUnitRunner;

import com.cloud.test.TestAppender;

@RunWith(PowerMockRunner.class)
@PowerMockIgnore({ "javax.xml.*", "org.xml.*"})
@RunWith(MockitoJUnitRunner.class)
public class NfsSecondaryStorageResourceTest {

@Spy
private NfsSecondaryStorageResource resource;

@Before
public void setUp() {
resource = new NfsSecondaryStorageResource();
}

@Test
@PrepareForTest(NfsSecondaryStorageResource.class)
public void testSwiftWriteMetadataFile() throws Exception {
String filename = "testfile";
String metaFileName = "test_metadata_file";
try {
String expected = "uniquename=test\nfilename=" + filename + "\nsize=100\nvirtualsize=1000";
String uniqueName = "test_unique_name";
String filename = "test_filename";
long size = 1024L;
long virtualSize = 2048L;

File metaFile = resource.swiftWriteMetadataFile(metaFileName, uniqueName, filename, size, virtualSize);

StringWriter stringWriter = new StringWriter();
BufferedWriter bufferWriter = new BufferedWriter(stringWriter);
PowerMockito.whenNew(BufferedWriter.class).withArguments(any(FileWriter.class)).thenReturn(bufferWriter);
Assert.assertTrue(metaFile.exists());
Assert.assertEquals(metaFileName, metaFile.getName());

resource.swiftWriteMetadataFile(filename, "test", filename, 100, 1000);
String expectedContent = "uniquename=" + uniqueName + "\n" +
"filename=" + filename + "\n" +
"size=" + size + "\n" +
"virtualsize=" + virtualSize;

Assert.assertEquals(expected, stringWriter.toString());
String actualContent = new String(java.nio.file.Files.readAllBytes(metaFile.toPath()));
Assert.assertEquals(expectedContent, actualContent);
} finally {
File remnance = new File(filename);
remnance.delete();
File metaFile = new File(metaFileName);
metaFile.delete();
}
}

Expand Down
1 change: 1 addition & 0 deletions ...ondary-storage/server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mock-maker-inline