Commit 39d78257 authored by Christos Tranoris's avatar Christos Tranoris
Browse files

Merge branch 'develop' into parent-child-characteristics

parents 3bc96bc2 5fffc4e9

src/test/java/org/etsi/osl/services/api/ServiceCatalogIntegrationTest.java

+21 −7
Original line number Original line Diff line number Diff line
@@ -521,17 +521,31 @@ public class ServiceCatalogIntegrationTest { 
		ServiceSpecCharacteristicValue val = new ServiceSpecCharacteristicValue();

		ServiceSpecCharacteristicValue val = new ServiceSpecCharacteristicValue();

		val.setValueType( EValueType.ARRAY.toString());

		val.setValueType( EValueType.ARRAY.toString());

		val.setValue( new Any("1" ,"a second value") );

		val.setValue( new Any("1" ,"a second value") );

		responsesSpecUpd.getServiceSpecCharacteristic().get(0).getServiceSpecCharacteristicValue().add(val);



		ServiceSpecCharRelationship scrObj = responsesSpecUpd.getServiceSpecCharacteristic().get(0).getServiceSpecCharRelationship().toArray( new ServiceSpecCharRelationship[3])[0];

		// Following code related to 'notNullRelationshipIndex' is to fix random test failures due to getServiceSpecCharacteristic

		ServiceSpecCharRelationship scrObj2 = responsesSpecUpd.getServiceSpecCharacteristic().get(0).getServiceSpecCharRelationship().toArray( new ServiceSpecCharRelationship[3])[1];

		// not having 3 ServiceSpecCharRelationships

		ServiceSpecCharRelationship scrObj3 = responsesSpecUpd.getServiceSpecCharacteristic().get(0).getServiceSpecCharRelationship().toArray( new ServiceSpecCharRelationship[3])[2];

		int notNullRelationshipIndex = 0;

		for (int i=0; i<responsesSpecUpd.getServiceSpecCharacteristic().size(); i++){

			ServiceSpecCharRelationship scrObj1 = responsesSpecUpd.getServiceSpecCharacteristic().get(i).getServiceSpecCharRelationship().toArray( new ServiceSpecCharRelationship[3])[0];

			ServiceSpecCharRelationship scrObj2 = responsesSpecUpd.getServiceSpecCharacteristic().get(i).getServiceSpecCharRelationship().toArray( new ServiceSpecCharRelationship[3])[1];

			ServiceSpecCharRelationship scrObj3 = responsesSpecUpd.getServiceSpecCharacteristic().get(i).getServiceSpecCharRelationship().toArray( new ServiceSpecCharRelationship[3])[2];



			if (scrObj1 != null && scrObj2 != null && scrObj3 != null){

				notNullRelationshipIndex = i;

				break;

			}

		}

		responsesSpecUpd.getServiceSpecCharacteristic().get(notNullRelationshipIndex).getServiceSpecCharacteristicValue().add(val);

		ServiceSpecCharRelationship scrObj1 = responsesSpecUpd.getServiceSpecCharacteristic().get(notNullRelationshipIndex).getServiceSpecCharRelationship().toArray( new ServiceSpecCharRelationship[3])[0];

		ServiceSpecCharRelationship scrObj2 = responsesSpecUpd.getServiceSpecCharacteristic().get(notNullRelationshipIndex).getServiceSpecCharRelationship().toArray( new ServiceSpecCharRelationship[3])[1];

		ServiceSpecCharRelationship scrObj3 = responsesSpecUpd.getServiceSpecCharacteristic().get(notNullRelationshipIndex).getServiceSpecCharRelationship().toArray( new ServiceSpecCharRelationship[3])[2];

		scrObj3.setName("FORTESTING");

		scrObj3.setName("FORTESTING");

		String preid = scrObj3.getId();

		String preid = scrObj3.getId();

		responsesSpecUpd.getServiceSpecCharacteristic().get(0).getServiceSpecCharRelationship().remove(scrObj);

		responsesSpecUpd.getServiceSpecCharacteristic().get(notNullRelationshipIndex).getServiceSpecCharRelationship().remove(scrObj1);

		responsesSpecUpd.getServiceSpecCharacteristic().get(0).getServiceSpecCharRelationship().remove(scrObj2);

		responsesSpecUpd.getServiceSpecCharacteristic().get(notNullRelationshipIndex).getServiceSpecCharRelationship().remove(scrObj2);

		ServiceSpecCharRelationship scrObj4 = new ServiceSpecCharRelationship();

		ServiceSpecCharRelationship scrObj4 = new ServiceSpecCharRelationship();

		scrObj4.setName("ANEWCharRel");

		scrObj4.setName("ANEWCharRel");

		responsesSpecUpd.getServiceSpecCharacteristic().get(0).getServiceSpecCharRelationship().add(scrObj4);

		responsesSpecUpd.getServiceSpecCharacteristic().get(notNullRelationshipIndex).getServiceSpecCharRelationship().add(scrObj4);

		

		

		response2 = mvc.perform(MockMvcRequestBuilders.patch("/serviceCatalogManagement/v4/serviceSpecification/" + responsesSpec.getId() )

		response2 = mvc.perform(MockMvcRequestBuilders.patch("/serviceCatalogManagement/v4/serviceSpecification/" + responsesSpec.getId() )

	            .with( SecurityMockMvcRequestPostProcessors.csrf())

	            .with( SecurityMockMvcRequestPostProcessors.csrf())

src/test/java/org/etsi/osl/services/api/scm633/ExportJobApiController633Test.java

0 → 100644
+130 −0
Original line number Original line Diff line number Diff line 
package org.etsi.osl.services.api.scm633;



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

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



import java.io.File;

import java.io.FileInputStream;

import java.io.InputStream;



import org.apache.commons.io.IOUtils;



import org.etsi.osl.tmf.OpenAPISpringBoot;

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

import org.etsi.osl.tmf.JsonUtils;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

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

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

import org.springframework.boot.test.context.SpringBootTest;

import org.springframework.http.MediaType;

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

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

import org.springframework.test.context.ActiveProfiles;

import org.springframework.test.context.junit4.SpringRunner;

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

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

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

import org.springframework.transaction.annotation.Transactional;

import org.springframework.web.context.WebApplicationContext;





@RunWith(SpringRunner.class)

@Transactional

@SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)

@AutoConfigureMockMvc

@ActiveProfiles("testing")

public class ExportJobApiController633Test {



    @Autowired

    private MockMvc mvc;



    @Autowired

    private WebApplicationContext context;



    @Before

    public void setup() {

        mvc = MockMvcBuilders

                .webAppContextSetup(context)

                .apply(springSecurity())

                .build();

    }





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

    @Test

    public void testCreateExportJob() throws Exception {



        File resourceSpecFile = new File("src/test/resources/testExportJob.json");

        InputStream in = new FileInputStream(resourceSpecFile);

        String exportJobString = IOUtils.toString(in, "UTF-8");

        ExportJobCreate exportJobCreate = JsonUtils.toJsonObj(exportJobString, ExportJobCreate.class);



        // Test when providing an "Accept" request header

        mvc.perform(MockMvcRequestBuilders.post("/serviceCatalogManagement/v4/exportJob")

            .with(SecurityMockMvcRequestPostProcessors.csrf())

            .contentType(MediaType.APPLICATION_JSON)

            .accept(MediaType.APPLICATION_JSON)

            .content( JsonUtils.toJson( exportJobCreate ) ))

        .andExpect(status().is(501));



        // Test when not providing an "Accept" request header

        mvc.perform(MockMvcRequestBuilders.post("/serviceCatalogManagement/v4/exportJob")

            .with(SecurityMockMvcRequestPostProcessors.csrf())

            .contentType(MediaType.APPLICATION_JSON)

            .content( JsonUtils.toJson( exportJobCreate ) ))

        .andExpect(status().is(501));

    }





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

    @Test

    public void testDeleteExportJob() throws Exception {



        mvc.perform(MockMvcRequestBuilders.delete("/serviceCatalogManagement/v4/exportJob/testId")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON)

                        .accept(MediaType.APPLICATION_JSON))

                .andExpect(status().is(501));

    }





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

    @Test

    public void testListExportJob() throws Exception {



        // Test when providing an "Accept" request header

        mvc.perform(MockMvcRequestBuilders.get("/serviceCatalogManagement/v4/exportJob")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON)

                        .accept(MediaType.APPLICATION_JSON))

                .andExpect(status().is(501));



        // Test when not providing an "Accept" request header

        mvc.perform(MockMvcRequestBuilders.get("/serviceCatalogManagement/v4/exportJob")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON))

                .andExpect(status().is(501));

    }





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

    @Test

    public void testRetrieveExportJob() throws Exception {



        // Test when providing an "Accept" request header

        mvc.perform(MockMvcRequestBuilders.get("/serviceCatalogManagement/v4/exportJob?testId")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON)

                        .accept(MediaType.APPLICATION_JSON))

                .andExpect(status().is(501));



        // Test when not providing an "Accept" request header

        mvc.perform(MockMvcRequestBuilders.get("/serviceCatalogManagement/v4/exportJob/testId")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON))

                .andExpect(status().is(501));

    }

}
 
 No newline at end of file

