X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Frestclient%2FTestAaiServiceClient.java;h=fd65383b6abe1cc7863f8088766b34d8b0aa1d88;hb=b5c15a4baafeac466c1565f2237d6f8cdaf9fd72;hp=00bee097352ef2bc07dff8fb282bd0abdee9d44a;hpb=211189e641f5b3aef7b02f47d5e82e522c8c592f;p=aai%2Fmodel-loader.git

diff --git a/src/test/java/org/onap/aai/modelloader/restclient/TestAaiServiceClient.java b/src/test/java/org/onap/aai/modelloader/restclient/TestAaiServiceClient.java
index 00bee09..fd65383 100644
--- a/src/test/java/org/onap/aai/modelloader/restclient/TestAaiServiceClient.java
+++ b/src/test/java/org/onap/aai/modelloader/restclient/TestAaiServiceClient.java
@@ -22,21 +22,24 @@ package org.onap.aai.modelloader.restclient;
 
 import static javax.servlet.http.HttpServletResponse.SC_OK;
 import static org.apache.commons.io.IOUtils.write;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.Properties;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.core.MediaType;
+
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.onap.aai.modelloader.config.ModelLoaderConfig;
 
 /**
@@ -48,7 +51,7 @@ public class TestAaiServiceClient {
     private Server server;
     private AaiRestClient aaiClient;
 
-    @Before
+    @BeforeEach
     public void startJetty() throws Exception {
         server = new Server(8080);
         server.setHandler(getMockHandler());
@@ -60,7 +63,7 @@ public class TestAaiServiceClient {
         aaiClient = new AaiRestClient(config);
     }
 
-    @After
+    @AfterEach
     public void stopJetty() throws Exception {
         server.stop();
     }
@@ -99,7 +102,7 @@ public class TestAaiServiceClient {
                     HttpServletResponse response) throws IOException, ServletException {
                 response.setStatus(SC_OK);
                 response.setContentType("text/json;charset=utf-8");
-                write("", response.getOutputStream());
+                write("", response.getOutputStream(), Charset.defaultCharset());
                 request.setHandled(true);
             }
         };