Commit e6d286ce authored by Eduardo Santos's avatar Eduardo Santos
Browse files

Merge branch 'develop' of... 

Merge branch 'develop' of https://labs.etsi.org/rep/osl/code/org.etsi.osl.tmf.api into feature/tmf702-api
parents 68198958 12b111ad

pom.xml

+6 −5
Original line number Diff line number Diff line
@@ -443,6 +443,12 @@ 
				<groupId>org.apache.maven.plugins</groupId>

				<artifactId>maven-surefire-plugin</artifactId>

				<version>3.2.5</version>

				<configuration>

                <!-- Disable parallel execution -->

                	<parallel>none</parallel>

                	<runOrder>alphabetical</runOrder>

                	<forkCount>1</forkCount>

            	</configuration>

			</plugin>

			<plugin>

				<groupId>org.jacoco</groupId>
@@ -464,11 +470,6 @@ 
				</executions>

			</plugin>



			<plugin>

				<groupId>org.apache.maven.plugins</groupId>

				<artifactId>maven-surefire-plugin</artifactId>

				<version>3.2.5</version>

			</plugin>

			<plugin>

				<groupId>org.jacoco</groupId>

				<artifactId>jacoco-maven-plugin</artifactId>

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

+18 −16
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

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

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

import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;

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

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

import org.springframework.http.MediaType;
@@ -72,6 +73,7 @@ import org.springframework.web.context.WebApplicationContext; 
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK, classes = OpenAPISpringBoot.class)

@AutoConfigureMockMvc

@ActiveProfiles("testing")

@AutoConfigureTestDatabase

public class AlarmManagementIntegrationTest {



	private static final transient Log logger = LogFactory.getLog(AlarmManagementIntegrationTest.class.getName());
@@ -249,22 +251,22 @@ public class AlarmManagementIntegrationTest { 
		assertThat(alarm.getPerceivedSeverity()).isEqualTo(PerceivedSeverityType.warning.name());

		assertThat(alarm.getAlarmType()).isEqualTo(AlarmType.qualityOfServiceAlarm.name());



		aupd = new AlarmUpdate();

		aupd.setState(AlarmStateType.cleared.name());

		aupd.setAckSystemId("OSA");

		aupd.setPerceivedSeverity(PerceivedSeverityType.cleared.name());

		body = JsonUtils.toJsonString(aupd);

		response = template.requestBodyAndHeader( ALARMS_UPDATE_ALARM, body , "alarmid", alarm.getId());



		assertThat(alarmRepoService.findAll().size()).isEqualTo(1);



		alarm = JsonUtils.toJsonObj( (String)response, Alarm.class);

		assertThat(alarm.getAckState()).isEqualTo("acknowledged");

		assertThat(alarm.getSourceSystemId()).isEqualTo("NFVO");

		assertThat(alarm.getAckSystemId()).isEqualTo("OSA");

		assertThat(alarm.getState()).isEqualTo( AlarmStateType.cleared.name() );

		assertThat(alarm.getPerceivedSeverity()).isEqualTo(PerceivedSeverityType.cleared.name());

		assertThat(alarm.getAlarmType()).isEqualTo(AlarmType.qualityOfServiceAlarm.name());

//		aupd = new AlarmUpdate();

//		aupd.setState(AlarmStateType.cleared.name());

//		aupd.setAckSystemId("OSA");

//		aupd.setPerceivedSeverity(PerceivedSeverityType.cleared.name());

//		body = JsonUtils.toJsonString(aupd);

//		response = template.requestBodyAndHeader( ALARMS_UPDATE_ALARM, body , "alarmid", alarm.getId());

//

//		assertThat(alarmRepoService.findAll().size()).isEqualTo(1);

//

//		alarm = JsonUtils.toJsonObj( (String)response, Alarm.class);

//		assertThat(alarm.getAckState()).isEqualTo("acknowledged");

//		assertThat(alarm.getSourceSystemId()).isEqualTo("NFVO");

//		assertThat(alarm.getAckSystemId()).isEqualTo("OSA");

//		assertThat(alarm.getState()).isEqualTo( AlarmStateType.cleared.name() );

//		assertThat(alarm.getPerceivedSeverity()).isEqualTo(PerceivedSeverityType.cleared.name());

//		assertThat(alarm.getAlarmType()).isEqualTo(AlarmType.qualityOfServiceAlarm.name());

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

+2 −1
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 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.jdbc.AutoConfigureTestDatabase;

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

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

import org.springframework.http.MediaType;
@@ -84,7 +85,7 @@ import org.springframework.web.context.WebApplicationContext; 
@RunWith(SpringRunner.class)

@Transactional

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

//@AutoConfigureTestDatabase //this automatically uses h2

@AutoConfigureTestDatabase //this automatically uses h2

@AutoConfigureMockMvc

@ActiveProfiles("testing")

public class ProductCatalogIntegrationTest {

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

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 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.jdbc.AutoConfigureTestDatabase;

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

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

import org.springframework.http.MediaType;
@@ -36,6 +37,7 @@ import org.springframework.web.context.WebApplicationContext; 
@SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.MOCK , classes = OpenAPISpringBoot.class)

@AutoConfigureMockMvc

@ActiveProfiles("testing")

@AutoConfigureTestDatabase //this automatically uses h2

public class HubApiControllerTest {



    @Autowired

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

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 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.jdbc.AutoConfigureTestDatabase;

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

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

import org.springframework.http.MediaType;
@@ -43,6 +44,7 @@ import org.springframework.web.context.WebApplicationContext; 
@Transactional

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

@AutoConfigureMockMvc

@AutoConfigureTestDatabase //this automatically uses h2

@ActiveProfiles("testing")

public class ServiceCandidateApiControllerTest {