This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 84e770bf958 Remove powermock from pom.xml (#8000)
84e770bf958 is described below
commit 84e770bf958f0b5b92475f42a2189652dbd3fab3
Author: Vishesh <[email protected]>
AuthorDate: Tue Sep 26 17:01:56 2023 +0530
Remove powermock from pom.xml (#8000)
---
client/pom.xml | 2 -
.../kvm/resource/LibvirtComputingResourceTest.java | 11 +-
.../kvm/storage/KVMStorageProcessorTest.java | 2 -
plugins/storage/volume/storpool/pom.xml | 7 +-
plugins/user-authenticators/ldap/pom.xml | 2 +-
pom.xml | 19 ---
.../ReflectionToStringBuilderUtilsTest.java | 178 ++++++++++-----------
7 files changed, 92 insertions(+), 129 deletions(-)
diff --git a/client/pom.xml b/client/pom.xml
index cbe45d88b6c..9da01e8647e 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -860,8 +860,6 @@
<exclude>com.tngtech.java:junit-dataprovider</exclude>
<exclude>org.mockito:mockito-all</exclude>
<exclude>org.hamcrest:hamcrest-all</exclude>
-
<exclude>org.powermock:powermock-module-junit4</exclude>
-
<exclude>org.powermock:powermock-api-mockito2</exclude>
<exclude>org.springframework:spring-test</exclude>
<exclude>org.apache.tomcat.embed:tomcat-embed-core</exclude>
<exclude>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</exclude>
diff --git
a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
index 59a3421b08b..8ae6d461fea 100644
---
a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
+++
b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
@@ -82,7 +82,6 @@ import org.libvirt.DomainInfo.DomainState;
import org.libvirt.DomainInterfaceStats;
import org.libvirt.LibvirtException;
import org.libvirt.MemoryStatistic;
-import org.libvirt.NodeInfo;
import org.libvirt.SchedUlongParameter;
import org.libvirt.StorageVol;
import org.libvirt.VcpuInfo;
@@ -936,13 +935,7 @@ public class LibvirtComputingResourceTest {
Mockito.when(domain.memoryStats(20)).thenReturn(domainMem);
Mockito.when(domainMem[0].getTag()).thenReturn(4);
Mockito.when(connect.domainLookupByName(VMNAME)).thenReturn(domain);
- final NodeInfo nodeInfo = new NodeInfo();
- nodeInfo.cpus = 8;
- nodeInfo.memory = 8 * 1024 * 1024;
- nodeInfo.sockets = 2;
- nodeInfo.threads = 2;
- nodeInfo.model = "Foo processor";
- Mockito.when(connect.nodeInfo()).thenReturn(nodeInfo);
+
// this is testing the interface stats, returns an increasing number
of sent and received bytes
Mockito.when(domain.interfaceStats(nullable(String.class))).thenAnswer(new
org.mockito.stubbing.Answer<DomainInterfaceStats>() {
@@ -1752,8 +1745,6 @@ public class LibvirtComputingResourceTest {
try {
when(conn.domainLookupByName(vmName)).thenReturn(dm);
- when(dm.getXMLDesc(8)).thenReturn("<domain type='kvm' id='3'>" + "
<devices>" + " <graphics type='vnc' port='5900' autoport='yes'
listen='10.10.10.1'>"
- + " <listen type='address' address='10.10.10.1'/>" +
" </graphics>" + " </devices>" + "</domain>");
when(dm.getXMLDesc(1)).thenReturn("<domain type='kvm' id='3'>" + "
<devices>" + " <graphics type='vnc' port='5900' autoport='yes'
listen='10.10.10.1'>"
+ " <listen type='address' address='10.10.10.1'/>" +
" </graphics>" + " </devices>" + "</domain>");
when(dm.isPersistent()).thenReturn(1);
diff --git
a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java
b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java
index a7ca3db99e4..8a2ba71a6fc 100644
---
a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java
+++
b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessorTest.java
@@ -230,7 +230,6 @@ public class KVMStorageProcessorTest {
@Test (expected = LibvirtException.class)
public void
validateTakeVolumeSnapshotFailToCreateSnapshotThrowLibvirtException() throws
LibvirtException{
Mockito.doReturn(diskToSnapshotAndDisksToAvoidMock).when(storageProcessorSpy).getDiskToSnapshotAndDisksToAvoid(Mockito.any(),
Mockito.anyString(), Mockito.any());
- Mockito.doReturn("").when(domainMock).getName();
Mockito.doReturn(new
HashSet<>()).when(diskToSnapshotAndDisksToAvoidMock).second();
Mockito.doThrow(LibvirtException.class).when(domainMock).snapshotCreateXML(Mockito.anyString(),
Mockito.anyInt());
@@ -242,7 +241,6 @@ public class KVMStorageProcessorTest {
String expectedResult = "label";
Mockito.doReturn(diskToSnapshotAndDisksToAvoidMock).when(storageProcessorSpy).getDiskToSnapshotAndDisksToAvoid(Mockito.any(),
Mockito.anyString(), Mockito.any());
- Mockito.doReturn("").when(domainMock).getName();
Mockito.doReturn(expectedResult).when(diskToSnapshotAndDisksToAvoidMock).first();
Mockito.doReturn(new
HashSet<>()).when(diskToSnapshotAndDisksToAvoidMock).second();
Mockito.doReturn(null).when(domainMock).snapshotCreateXML(Mockito.anyString(),
Mockito.anyInt());
diff --git a/plugins/storage/volume/storpool/pom.xml
b/plugins/storage/volume/storpool/pom.xml
index f0a3972d3e5..437e236dc6f 100644
--- a/plugins/storage/volume/storpool/pom.xml
+++ b/plugins/storage/volume/storpool/pom.xml
@@ -1,4 +1,4 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
license agreements. See the NOTICE file distributed with this work for
additional
information regarding copyright ownership. The ASF licenses this file to
you under the Apache License, Version 2.0 (the "License"); you may not use
@@ -51,11 +51,6 @@
<artifactId>commons-collections4</artifactId>
<version>${cs.commons-collections.version}</version>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>4.7.0</version>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
diff --git a/plugins/user-authenticators/ldap/pom.xml
b/plugins/user-authenticators/ldap/pom.xml
index 6ccbfa8583d..60f60630f64 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -149,7 +149,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-inline</artifactId>
<version>${cs.mockito.version}</version>
<scope>compile</scope>
<exclusions>
diff --git a/pom.xml b/pom.xml
index 8f2748be187..d595723a9ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,6 @@
<cs.junit.jupiter.version>5.9.1</cs.junit.jupiter.version>
<cs.guava-testlib.version>18.0</cs.guava-testlib.version>
<cs.mockito.version>3.12.4</cs.mockito.version>
- <cs.powermock.version>2.0.5</cs.powermock.version>
<cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
<cs.selenium-java-client-driver.version>1.0.1</cs.selenium-java-client-driver.version>
<cs.testng.version>7.1.0</cs.testng.version>
@@ -741,24 +740,6 @@
<version>${cs.junit.dataprovider.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-core</artifactId>
- <version>${cs.powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>${cs.powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <version>${cs.powermock.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
diff --git
a/utils/src/test/java/org/apache/cloudstack/utils/reflectiontostringbuilderutils/ReflectionToStringBuilderUtilsTest.java
b/utils/src/test/java/org/apache/cloudstack/utils/reflectiontostringbuilderutils/ReflectionToStringBuilderUtilsTest.java
index 75befde3efd..48bb972b8a2 100644
---
a/utils/src/test/java/org/apache/cloudstack/utils/reflectiontostringbuilderutils/ReflectionToStringBuilderUtilsTest.java
+++
b/utils/src/test/java/org/apache/cloudstack/utils/reflectiontostringbuilderutils/ReflectionToStringBuilderUtilsTest.java
@@ -91,63 +91,63 @@ public class ReflectionToStringBuilderUtilsTest extends
TestCase {
@Test
public void validateGetObjectClassInvalidObjectMustReturnNull(){
- MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isValidObject(Mockito.any())).thenReturn(false);
- Class<?> result =
ReflectionToStringBuilderUtils.getObjectClass("test");
+ try (MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS)) {
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isValidObject(Mockito.any())).thenReturn(false);
+ Class<?> result =
ReflectionToStringBuilderUtils.getObjectClass("test");
- Assert.assertNull(result);
- reflectionToStringBuilderUtilsMocked.close();
+ Assert.assertNull(result);
+ }
}
@Test
public void
validateGetObjectClassObjectIsNotACollectionMustReturnObjectClass(){
Class<?> expectedResult = classToReflect;
- MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isValidObject(Mockito.any())).thenReturn(true);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isCollection(Mockito.any())).thenReturn(false);
+ try (MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS)) {
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isValidObject(Mockito.any())).thenReturn(true);
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isCollection(Mockito.any())).thenReturn(false);
- Class<?> result =
ReflectionToStringBuilderUtils.getObjectClass("test");
+ Class<?> result =
ReflectionToStringBuilderUtils.getObjectClass("test");
- Assert.assertEquals(expectedResult, result);
- reflectionToStringBuilderUtilsMocked.close();
+ Assert.assertEquals(expectedResult, result);
+ }
}
@Test
public void
validateGetObjectClassObjectIsAnEmptyCollectionMustReturnNull(){
- MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isValidObject(Mockito.any())).thenReturn(true);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isCollection(Mockito.any())).thenReturn(true);
+ try (MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS)) {
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isValidObject(Mockito.any())).thenReturn(true);
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isCollection(Mockito.any())).thenReturn(true);
- Class<?> result = ReflectionToStringBuilderUtils.getObjectClass(new
ArrayList<String>());
+ Class<?> result =
ReflectionToStringBuilderUtils.getObjectClass(new ArrayList<String>());
- Assert.assertNull(result);
- reflectionToStringBuilderUtilsMocked.close();
+ Assert.assertNull(result);
+ }
}
@Test
public void
validateGetObjectClassObjectIsACollectionWithOnlyNullValuesMustReturnNull(){
- MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isValidObject(Mockito.any())).thenReturn(true);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isCollection(Mockito.any())).thenReturn(true);
+ try (MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS)) {
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isValidObject(Mockito.any())).thenReturn(true);
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isCollection(Mockito.any())).thenReturn(true);
- Class<?> result = ReflectionToStringBuilderUtils.getObjectClass(new
ArrayList<String>(Arrays.asList(null, null)));
+ Class<?> result =
ReflectionToStringBuilderUtils.getObjectClass(new
ArrayList<String>(Arrays.asList(null, null)));
- Assert.assertNull(result);
- reflectionToStringBuilderUtilsMocked.close();
+ Assert.assertNull(result);
+ }
}
@Test
public void
validateGetObjectClassObjectIsACollectionWithAtLeastOneObjectsMustReturnObjectClass(){
Class<?> expectedResult = classToReflect;
- MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isValidObject(Mockito.any())).thenReturn(true);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isCollection(Mockito.any())).thenReturn(true);
+ try (MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS)) {
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isValidObject(Mockito.any())).thenReturn(true);
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isCollection(Mockito.any())).thenReturn(true);
- Class<?> result = ReflectionToStringBuilderUtils.getObjectClass(new
ArrayList<>(Arrays.asList(null, "test1")));
+ Class<?> result =
ReflectionToStringBuilderUtils.getObjectClass(new
ArrayList<>(Arrays.asList(null, "test1")));
- Assert.assertEquals(expectedResult, result);
- reflectionToStringBuilderUtilsMocked.close();
+ Assert.assertEquals(expectedResult, result);
+ }
}
@Test
@@ -162,13 +162,13 @@ public class ReflectionToStringBuilderUtilsTest extends
TestCase {
@Test
public void validateGetNonSelectedFieldsNullObjectClassMustReturnNull(){
- MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.getObjectClass(Mockito.any())).thenReturn(null);
+ try (MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS)) {
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.getObjectClass(Mockito.any())).thenReturn(null);
- String[] result =
ReflectionToStringBuilderUtils.getNonSelectedFields(null, "test1", "test2");
+ String[] result =
ReflectionToStringBuilderUtils.getNonSelectedFields(null, "test1", "test2");
- Assert.assertNull(result);
- reflectionToStringBuilderUtilsMocked.close();
+ Assert.assertNull(result);
+ }
}
@Test
@@ -250,28 +250,28 @@ public class ReflectionToStringBuilderUtilsTest extends
TestCase {
@Test
public void
validateReflectOnlySelectedFieldsNullNonSelectedFieldsMustReturnNull() throws
Exception{
- MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.getNonSelectedFields(Mockito.any(),
Mockito.any())).thenReturn(null);
+ try (MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS)) {
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.getNonSelectedFields(Mockito.any(),
Mockito.any())).thenReturn(null);
- TO_STRING_STYLES.forEach(style -> {
- String result =
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(null, style, "-");
- Assert.assertNull(result);
- });
- reflectionToStringBuilderUtilsMocked.close();
+ TO_STRING_STYLES.forEach(style -> {
+ String result =
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(null, style, "-");
+ Assert.assertNull(result);
+ });
+ }
}
@Test
public void
validateReflectOnlySelectedFieldsEmptyNonSelectedFieldsMustReturnEmptyString()
throws Exception{
String expectedResult = "";
- MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.getNonSelectedFields(Mockito.any(),
Mockito.any())).thenReturn(new String[0]);
+ try (MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS)) {
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.getNonSelectedFields(Mockito.any(),
Mockito.any())).thenReturn(new String[0]);
- TO_STRING_STYLES.forEach(style -> {
- String result =
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(null, style, "-");
- Assert.assertEquals(expectedResult, result);
- });
- reflectionToStringBuilderUtilsMocked.close();
+ TO_STRING_STYLES.forEach(style -> {
+ String result =
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(null, style, "-");
+ Assert.assertEquals(expectedResult, result);
+ });
+ }
}
@Test
@@ -279,85 +279,85 @@ public class ReflectionToStringBuilderUtilsTest extends
TestCase {
String fieldToRemove = classToReflectRemovedField;
String expectedResult = "test";
- MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.getNonSelectedFields(Mockito.any(),
Mockito.any())).thenReturn(classToReflectFieldsNamesArray);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.reflectCollection(Mockito.any(), Mockito.any(),
Mockito.anyString(), Mockito.any())).thenReturn(expectedResult);
+ try (MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS)) {
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.getNonSelectedFields(Mockito.any(),
Mockito.any())).thenReturn(classToReflectFieldsNamesArray);
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.reflectCollection(Mockito.any(), Mockito.any(),
Mockito.anyString(), Mockito.any())).thenReturn(expectedResult);
- TO_STRING_STYLES.forEach(style -> {
- String result =
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(new Object(), style,
"-", fieldToRemove);
- Assert.assertEquals(expectedResult, result);
- });
- reflectionToStringBuilderUtilsMocked.close();
+ TO_STRING_STYLES.forEach(style -> {
+ String result =
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(new Object(), style,
"-", fieldToRemove);
+ Assert.assertEquals(expectedResult, result);
+ });
+ }
}
@Test
public void
validateReflectOnlySelectedFieldsObjectIsNotACollectionMustReflectObject()
throws Exception{
String expectedResult = "test";
- MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.getNonSelectedFields(Mockito.any(),
Mockito.any())).thenReturn(classToReflectFieldsNamesArray);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.reflectCollection(Mockito.any(), Mockito.any(),
Mockito.anyString(), Mockito.any())).thenReturn(null);
+ try (MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS)) {
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.getNonSelectedFields(Mockito.any(),
Mockito.any())).thenReturn(classToReflectFieldsNamesArray);
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.reflectCollection(Mockito.any(), Mockito.any(),
Mockito.anyString(), Mockito.any())).thenReturn(null);
- for (ToStringStyle style : TO_STRING_STYLES){
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.getReflectedObject(Mockito.any(), Mockito.any(),
Mockito.any())).thenReturn(expectedResult);
- String result =
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(expectedResult, style,
"-", classToReflectFieldsNamesArray);
- Assert.assertEquals(expectedResult, result);
+ for (ToStringStyle style : TO_STRING_STYLES) {
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.getReflectedObject(Mockito.any(), Mockito.any(),
Mockito.any())).thenReturn(expectedResult);
+ String result =
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(expectedResult, style,
"-", classToReflectFieldsNamesArray);
+ Assert.assertEquals(expectedResult, result);
+ }
}
- reflectionToStringBuilderUtilsMocked.close();
}
@Test
public void
validateReflectOnlySelectedFieldsDefaultStyleReflectionNullMustReturnNull(){
String expectedResult = null;
- MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(Mockito.any(),
Mockito.any(), Mockito.anyString(), Mockito.any())).thenReturn(null);
+ try (MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS)) {
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(Mockito.any(),
Mockito.any(), Mockito.anyString(), Mockito.any())).thenReturn(null);
- String result =
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(new Object(),
(String[]) null);
- Assert.assertEquals(expectedResult, result);
- reflectionToStringBuilderUtilsMocked.close();
+ String result =
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(new Object(),
(String[]) null);
+ Assert.assertEquals(expectedResult, result);
+ }
}
@Test
public void
validateReflectOnlySelectedFieldsDefaultStyleReflectCollectionMustReturnValue(){
String expectedResult = "[test]";
- MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(Mockito.any(),
Mockito.any(), Mockito.anyString(), Mockito.any())).thenReturn("test");
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isCollection(Mockito.any())).thenReturn(true);
+ try (MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS)) {
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(Mockito.any(),
Mockito.any(), Mockito.anyString(), Mockito.any())).thenReturn("test");
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isCollection(Mockito.any())).thenReturn(true);
- String result =
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(new Object());
- Assert.assertEquals(expectedResult, result);
- reflectionToStringBuilderUtilsMocked.close();
+ String result =
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(new Object());
+ Assert.assertEquals(expectedResult, result);
+ }
}
@Test
public void
validateReflectOnlySelectedFieldsDefaultStyleReflectMustReturnValue(){
String expectedResult = "test";
- MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(Mockito.any(),
Mockito.any(), Mockito.anyString(), Mockito.any())).thenReturn(expectedResult);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isCollection(Mockito.any())).thenReturn(false);
+ try (MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS)) {
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(Mockito.any(),
Mockito.any(), Mockito.anyString(), Mockito.any())).thenReturn(expectedResult);
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.isCollection(Mockito.any())).thenReturn(false);
- String result =
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(new Object());
- Assert.assertEquals(expectedResult, result);
- reflectionToStringBuilderUtilsMocked.close();
+ String result =
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(new Object());
+ Assert.assertEquals(expectedResult, result);
+ }
}
@Test
public void
reflectCollectionTestCallBaseReflectCollectionMethodWithDefaultParameters() {
String expected = "test";
- MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS);
- reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.reflectCollection(Mockito.any(), Mockito.any(),
Mockito.anyString(), Mockito.any())).thenReturn(expected);
+ try (MockedStatic<ReflectionToStringBuilderUtils>
reflectionToStringBuilderUtilsMocked =
Mockito.mockStatic(ReflectionToStringBuilderUtils.class,
Mockito.CALLS_REAL_METHODS)) {
+ reflectionToStringBuilderUtilsMocked.when(() ->
ReflectionToStringBuilderUtils.reflectCollection(Mockito.any(), Mockito.any(),
Mockito.anyString(), Mockito.any())).thenReturn(expected);
- Object object = Mockito.mock(Object.class);
- String result =
ReflectionToStringBuilderUtils.reflectCollection(object);
+ Object object = Mockito.mock(Object.class);
+ String result =
ReflectionToStringBuilderUtils.reflectCollection(object);
- Assert.assertEquals(expected, result);
+ Assert.assertEquals(expected, result);
- String[] excludeFields = null;
- reflectionToStringBuilderUtilsMocked.verify(() ->
ReflectionToStringBuilderUtils.reflectCollection(object, DEFAULT_STYLE,
DEFAULT_MULTIPLE_VALUES_SEPARATOR, excludeFields));
- reflectionToStringBuilderUtilsMocked.close();
+ String[] excludeFields = null;
+ reflectionToStringBuilderUtilsMocked.verify(() ->
ReflectionToStringBuilderUtils.reflectCollection(object, DEFAULT_STYLE,
DEFAULT_MULTIPLE_VALUES_SEPARATOR, excludeFields));
+ }
}
}
