X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=enrichment-coordinator-service%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fenrichment%2FApplicationTest.java;h=4c8448849fb2ddd17919fec19aa5e6e28fa08ab2;hb=refs%2Fchanges%2F55%2F4755%2F3;hp=d87142773382cb526d70d85955ff6a8ebe4a1e70;hpb=d1d085456c485599f6b8aba87b6d761b29c2ecd4;p=nonrtric.git diff --git a/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/ApplicationTest.java b/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/ApplicationTest.java index d8714277..4c844884 100644 --- a/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/ApplicationTest.java +++ b/enrichment-coordinator-service/src/test/java/org/oransc/enrichment/ApplicationTest.java @@ -21,37 +21,50 @@ package org.oransc.enrichment; import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertTrue; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonMappingException; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonPrimitive; +import com.google.gson.JsonParser; +import java.util.ArrayList; +import java.util.Collection; + +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.oransc.enrichment.clients.AsyncRestClient; +import org.oransc.enrichment.clients.ProducerJobInfo; import org.oransc.enrichment.configuration.ApplicationConfig; import org.oransc.enrichment.configuration.ImmutableWebClientConfig; import org.oransc.enrichment.configuration.WebClientConfig; +import org.oransc.enrichment.controller.ProducerSimulatorController; import org.oransc.enrichment.controllers.consumer.ConsumerConsts; import org.oransc.enrichment.controllers.consumer.ConsumerEiJobInfo; +import org.oransc.enrichment.controllers.producer.ProducerConsts; +import org.oransc.enrichment.controllers.producer.ProducerRegistrationInfo; +import org.oransc.enrichment.controllers.producer.ProducerRegistrationInfo.ProducerEiTypeRegistrationInfo; +import org.oransc.enrichment.exceptions.ServiceException; import org.oransc.enrichment.repository.EiJob; import org.oransc.enrichment.repository.EiJobs; +import org.oransc.enrichment.repository.EiProducers; import org.oransc.enrichment.repository.EiType; import org.oransc.enrichment.repository.EiTypes; -import org.oransc.enrichment.repository.ImmutableEiJob; -import org.oransc.enrichment.repository.ImmutableEiType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.web.servlet.server.ServletWebServerFactory; import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -70,6 +83,8 @@ import reactor.test.StepVerifier; "app.webclient.trust-store=./config/truststore.jks"}) class ApplicationTest { private static final Logger logger = LoggerFactory.getLogger(ApplicationTest.class); + private final String EI_TYPE_ID = "typeId"; + private final String EI_JOB_PROPERTY = "\"property1\""; @Autowired ApplicationContext context; @@ -80,9 +95,15 @@ class ApplicationTest { @Autowired EiTypes eiTypes; + @Autowired + EiProducers eiProducers; + @Autowired ApplicationConfig applicationConfig; + @Autowired + ProducerSimulatorController producerSimulator; + private static Gson gson = new GsonBuilder() // .serializeNulls() // .create(); // @@ -92,7 +113,10 @@ class ApplicationTest { */ @TestConfiguration static class TestBeanFactory { - + @Bean + public ServletWebServerFactory servletContainer() { + return new TomcatServletWebServerFactory(); + } } @LocalServerPort @@ -102,56 +126,66 @@ class ApplicationTest { void reset() { this.eiJobs.clear(); this.eiTypes.clear(); + this.eiProducers.clear(); + this.producerSimulator.getTestResults().reset(); + } + + @AfterEach + void check() { + assertThat(this.producerSimulator.getTestResults().errorFound).isFalse(); } @Test - void getEiTypes() throws Exception { - addEiType("test"); - String url = "/eitypes"; + void testGetEiTypes() throws Exception { + putEiProducerWithOneType("test"); + String url = ConsumerConsts.API_ROOT + "/eitypes"; String rsp = restClient().get(url).block(); assertThat(rsp).isEqualTo("[\"test\"]"); } @Test - void getEiType() throws Exception { - addEiType("test"); - String url = "/eitypes/test"; + void testGetEiType() throws Exception { + putEiProducerWithOneType("test"); + String url = ConsumerConsts.API_ROOT + "/eitypes/test"; String rsp = restClient().get(url).block(); assertThat(rsp).contains("job_data_schema"); } @Test - void getEiTypeNotFound() throws Exception { - String url = "/eitypes/junk"; - testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND, "Could not find EI Job: junk"); + void testGetEiTypeNotFound() throws Exception { + String url = ConsumerConsts.API_ROOT + "/eitypes/junk"; + testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND, "Could not find EI type: junk"); } @Test - void getEiJobsIds() throws Exception { - addEiJob("typeId", "jobId"); - String url = "/eitypes/typeId/eijobs"; + void testGetEiJobsIds() throws Exception { + putEiProducerWithOneType(EI_TYPE_ID); + putEiJob(EI_TYPE_ID, "jobId"); + String url = ConsumerConsts.API_ROOT + "/eitypes/typeId/eijobs"; String rsp = restClient().get(url).block(); assertThat(rsp).isEqualTo("[\"jobId\"]"); } @Test - void getEiJobTypeNotFound() throws Exception { - String url = "/eitypes/junk/eijobs"; - testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND, "Could not find EI Job: junk"); + void testGetEiJobTypeNotFound() throws Exception { + String url = ConsumerConsts.API_ROOT + "/eitypes/junk/eijobs"; + testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND, "Could not find EI type: junk"); } @Test - void getEiJob() throws Exception { - addEiJob("typeId", "jobId"); - String url = "/eitypes/typeId/eijobs/jobId"; + void testGetEiJob() throws Exception { + putEiProducerWithOneType(EI_TYPE_ID); + putEiJob(EI_TYPE_ID, "jobId"); + String url = ConsumerConsts.API_ROOT + "/eitypes/typeId/eijobs/jobId"; String rsp = restClient().get(url).block(); assertThat(rsp).contains("job_data"); } @Test - void getEiJobStatus() throws Exception { - addEiJob("typeId", "jobId"); - String url = "/eitypes/typeId/eijobs/jobId/status"; + void testGetEiJobStatus() throws Exception { + putEiProducerWithOneType(EI_TYPE_ID); + putEiJob(EI_TYPE_ID, "jobId"); + String url = ConsumerConsts.API_ROOT + "/eitypes/typeId/eijobs/jobId/status"; String rsp = restClient().get(url).block(); assertThat(rsp).contains("ENABLED"); } @@ -159,73 +193,227 @@ class ApplicationTest { // Status TBD @Test - void deleteEiJob() throws Exception { - addEiJob("typeId", "jobId"); + void testDeleteEiJob() throws Exception { + putEiProducerWithOneType(EI_TYPE_ID); + putEiJob(EI_TYPE_ID, "jobId"); assertThat(this.eiJobs.size()).isEqualTo(1); - String url = "/eitypes/typeId/eijobs/jobId"; + String url = ConsumerConsts.API_ROOT + "/eitypes/typeId/eijobs/jobId"; restClient().delete(url).block(); assertThat(this.eiJobs.size()).isEqualTo(0); + + ProducerSimulatorController.TestResults simulatorResults = this.producerSimulator.getTestResults(); + await().untilAsserted(() -> assertThat(simulatorResults.jobsStopped.size()).isEqualTo(1)); + assertThat(simulatorResults.jobsStopped.get(0).id).isEqualTo("jobId"); } @Test - void putEiJob() throws Exception { - addEiType("typeId"); + void testPutEiJob() throws Exception { + putEiProducerWithOneType(EI_TYPE_ID); - String url = "/eitypes/typeId/eijobs/jobId"; + String url = ConsumerConsts.API_ROOT + "/eitypes/typeId/eijobs/jobId"; String body = gson.toJson(eiJobInfo()); ResponseEntity resp = restClient().putForEntity(url, body).block(); assertThat(this.eiJobs.size()).isEqualTo(1); assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.CREATED); + ProducerSimulatorController.TestResults simulatorResults = this.producerSimulator.getTestResults(); + await().untilAsserted(() -> assertThat(simulatorResults.jobsStarted.size()).isEqualTo(1)); + ProducerJobInfo request = simulatorResults.jobsStarted.get(0); + assertThat(request.id).isEqualTo("jobId"); + resp = restClient().putForEntity(url, body).block(); assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.OK); EiJob job = this.eiJobs.getJob("jobId"); assertThat(job.owner()).isEqualTo("owner"); } - ConsumerEiJobInfo eiJobInfo() { - return new ConsumerEiJobInfo(jsonObject(), "owner"); + @Test + void testPutEiJob_jsonSchemavalidationError() throws Exception { + putEiProducerWithOneType(EI_TYPE_ID); + + String url = ConsumerConsts.API_ROOT + "/eitypes/typeId/eijobs/jobId"; + // The element with name "property1" is mandatory in the schema + ConsumerEiJobInfo jobInfo = + new ConsumerEiJobInfo(jsonObject("{ \"XXstring\" : \"value\" }"), "owner", "targetUri"); + String body = gson.toJson(jobInfo); + + testErrorCode(restClient().put(url, body), HttpStatus.NOT_FOUND, "Json validation failure"); + } + + @Test + void testGetEiProducerTypes() throws Exception { + putEiProducerWithOneType(EI_TYPE_ID); + putEiJob(EI_TYPE_ID, "jobId"); + String url = ProducerConsts.API_ROOT + "/eitypes"; + + ResponseEntity resp = restClient().getForEntity(url).block(); + assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.OK); } - // @Test - @SuppressWarnings("squid:S2699") - void runMock() throws Exception { - logger.info("Keeping server alive! " + this.port); - synchronized (this) { - this.wait(); + @Test + void testPutEiProducer() throws Exception { + String url = ProducerConsts.API_ROOT + "/eiproducers/eiProducerId"; + String body = gson.toJson(producerEiRegistratioInfo(EI_TYPE_ID)); + + ResponseEntity resp = restClient().putForEntity(url, body).block(); + assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.CREATED); + + assertThat(this.eiTypes.size()).isEqualTo(1); + EiType type = this.eiTypes.getType(EI_TYPE_ID); + assertThat(type.getProducerIds().contains("eiProducerId")).isTrue(); + assertThat(this.eiProducers.size()).isEqualTo(1); + assertThat(this.eiProducers.get("eiProducerId").eiTypes().iterator().next().getId().equals(EI_TYPE_ID)) + .isTrue(); + + resp = restClient().putForEntity(url, body).block(); + assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.OK); + + resp = restClient().getForEntity(url).block(); + assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.OK); + assertThat(resp.getBody()).isEqualTo(body); + } + + @Test + void testPutEiProducerExistingJob() throws Exception { + putEiProducerWithOneType(EI_TYPE_ID); + putEiJob(EI_TYPE_ID, "jobId"); + String url = ProducerConsts.API_ROOT + "/eiproducers/eiProducerId"; + String body = gson.toJson(producerEiRegistratioInfo(EI_TYPE_ID)); + restClient().putForEntity(url, body).block(); + + ProducerSimulatorController.TestResults simulatorResults = this.producerSimulator.getTestResults(); + await().untilAsserted(() -> assertThat(simulatorResults.jobsStarted.size()).isEqualTo(2)); + ProducerJobInfo request = simulatorResults.jobsStarted.get(0); + assertThat(request.id).isEqualTo("jobId"); + } + + @Test + void testPutProducerAndEiJob() throws Exception { + String url = ProducerConsts.API_ROOT + "/eiproducers/eiProducerId"; + String body = gson.toJson(producerEiRegistratioInfo(EI_TYPE_ID)); + restClient().putForEntity(url, body).block(); + assertThat(this.eiTypes.size()).isEqualTo(1); + this.eiTypes.getType(EI_TYPE_ID); + + url = ConsumerConsts.API_ROOT + "/eitypes/typeId/eijobs/jobId"; + body = gson.toJson(eiJobInfo()); + restClient().putForEntity(url, body).block(); + + ProducerSimulatorController.TestResults simulatorResults = this.producerSimulator.getTestResults(); + await().untilAsserted(() -> assertThat(simulatorResults.jobsStarted.size()).isEqualTo(1)); + ProducerJobInfo request = simulatorResults.jobsStarted.get(0); + assertThat(request.id).isEqualTo("jobId"); + } + + @Test + void testGetEiJobsForProducer() throws JsonMappingException, JsonProcessingException, ServiceException { + putEiProducerWithOneType(EI_TYPE_ID); + putEiJob(EI_TYPE_ID, "jobId1"); + putEiJob(EI_TYPE_ID, "jobId2"); + + // PUT a consumer + String url = ProducerConsts.API_ROOT + "/eiproducers/eiProducerId"; + String body = gson.toJson(producerEiRegistratioInfo(EI_TYPE_ID)); + restClient().putForEntity(url, body).block(); + + url = ProducerConsts.API_ROOT + "/eiproducers/eiProducerId/eijobs"; + ResponseEntity resp = restClient().getForEntity(url).block(); + assertThat(resp.getStatusCode()).isEqualTo(HttpStatus.OK); + + ProducerJobInfo[] parsedResp = gson.fromJson(resp.getBody(), ProducerJobInfo[].class); + assertThat(parsedResp[0].typeId).isEqualTo(EI_TYPE_ID); + assertThat(parsedResp[1].typeId).isEqualTo(EI_TYPE_ID); + } + + @Test + void testDeleteEiProducer() throws Exception { + String url = ProducerConsts.API_ROOT + "/eiproducers/eiProducerId"; + String url2 = ProducerConsts.API_ROOT + "/eiproducers/eiProducerId2"; + String body = gson.toJson(producerEiRegistratioInfo(EI_TYPE_ID)); + restClient().putForEntity(url, body).block(); + restClient().putForEntity(url2, body).block(); + assertThat(this.eiProducers.size()).isEqualTo(2); + EiType type = this.eiTypes.getType(EI_TYPE_ID); + assertThat(type.getProducerIds().contains("eiProducerId")).isTrue(); + assertThat(type.getProducerIds().contains("eiProducerId2")).isTrue(); + + restClient().deleteForEntity(url).block(); + assertThat(this.eiProducers.size()).isEqualTo(1); + assertThat(this.eiTypes.getType(EI_TYPE_ID).getProducerIds().contains("eiProducerId")).isFalse(); + + restClient().deleteForEntity(url2).block(); + assertThat(this.eiProducers.size()).isEqualTo(0); + assertThat(this.eiTypes.size()).isEqualTo(0); + } + + ProducerEiTypeRegistrationInfo producerEiTypeRegistrationInfo(String typeId) + throws JsonMappingException, JsonProcessingException { + return new ProducerEiTypeRegistrationInfo(jsonSchemaObject(), typeId); + } + + ProducerRegistrationInfo producerEiRegistratioInfo(String typeId) + throws JsonMappingException, JsonProcessingException { + Collection types = new ArrayList<>(); + types.add(producerEiTypeRegistrationInfo(typeId)); + return new ProducerRegistrationInfo(types, baseUrl() + ProducerSimulatorController.JOB_CREATED_URL, + baseUrl() + ProducerSimulatorController.JOB_DELETED_URL); + } + + ConsumerEiJobInfo eiJobInfo() throws JsonMappingException, JsonProcessingException { + return new ConsumerEiJobInfo(jsonObject(), "owner", "targetUri"); + } + + Object jsonObject(String json) { + try { + return JsonParser.parseString(json).getAsJsonObject(); + } catch (Exception e) { + throw new NullPointerException(e.toString()); } } - JsonObject jsonObject() { - JsonObject jsonObj = new JsonObject(); - JsonElement e = new JsonPrimitive(111); - jsonObj.add("param", e); - return jsonObj; + Object jsonSchemaObject() { + // a json schema with one mandatory property named "string" + String schemaStr = "{" // + + "\"$schema\": \"http://json-schema.org/draft-04/schema#\"," // + + "\"type\": \"object\"," // + + "\"properties\": {" // + + EI_JOB_PROPERTY + " : {" // + + " \"type\": \"string\"" // + + " }" // + + "}," // + + "\"required\": [" // + + EI_JOB_PROPERTY // + + "]" // + + "}"; // + return jsonObject(schemaStr); } - private EiJob addEiJob(String typeId, String jobId) { - addEiType(typeId); - EiJob job = ImmutableEiJob.builder() // - .id(jobId) // - .typeId(typeId) // - .owner("owner") // - .jobData(jsonObject()) // - .build(); - this.eiJobs.put(job); - return job; + Object jsonObject() { + return jsonObject("{ " + EI_JOB_PROPERTY + " : \"value\" }"); } - private EiType addEiType(String typeId) { - EiType t = ImmutableEiType.builder() // - .id(typeId) // - .jobDataSchema(jsonObject()) // - .build(); - this.eiTypes.put(t); - return t; + private EiJob putEiJob(String eiTypeId, String jobId) + throws JsonMappingException, JsonProcessingException, ServiceException { + + String url = ConsumerConsts.API_ROOT + "/eitypes/typeId/eijobs/" + jobId; + String body = gson.toJson(eiJobInfo()); + restClient().putForEntity(url, body).block(); + + return this.eiJobs.getJob(jobId); + } + + private EiType putEiProducerWithOneType(String eiTypeId) + throws JsonMappingException, JsonProcessingException, ServiceException { + String url = ProducerConsts.API_ROOT + "/eiproducers/eiProducerId"; + String body = gson.toJson(producerEiRegistratioInfo(eiTypeId)); + + restClient().putForEntity(url, body).block(); + assertThat(this.eiTypes.size()).isEqualTo(1); + return this.eiTypes.getType(eiTypeId); } private String baseUrl() { - return "https://localhost:" + this.port + ConsumerConsts.A1E_API_ROOT; + return "https://localhost:" + this.port; } private AsyncRestClient restClient(boolean useTrustValidation) {