Commit 61fc1c5b authored by Irene Denazi's avatar Irene Denazi
Browse files

Fix and add unittests

parent 896dedd9

src/test/java/org/etsi/osl/services/api/metrics/ServiceOrderMetricsApiControllerTest.java

+36 −8
Original line number Diff line number Diff line 
package org.etsi.osl.services.api.metrics;



import static org.assertj.core.api.Assertions.assertThat;

import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;

import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;

import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

import java.time.OffsetDateTime;

import java.time.ZoneOffset;

import java.time.format.DateTimeFormatter;
@@ -11,30 +7,40 @@ import java.time.temporal.ChronoUnit; 
import java.util.List;

import java.util.Map;

import java.util.stream.Collectors;



import static org.assertj.core.api.Assertions.assertThat;

import org.etsi.osl.services.api.BaseIT;

import org.etsi.osl.tmf.JsonUtils;

import org.etsi.osl.tmf.metrics.api.ServiceOrderMetricsApiController;

import org.etsi.osl.tmf.common.model.service.ServiceSpecificationRef;

import org.etsi.osl.tmf.scm633.model.ServiceSpecification;

import org.etsi.osl.tmf.scm633.model.ServiceSpecificationCreate;

import org.etsi.osl.tmf.so641.model.ServiceOrder;

import org.etsi.osl.tmf.so641.model.ServiceOrderCreate;

import org.etsi.osl.tmf.so641.model.ServiceOrderItem;

import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;

import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate;

import org.etsi.osl.tmf.so641.model.ServiceRestriction;

import org.etsi.osl.tmf.so641.reposervices.ServiceOrderRepoService;

import jakarta.persistence.EntityManager;

import jakarta.persistence.PersistenceContext;

import org.junit.jupiter.api.AfterEach;

import org.junit.jupiter.api.BeforeAll;

import org.junit.jupiter.api.Test;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;

import org.springframework.http.MediaType;

import org.springframework.security.test.context.support.WithMockUser;

import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors;

import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;

import org.springframework.test.web.servlet.MockMvc;

import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;

import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;

import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

import org.springframework.test.web.servlet.setup.MockMvcBuilders;

import org.springframework.web.context.WebApplicationContext;



import com.jayway.jsonpath.JsonPath;



import jakarta.persistence.EntityManager;

import jakarta.persistence.PersistenceContext;





public class ServiceOrderMetricsApiControllerTest  extends BaseIT {
@@ -216,6 +222,19 @@ public class ServiceOrderMetricsApiControllerTest extends BaseIT { 
    }



    private void createServiceOrder(ServiceOrderStateType stateType) throws Exception {

        // Create a real service spec first

        ServiceSpecificationCreate serviceSpecCreate = new ServiceSpecificationCreate();

        serviceSpecCreate.setName("Test Service Spec");

        serviceSpecCreate.setDescription("A test service specification");

        

        String specResponse = mvc.perform(MockMvcRequestBuilders.post("/serviceCatalogManagement/v4/serviceSpecification")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON)

                        .content(JsonUtils.toJson(serviceSpecCreate)))

                .andExpect(status().isOk())

                .andReturn().getResponse().getContentAsString();

        

        ServiceSpecification createdSpec = JsonUtils.toJsonObj(specResponse, ServiceSpecification.class);



        ServiceOrderCreate serviceOrder = new ServiceOrderCreate();

