Commit db6a23ad authored by Anastasios Poimenidis's avatar Anastasios Poimenidis
Browse files

fix: use static imports for Mockito.verify and Mockito.times

parent 877c62e8

src/test/java/org/etsi/osl/hypo/api/tmf/api/kafka/alarms/api/incoming/AlarmListenerTest.java

+3 −3
Changes for src/test/java/org/etsi/osl/hypo/api/tmf/api/kafka/alarms/api/incoming/AlarmListenerTest.java: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; 
import static org.awaitility.Awaitility.await;

import static org.etsi.osl.hypo.api.tmf.common.constants.OssConstants.ALARM_MANAGEMENT_CHANNEL;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;



import io.quarkus.test.InjectMock;

import io.quarkus.test.common.QuarkusTestResource;
@@ -19,7 +20,6 @@ import org.etsi.osl.hypo.api.tmf.common.api.kafka.alarms.api.incoming.AlarmListe 
import org.etsi.osl.hypo.api.tmf.helpers.InMemoryKafkaTestLifecycleManager;

import org.junit.jupiter.api.Test;

import org.mockito.ArgumentCaptor;

import org.mockito.Mockito;



@QuarkusTest

@QuarkusTestResource(value = InMemoryKafkaTestLifecycleManager.class)
@@ -42,7 +42,7 @@ class AlarmListenerTest { 
        await()

                .until(

                        () -> {

                            Mockito.verify(alarmListener).receiveNewAlarm(argument.capture());

                            verify(alarmListener).receiveNewAlarm(argument.capture());

                            return argument.getValue() != null;

                        });
@@ -50,6 +50,6 @@ class AlarmListenerTest { 


        assertThat(reporterMessage).usingRecursiveComparison().isEqualTo(expectedReporterMessage);



        Mockito.verify(alarmManagementService, times(1)).createAlarm(reporterMessage);

        verify(alarmManagementService, times(1)).createAlarm(reporterMessage);

    }

}

src/test/java/org/etsi/osl/hypo/api/tmf/services/catalog/api/services/ServiceCatalogServiceTest.java

+5 −7
Changes for src/test/java/org/etsi/osl/hypo/api/tmf/services/catalog/api/services/ServiceCatalogServiceTest.java: 5 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ import static org.assertj.core.api.Assertions.assertThat; 
import static org.etsi.osl.hypo.api.tmf.services.catalog.api.services.ServiceSpecificationService.SERVICE_CATALOG_ID;

import static org.etsi.osl.hypo.api.tmf.services.catalog.api.services.ServiceSpecificationService.SERVICE_CATEGORY_ID;

import static org.junit.jupiter.api.Assertions.assertThrows;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;



import com.fasterxml.jackson.core.JsonProcessingException;

import com.fasterxml.jackson.databind.ObjectMapper;
@@ -42,7 +44,6 @@ import org.junit.jupiter.api.Test; 
import org.junit.jupiter.params.ParameterizedTest;

import org.junit.jupiter.params.provider.Arguments;

import org.junit.jupiter.params.provider.MethodSource;

import org.mockito.Mockito;



@QuarkusTest