src/test/java/org/etsi/osl/services/api/scm633/HubApiControllerTest.java

0 → 100644
+92 −0
Original line number Original line Diff line number Diff line 
package org.etsi.osl.services.api.scm633;



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

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



import java.io.File;

import java.io.FileInputStream;

import java.io.InputStream;



import org.apache.commons.io.IOUtils;



import org.etsi.osl.tmf.OpenAPISpringBoot;

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

import org.etsi.osl.tmf.JsonUtils;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

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

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

import org.springframework.boot.test.context.SpringBootTest;

import org.springframework.http.MediaType;

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

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

import org.springframework.test.context.ActiveProfiles;

import org.springframework.test.context.junit4.SpringRunner;

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

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

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

import org.springframework.transaction.annotation.Transactional;

import org.springframework.web.context.WebApplicationContext;





@RunWith(SpringRunner.class)

@Transactional

@SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)

@AutoConfigureMockMvc

@ActiveProfiles("testing")

public class HubApiControllerTest {



    @Autowired

    private MockMvc mvc;



    @Autowired

    private WebApplicationContext context;



    @Before

    public void setup() {

        mvc = MockMvcBuilders

                .webAppContextSetup(context)

                .apply(springSecurity())

                .build();

    }





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

    @Test

    public void testRegisterListener() throws Exception {



        File resourceSpecFile = new File("src/test/resources/testEventSubscriptionInput.json");

        InputStream in = new FileInputStream(resourceSpecFile);

        String eventSubscriptionInputString = IOUtils.toString(in, "UTF-8");

        EventSubscriptionInput eventSubscriptionInput = JsonUtils.toJsonObj(eventSubscriptionInputString, EventSubscriptionInput.class);



        // Test when providing an "Accept" request header

        mvc.perform(MockMvcRequestBuilders.post("/serviceCatalogManagement/v4/hub")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON)

                        .accept(MediaType.APPLICATION_JSON)

                .content( JsonUtils.toJson( eventSubscriptionInput ) ))

