Saved vnfOperationalEnvironmentId to be used later

[so.git] / mso-api-handlers / mso-requests-db-repositories / src / test / java / org / onap / so / db / request / OperationalEnvServiceModelStatusTest.java

diff --git a/mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/OperationalEnvServiceModelStatusTest.java b/mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/OperationalEnvServiceModelStatusTest.java
index c12d3cb..f1f26fa 100644 (file)
--- a/mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/OperationalEnvServiceModelStatusTest.java
+++ b/mso-api-handlers/mso-requests-db-repositories/src/test/java/org/onap/so/db/request/OperationalEnvServiceModelStatusTest.java
@@ -27,6 +27,7 @@ import org.junit.runner.RunWith;
 import org.onap.so.TestApplication;
 import org.onap.so.db.request.beans.OperationalEnvServiceModelStatus;
 import org.onap.so.db.request.data.repository.OperationalEnvServiceModelStatusRepository;
+import org.onap.so.db.request.exceptions.NoEntityFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.domain.Example;
@@ -50,11 +51,14 @@ public class OperationalEnvServiceModelStatusTest {
                status.setRequestId("request-id-1");
                status.setOperationalEnvId("oper-env-id-1");
                status.setServiceModelVersionId("service-model-ver-id-1");
+               status.setVnfOperationalEnvId("vnf-oper-env-id-1");
                status.setRetryCount(0);
                
                repository.saveAndFlush(status);
-               OperationalEnvServiceModelStatus status2 = repository.findOneByOperationalEnvIdAndServiceModelVersionId("oper-env-id-1", "service-model-ver-id-1");
+               OperationalEnvServiceModelStatus status2 = repository.findOneByOperationalEnvIdAndServiceModelVersionIdAndRequestId("oper-env-id-1", "service-model-ver-id-1", "request-id-1");
                status2.setRetryCount(1);
+               assertEquals("request-id-1", status2.getRequestId());           
+               assertEquals("vnf-oper-env-id-1", status2.getVnfOperationalEnvId());
                
                repository.saveAndFlush(status2);
                
@@ -63,6 +67,7 @@ public class OperationalEnvServiceModelStatusTest {
                status3.setRequestId("request-id-2");
                status3.setOperationalEnvId("oper-env-id-1");
                status3.setServiceModelVersionId("service-model-ver-id-2");
+               status3.setVnfOperationalEnvId("vnf-oper-env-id-2");
                status3.setRetryCount(2);
                
                repository.saveAndFlush(status3);
@@ -71,7 +76,8 @@ public class OperationalEnvServiceModelStatusTest {
                exampleObj.setOperationalEnvId("oper-env-id-1");
                exampleObj.setServiceModelVersionId("service-model-ver-id-1");
                ExampleMatcher matcher = ExampleMatcher.matching().withIgnorePaths("requestId");
-               OperationalEnvServiceModelStatus foundStatus = repository.findOne(Example.of(exampleObj,matcher));
+               OperationalEnvServiceModelStatus foundStatus = repository.findOne(Example.of(exampleObj,matcher))
+                               .orElseThrow(() -> new NoEntityFoundException("Cannot Find Operation"));
                if(foundStatus== null)
                        throw new Exception("No status found");