class ServiceCatalogServiceTest {
@@ -562,14 +563,12 @@ class ServiceCatalogServiceTest { 


        assertThat(relatedPartyEntityList).isNotEmpty().hasSize(2);



        serviceCategoryEntityList.stream()

                .forEach(

        serviceCategoryEntityList.forEach(

                serviceCategoryEntity -> {

                    List<ServiceCandidateEntity> serviceCandidateEntityList =

                            serviceCategoryEntity.getServiceCandidates();

                    assertThat(serviceCandidateEntityList).isNotEmpty();

                            serviceCandidateEntityList.stream()

                                    .forEach(

                    serviceCandidateEntityList.forEach(

                            serviceCandidateEntity ->

                                    assertThat(serviceCandidateEntity.getServiceSpecification()).isNotNull());

                });
@@ -780,8 +779,7 @@ class ServiceCatalogServiceTest { 


        // THE CATEGORY with id fourthCategoryId WAS EMPTY SO WE EXPECT IT TO BE REMOVED

        // THE CATEGORY with id thirdCategoryId WAS NOT EMPTY SO WE EXPECT IT TO BE PRESENT

        Mockito.verify(serviceCategoryService, Mockito.times(1))

                .deleteServiceCategory(fourthCategoryId);

        verify(serviceCategoryService, times(1)).deleteServiceCategory(fourthCategoryId);



        assertThat(serviceCategoryIds)

                .isNotNull()

src/test/java/org/etsi/osl/hypo/api/tmf/services/catalog/api/services/ServiceSpecificationServiceWithMockRepositoriesTest.java

+10 −15
Changes for src/test/java/org/etsi/osl/hypo/api/tmf/services/catalog/api/services/ServiceSpecificationServiceWithMockRepositoriesTest.java: 10 added lines, 15 removed lines.
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ import static org.mockito.ArgumentMatchers.any; 
import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import io.quarkus.test.InjectMock;
@@ -21,7 +22,6 @@ import org.etsi.osl.hypo.api.tmf.services.catalog.api.repository.ServiceCategory 
import org.etsi.osl.hypo.api.tmf.services.catalog.api.repository.ServiceSpecificationRepository;

import org.junit.jupiter.api.Test;

import org.mockito.ArgumentCaptor;

import org.mockito.Mockito;



@QuarkusTest

class ServiceSpecificationServiceWithMockRepositoriesTest {
@@ -45,13 +45,12 @@ class ServiceSpecificationServiceWithMockRepositoriesTest { 


        ArgumentCaptor<String> argumentCaptorString = ArgumentCaptor.forClass(String.class);



        Mockito.verify(serviceSpecificationService, Mockito.times(1))

        verify(serviceSpecificationService, times(1))

                .getAllSpecificationsByCatalogId(argumentCaptorString.capture(), eq(params));



        Mockito.verify(serviceSpecificationService, never())

                .getAllSpecificationsByCategoryId(any(), any());

        verify(serviceSpecificationService, never()).getAllSpecificationsByCategoryId(any(), any());



        Mockito.verify(serviceSpecificationService, never()).findAllServiceSpecifications(any(), any());

        verify(serviceSpecificationService, never()).findAllServiceSpecifications(any(), any());

    }



    @Test
@@ -68,13 +67,12 @@ class ServiceSpecificationServiceWithMockRepositoriesTest { 


        ArgumentCaptor<String> argumentCaptorString = ArgumentCaptor.forClass(String.class);



        Mockito.verify(serviceSpecificationService, Mockito.times(1))

        verify(serviceSpecificationService, times(1))

                .getAllSpecificationsByCategoryId(argumentCaptorString.capture(), eq(params));



        Mockito.verify(serviceSpecificationService, never())

                .getAllSpecificationsByCatalogId(any(), any());

        verify(serviceSpecificationService, never()).getAllSpecificationsByCatalogId(any(), any());



        Mockito.verify(serviceSpecificationService, never()).findAllServiceSpecifications(any(), any());

        verify(serviceSpecificationService, never()).findAllServiceSpecifications(any(), any());

    }



    @Test
@@ -90,13 +88,10 @@ class ServiceSpecificationServiceWithMockRepositoriesTest { 
        when(serviceRepositoryService.findWithCriteriaQuery(null, params, null))

                .thenReturn(Collections.emptyList());



        Mockito.verify(serviceSpecificationService, times(1))

                .findAllServiceSpecifications(fields, params);

        verify(serviceSpecificationService, times(1)).findAllServiceSpecifications(fields, params);



        Mockito.verify(serviceSpecificationService, never())

                .getAllSpecificationsByCategoryId(any(), any());

        verify(serviceSpecificationService, never()).getAllSpecificationsByCategoryId(any(), any());



        Mockito.verify(serviceSpecificationService, never())

                .getAllSpecificationsByCatalogId(any(), any());

        verify(serviceSpecificationService, never()).getAllSpecificationsByCatalogId(any(), any());

    }

}

src/test/java/org/etsi/osl/hypo/api/tmf/services/common/ServiceOrderAndServiceRepositoriesTest.java

+2 −2
Changes for src/test/java/org/etsi/osl/hypo/api/tmf/services/common/ServiceOrderAndServiceRepositoriesTest.java: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import static org.etsi.osl.hypo.api.tmf.helpers.TestHelpers.getJsonObjectFromFil 
import static org.etsi.osl.hypo.core.common.constants.ServiceOrderWithPackageManagerConstants.NUMBER_OF_WORKER_NODES;

import static org.jboss.resteasy.reactive.RestResponse.Status.OK;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;



import com.fasterxml.jackson.core.JsonProcessingException;

import com.fasterxml.jackson.databind.ObjectMapper;
@@ -45,7 +46,6 @@ import org.junit.jupiter.api.AfterEach; 
import org.junit.jupiter.api.Test;

import org.junit.jupiter.params.ParameterizedTest;

import org.junit.jupiter.params.provider.ValueSource;

import org.mockito.Mockito;



@QuarkusTest

@TestSecurity(authorizationEnabled = false)
@@ -249,7 +249,7 @@ class ServiceOrderAndServiceRepositoriesTest { 
        assertThat(retrievedServiceAfterCompletionOfTheUpdate.getState())

                .isEqualTo(ServiceStateType.ACTIVE);



        Mockito.verify(serviceOrderAndServiceRepositories, times(1))

        verify(serviceOrderAndServiceRepositories, times(1))

                .updateServiceRFS(serviceRFSId, ServiceStateType.ACTIVE);

    }

}

src/test/java/org/etsi/osl/hypo/api/tmf/services/inventory/api/ServiceInventoryIntegrationTest.java

+6 −6
Changes for src/test/java/org/etsi/osl/hypo/api/tmf/services/inventory/api/ServiceInventoryIntegrationTest.java: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ import static org.jboss.resteasy.reactive.RestResponse.Status.CREATED; 
import static org.jboss.resteasy.reactive.RestResponse.Status.OK;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;



import com.fasterxml.jackson.core.JsonProcessingException;

import com.fasterxml.jackson.core.type.TypeReference;
@@ -50,7 +52,6 @@ import org.junit.jupiter.api.BeforeAll; 
import org.junit.jupiter.api.Test;

import org.junit.jupiter.params.ParameterizedTest;

import org.mockito.ArgumentCaptor;

import org.mockito.Mockito;



@QuarkusTest

@TestSecurity(authorizationEnabled = false)
@@ -654,16 +655,15 @@ class ServiceInventoryIntegrationTest { 
                .extract()

                .as(Service.class);



        Mockito.verify(serviceInventoryService, Mockito.times(1))

                .updateServiceFromRequest(tmfId, service, authHeader);

        verify(serviceInventoryService, times(1)).updateServiceFromRequest(tmfId, service, authHeader);

        ArgumentCaptor<Service> serviceArgumentCaptor = ArgumentCaptor.forClass(Service.class);



        Mockito.verify(serviceUpdateRuleEngine, Mockito.times(1))

        verify(serviceUpdateRuleEngine, times(1))

                .applyBeforeRules(serviceArgumentCaptor.capture(), eq(service), eq(authHeader));

        Service oldServiceArgumentCaptured = serviceArgumentCaptor.getValue();

        Mockito.verify(serviceOrderAndServiceRepositories, Mockito.times(1))

        verify(serviceOrderAndServiceRepositories, times(1))

                .updateService(any(Service.class), any(Service.class));

        Mockito.verify(serviceUpdateRuleEngine, Mockito.times(1))

        verify(serviceUpdateRuleEngine, times(1))

                .applyAfterRules(oldServiceArgumentCaptured, service, authHeader);

    }