                .andExpect(status().is(501));



        // Test when not providing an "Accept" request header

        mvc.perform(MockMvcRequestBuilders.post("/serviceCatalogManagement/v4/hub")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON)

                        .content( JsonUtils.toJson( eventSubscriptionInput ) ))

                .andExpect(status().is(501));

    }





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

    @Test

    public void testUnregisterListener() throws Exception {



        mvc.perform(MockMvcRequestBuilders.delete("/serviceCatalogManagement/v4/hub/testId")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON)

                        .accept(MediaType.APPLICATION_JSON))

                .andExpect(status().is(501));

    }

}
 
 No newline at end of file

src/test/java/org/etsi/osl/services/api/scm633/ImportJobApiControllerTest.java

0 → 100644
+130 −0
Original line number Original line Diff line number Diff line 
package org.etsi.osl.services.api.scm633;



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

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



import java.io.File;

import java.io.FileInputStream;

import java.io.InputStream;



import org.apache.commons.io.IOUtils;



import org.etsi.osl.tmf.OpenAPISpringBoot;

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

import org.etsi.osl.tmf.JsonUtils;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

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

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

import org.springframework.boot.test.context.SpringBootTest;

import org.springframework.http.MediaType;

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

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

import org.springframework.test.context.ActiveProfiles;

