SMHE-2453 Bij_een_retry_de_actuele_ip_gegevens_gebruiken

revert update unit test testRequestFromScheduledTaskIsCreatedWithLatestDeviceNetworkAddress

Signed-off-by: natasjanortier <[email protected]>

Author: natasja-n

osgp/platform/osgp-core/src/test/java/org/opensmartgridplatform/core/application/tasks/ScheduledTaskExecutorServiceTest.java

@@ -27,8 +27,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.EnumSource;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
@@ -243,12 +241,9 @@ void testMetadataOfScheduledTaskToRetryRequest() throws FunctionalException {
     assertThat(protocolRequestMessage.getDeviceModelCode()).isEqualTo(deviceModelCode);
   }
 
-  @ParameterizedTest
-  @EnumSource(
-      value = ScheduledTaskStatusType.class,
-      names = {"NEW", "RETRY"})
-  void testRequestFromScheduledTaskIsCreatedWithLatestDeviceNetworkAddress(
-      final ScheduledTaskStatusType statusType) throws FunctionalException {
+  @Test
+  void testRequestFromScheduledTaskIsCreatedWithLatestDeviceNetworkAddress()
+      throws FunctionalException {
     final String deviceIdentification = "device-1";
     final String deviceModelCode = "E,M1,M2,M3,M4";
     final String oldNetworkAddress = "oldNetworkAddress";
@@ -272,15 +267,10 @@ void testRequestFromScheduledTaskIsCreatedWithLatestDeviceNetworkAddress(
             eq(ScheduledTaskStatusType.PENDING), any(Timestamp.class), any(Pageable.class)))
         .thenReturn(new ArrayList<>());
     when(this.scheduledTaskRepository.findByStatusAndScheduledTimeLessThan(
-            eq(statusType), any(Timestamp.class), any(Pageable.class)))
+            eq(ScheduledTaskStatusType.NEW), any(Timestamp.class), any(Pageable.class)))
         .thenReturn(List.of(scheduledTask), Collections.emptyList());
     when(this.scheduledTaskRepository.findByStatusAndScheduledTimeLessThan(
-            eq(
-                statusType == ScheduledTaskStatusType.NEW
-                    ? ScheduledTaskStatusType.RETRY
-                    : ScheduledTaskStatusType.NEW),
-            any(Timestamp.class),
-            any(Pageable.class)))
+            eq(ScheduledTaskStatusType.RETRY), any(Timestamp.class), any(Pageable.class)))
         .thenReturn(new ArrayList<>());
     when(this.scheduledTaskExecutorJobConfig.getScheduledTaskThreadPoolSize()).thenReturn(1);
 
@@ -291,6 +281,7 @@ void testRequestFromScheduledTaskIsCreatedWithLatestDeviceNetworkAddress(
     final ProtocolRequestMessage protocolRequestMessage =
         this.protocolRequestMessageCaptor.getValue();
     assertThat(protocolRequestMessage).isNotNull();
+
     assertThat(protocolRequestMessage.getIpAddress()).isEqualTo(newNetworkAddress);
   }