Upgrade spring-boot to 2.7.X in model-loader

[aai/model-loader.git] / src / test / java / org / onap / aai / modelloader / service / TestModelLoaderServiceWithSdc.java

diff --git a/src/test/java/org/onap/aai/modelloader/service/TestModelLoaderServiceWithSdc.java b/src/test/java/org/onap/aai/modelloader/service/TestModelLoaderServiceWithSdc.java
index d23b3ef..e9ab7c0 100644 (file)
--- a/src/test/java/org/onap/aai/modelloader/service/TestModelLoaderServiceWithSdc.java
+++ b/src/test/java/org/onap/aai/modelloader/service/TestModelLoaderServiceWithSdc.java
@@ -21,42 +21,35 @@
 package org.onap.aai.modelloader.service;
 
 import static org.hamcrest.CoreMatchers.is;
 package org.onap.aai.modelloader.service;
 
 import static org.hamcrest.CoreMatchers.is;

-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;

 
 import java.io.IOException;
 import java.util.Base64;
 
 import java.io.IOException;
 import java.util.Base64;

-import javax.ws.rs.core.Response;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import org.junit.jupiter.api.Test;

 import org.onap.aai.modelloader.util.ArtifactTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.onap.aai.modelloader.util.ArtifactTestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;

 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.TestPropertySource;

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

 
 /**
  * Tests for the ModelLoaderService class.
  *
  */
 
 /**
  * Tests for the ModelLoaderService class.
  *
  */

-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = {ModelLoaderService.class, HttpsBabelServiceClientFactory.class})
+@SpringBootTest

 @TestPropertySource(properties = {"CONFIG_HOME=src/test/resources",})
 public class TestModelLoaderServiceWithSdc {
 
     @Autowired
 @TestPropertySource(properties = {"CONFIG_HOME=src/test/resources",})
 public class TestModelLoaderServiceWithSdc {
 
     @Autowired

-    private ModelLoaderService service;
-
-    @After
-    public void shutdown() {
-        service.preShutdownOperations();
-    }
+    private ModelController controller;

 
     @Test
     public void testIngestModel() throws IOException {
         byte[] csarPayload = new ArtifactTestUtils().loadResource("compressedArtifacts/service-VscpaasTest-csar.csar");
 
     @Test
     public void testIngestModel() throws IOException {
         byte[] csarPayload = new ArtifactTestUtils().loadResource("compressedArtifacts/service-VscpaasTest-csar.csar");

-        Response response = service.ingestModel("model-name", "", Base64.getEncoder().encodeToString(csarPayload));
-        assertThat(response.getStatus(), is(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()));
+        ResponseEntity<String> response = controller.ingestModel("model-name", "", Base64.getEncoder().encodeToString(csarPayload));
+        assertThat(response.getStatusCode(), is(HttpStatus.INTERNAL_SERVER_ERROR));

     }
 
 
     }