import org.springframework.test.context.junit4.SpringRunner;

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

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

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

import org.springframework.transaction.annotation.Transactional;

import org.springframework.web.context.WebApplicationContext;





@RunWith(SpringRunner.class)

@Transactional

@SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)

@AutoConfigureMockMvc

@ActiveProfiles("testing")

public class ImportJobApiControllerTest {



    @Autowired

    private MockMvc mvc;



    @Autowired

    private WebApplicationContext context;



    @Before

    public void setup() {

        mvc = MockMvcBuilders

                .webAppContextSetup(context)

                .apply(springSecurity())

                .build();

    }





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

    @Test

    public void testCreateImportJob() throws Exception {



        File resourceSpecFile = new File("src/test/resources/testExportJob.json");

        InputStream in = new FileInputStream(resourceSpecFile);

        String exportJobString = IOUtils.toString(in, "UTF-8");

        ExportJobCreate exportJobCreate = JsonUtils.toJsonObj(exportJobString, ExportJobCreate.class);



        // Test when providing an "Accept" request header

        mvc.perform(MockMvcRequestBuilders.post("/serviceCatalogManagement/v4/importJob")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON)

                        .accept(MediaType.APPLICATION_JSON)

                        .content( JsonUtils.toJson( exportJobCreate ) ))

                .andExpect(status().is(501));



        // Test when not providing an "Accept" request header

        mvc.perform(MockMvcRequestBuilders.post("/serviceCatalogManagement/v4/importJob")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON)

                        .content( JsonUtils.toJson( exportJobCreate ) ))

                .andExpect(status().is(501));

    }





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

    @Test

    public void testDeleteImportJob() throws Exception {



        mvc.perform(MockMvcRequestBuilders.delete("/serviceCatalogManagement/v4/importJob/testId")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON)

                        .accept(MediaType.APPLICATION_JSON))

                .andExpect(status().is(501));

    }





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

    @Test

    public void testListImportJob() throws Exception {



        // Test when providing an "Accept" request header

        mvc.perform(MockMvcRequestBuilders.get("/serviceCatalogManagement/v4/importJob")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON)

                        .accept(MediaType.APPLICATION_JSON))

                .andExpect(status().is(501));



        // Test when not providing an "Accept" request header

        mvc.perform(MockMvcRequestBuilders.get("/serviceCatalogManagement/v4/importJob")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON))

                .andExpect(status().is(501));

    }





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

    @Test

    public void testRetrieveImportJob() throws Exception {



        // Test when providing an "Accept" request header

        mvc.perform(MockMvcRequestBuilders.get("/serviceCatalogManagement/v4/importJob?testId")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON)

                        .accept(MediaType.APPLICATION_JSON))

                .andExpect(status().is(501));



        // Test when not providing an "Accept" request header

        mvc.perform(MockMvcRequestBuilders.get("/serviceCatalogManagement/v4/importJob/testId")

                        .with(SecurityMockMvcRequestPostProcessors.csrf())

                        .contentType(MediaType.APPLICATION_JSON))

                .andExpect(status().is(501));

    }

}
 
 No newline at end of file