diff options
| -rw-r--r-- | vid-app-common/src/test/java/org/onap/vid/job/command/ServiceInProgressStatusCommandTest.java | 11 | ||||
| -rw-r--r-- | vid-app-common/src/test/java/org/onap/vid/testUtils/TestUtils.java | 27 |
2 files changed, 24 insertions, 14 deletions
diff --git a/vid-app-common/src/test/java/org/onap/vid/job/command/ServiceInProgressStatusCommandTest.java b/vid-app-common/src/test/java/org/onap/vid/job/command/ServiceInProgressStatusCommandTest.java index 527ba17ad..31dbc9f6d 100644 --- a/vid-app-common/src/test/java/org/onap/vid/job/command/ServiceInProgressStatusCommandTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/job/command/ServiceInProgressStatusCommandTest.java @@ -58,6 +58,7 @@ import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.*; import static org.onap.vid.job.Job.JobStatus.*; +import static org.onap.vid.testUtils.TestUtils.testWithSystemProperty; public class ServiceInProgressStatusCommandTest { @@ -218,11 +219,9 @@ public class ServiceInProgressStatusCommandTest { } @Test(dataProvider = "isExpiredJobStatusData") - public void isExpiredJobStatusTest(ZonedDateTime jobStartTime, String configValue, boolean expectedResult) { - SystemProperties systemProperties = new SystemProperties(); - systemProperties.setEnvironment(environment); - when(environment.getRequiredProperty(VidProperties.VID_JOB_MAX_HOURS_IN_PROGRESS)).thenReturn(configValue); - when(environment.containsProperty(VidProperties.VID_JOB_MAX_HOURS_IN_PROGRESS)).thenReturn(true); - Assert.assertEquals(command.getExpiryChecker().isExpired(jobStartTime), expectedResult); + public void isExpiredJobStatusTest(ZonedDateTime jobStartTime, String configValue, boolean expectedResult) throws Exception { + testWithSystemProperty(VidProperties.VID_JOB_MAX_HOURS_IN_PROGRESS, configValue, ()-> + Assert.assertEquals(command.getExpiryChecker().isExpired(jobStartTime), expectedResult) + ); } } diff --git a/vid-app-common/src/test/java/org/onap/vid/testUtils/TestUtils.java b/vid-app-common/src/test/java/org/onap/vid/testUtils/TestUtils.java index 3d919d72d..756d17534 100644 --- a/vid-app-common/src/test/java/org/onap/vid/testUtils/TestUtils.java +++ b/vid-app-common/src/test/java/org/onap/vid/testUtils/TestUtils.java @@ -50,6 +50,7 @@ import javax.ws.rs.core.GenericType; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.lang3.reflect.MethodUtils; import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.json.JSONArray; @@ -61,6 +62,7 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.onap.portalsdk.core.util.SystemProperties; import org.onap.vid.asdc.beans.Service; +import org.springframework.core.env.Environment; import org.springframework.mock.env.MockEnvironment; /** @@ -252,18 +254,27 @@ public class TestUtils { } - //Please use resetSystemProperties after using this method, so other test won't be affected - public static void mockSystemPropertyWithKeyValue(String key, String value) { - MockEnvironment mockEnvironment = new MockEnvironment(); - mockEnvironment.setProperty(key, value); + public interface Test { - SystemProperties systemProperties = new SystemProperties(); - systemProperties.setEnvironment(mockEnvironment); + void apply(); } - public static void resetSystemProperties() { + public static void testWithSystemProperty(String key, String value, Test test) throws Exception { SystemProperties systemProperties = new SystemProperties(); - systemProperties.setEnvironment(null); + //use reflection to invoke protected method + Environment originalEnvironment = (Environment) MethodUtils + .invokeMethod(systemProperties, true, "getEnvironment"); + + try { + Environment environment = mock(Environment.class); + systemProperties.setEnvironment(environment); + when(environment.getRequiredProperty(key)).thenReturn(value); + when(environment.containsProperty(key)).thenReturn(true); + test.apply(); + } + finally { + systemProperties.setEnvironment(originalEnvironment); + } } } |