        serviceOrder.setCategory("Test Category");
@@ -223,6 +242,15 @@ public class ServiceOrderMetricsApiControllerTest extends BaseIT { 
        serviceOrder.setRequestedStartDate(OffsetDateTime.now(ZoneOffset.UTC).toString());

        serviceOrder.setRequestedCompletionDate(OffsetDateTime.now(ZoneOffset.UTC).plusDays(3).toString());

        

        ServiceOrderItem orderItem = new ServiceOrderItem();

        ServiceRestriction service = new ServiceRestriction();

        ServiceSpecificationRef serviceSpec = new ServiceSpecificationRef();

        serviceSpec.setId(createdSpec.getId());

        serviceSpec.setName(createdSpec.getName());

        service.setServiceSpecification(serviceSpec);

        orderItem.setService(service);

        serviceOrder.getOrderItem().add(orderItem);



        String response = mvc

                .perform(MockMvcRequestBuilders.post("/serviceOrdering/v4/serviceOrder")

                        .with( SecurityMockMvcRequestPostProcessors.csrf())

src/test/java/org/etsi/osl/services/api/so641/ServiceOrderApiControllerTest.java

+68 −11
Original line number Diff line number Diff line 
package org.etsi.osl.services.api.so641;



import static org.assertj.core.api.Assertions.assertThat;

import static org.hamcrest.CoreMatchers.is;

import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;

import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;

import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;

import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

import java.io.File;

import java.io.FileInputStream;

import java.io.InputStream;
@@ -15,17 +9,16 @@ import java.util.ArrayList; 
import java.util.List;

import java.util.Optional;

import java.util.Set;



import org.apache.commons.io.IOUtils;

import static org.assertj.core.api.Assertions.assertThat;

import org.etsi.osl.services.api.BaseIT;

import org.etsi.osl.tmf.JsonUtils;

import org.etsi.osl.tmf.common.model.Any;

import org.etsi.osl.tmf.common.model.service.Characteristic;

import org.etsi.osl.tmf.common.model.service.Place;

import org.etsi.osl.tmf.common.model.service.ServiceSpecificationRef;

import org.etsi.osl.tmf.pm632.model.ContactMedium;

import org.etsi.osl.tmf.pm632.model.Individual;

import org.etsi.osl.tmf.pm632.model.IndividualCreate;

import org.etsi.osl.tmf.pm632.model.MediumCharacteristic;

import org.etsi.osl.tmf.pm632.reposervices.IndividualRepoService;

import org.etsi.osl.tmf.prm669.model.RelatedParty;

import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
@@ -41,18 +34,23 @@ import org.junit.jupiter.api.AfterEach; 
import org.junit.jupiter.api.BeforeAll;

import org.junit.jupiter.api.Test;

import org.springframework.beans.factory.annotation.Autowired;

import jakarta.persistence.EntityManager;

import jakarta.persistence.PersistenceContext;

import org.springframework.http.MediaType;

import org.springframework.security.test.context.support.WithMockUser;

import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors;

import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;

import org.springframework.test.web.servlet.MockMvc;

import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;

import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;

import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

import org.springframework.test.web.servlet.setup.MockMvcBuilders;

import org.springframework.web.context.WebApplicationContext;



import com.fasterxml.jackson.core.type.TypeReference;

import com.fasterxml.jackson.databind.ObjectMapper;



import jakarta.persistence.EntityManager;

import jakarta.persistence.PersistenceContext;



public class ServiceOrderApiControllerTest  extends BaseIT {



    private static final int FIXED_BOOTSTRAPS_SPECS = 0;
@@ -135,6 +133,65 @@ public class ServiceOrderApiControllerTest extends BaseIT { 
    }





    @WithMockUser(username="osadmin", roles = {"ADMIN","USER"})

    @Test

    public void testCreateServiceOrderWithNoOrderItemIsBadRequest() throws Exception {

        ServiceOrderCreate serviceOrder = new ServiceOrderCreate();

        serviceOrder.setCategory("Test Category");

        serviceOrder.setDescription("A Test Service Order");

        serviceOrder.setRequestedStartDate(OffsetDateTime.now(ZoneOffset.UTC).toString());

        serviceOrder.setRequestedCompletionDate(OffsetDateTime.now(ZoneOffset.UTC).toString());



        mvc.perform(MockMvcRequestBuilders.post("/serviceOrdering/v4/serviceOrder")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON)

                        .content(JsonUtils.toJson(serviceOrder)))

                .andExpect(status().isBadRequest());

    }





    @WithMockUser(username="osadmin", roles = {"ADMIN","USER"})

    @Test

    public void testCreateServiceOrderWithNoServiceIsBadRequest() throws Exception {

        ServiceOrderCreate serviceOrder = new ServiceOrderCreate();

        serviceOrder.setCategory("Test Category");

        serviceOrder.setDescription("A Test Service Order");

        serviceOrder.setRequestedStartDate(OffsetDateTime.now(ZoneOffset.UTC).toString());

        serviceOrder.setRequestedCompletionDate(OffsetDateTime.now(ZoneOffset.UTC).toString());

        

        ServiceOrderItem orderItem = new ServiceOrderItem();

        serviceOrder.getOrderItem().add(orderItem);



        mvc.perform(MockMvcRequestBuilders.post("/serviceOrdering/v4/serviceOrder")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON)

                        .content(JsonUtils.toJson(serviceOrder)))

                .andExpect(status().isBadRequest());

    }





    @WithMockUser(username="osadmin", roles = {"ADMIN","USER"})

    @Test

    public void testCreateServiceOrderWithNoServiceSpecificationIsBadRequest() throws Exception {

        ServiceOrderCreate serviceOrder = new ServiceOrderCreate();

        serviceOrder.setCategory("Test Category");

        serviceOrder.setDescription("A Test Service Order");

        serviceOrder.setRequestedStartDate(OffsetDateTime.now(ZoneOffset.UTC).toString());

        serviceOrder.setRequestedCompletionDate(OffsetDateTime.now(ZoneOffset.UTC).toString());

        

        ServiceOrderItem orderItem = new ServiceOrderItem();

        ServiceRestriction service = new ServiceRestriction();

        orderItem.setService(service);

        serviceOrder.getOrderItem().add(orderItem);



        mvc.perform(MockMvcRequestBuilders.post("/serviceOrdering/v4/serviceOrder")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON)

                        .content(JsonUtils.toJson(serviceOrder)))

                .andExpect(status().isBadRequest());

    }





    @WithMockUser(username="osadmin", roles = {"ADMIN","USER"})

    @Test

    public void testDeleteServiceOrder() throws Exception {