[AAI] Release model-loader 1.9.4 docker image

[aai/model-loader.git] / src / test / java / org / onap / aai / modelloader / restclient / TestAaiRestClient.java

diff --git a/src/test/java/org/onap/aai/modelloader/restclient/TestAaiRestClient.java b/src/test/java/org/onap/aai/modelloader/restclient/TestAaiRestClient.java
index 8b1b22c..91aa182 100644 (file)
--- a/src/test/java/org/onap/aai/modelloader/restclient/TestAaiRestClient.java
+++ b/src/test/java/org/onap/aai/modelloader/restclient/TestAaiRestClient.java
@@ -20,6 +20,7 @@
  */
 package org.onap.aai.modelloader.restclient;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
@@ -51,8 +52,6 @@ public class TestAaiRestClient {
         props.setProperty("ml.distribution.ARTIFACT_TYPES", "MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG");
         props.setProperty("ml.aai.BASE_URL", "https://localhost:8443");
         props.setProperty("ml.aai.MODEL_URL", "/aai/v9/service-design-and-creation/models/model/");
-        props.setProperty("ml.aai.KEYSTORE_FILE", "aai-client-cert.p12");
-        props.setProperty("ml.aai.KEYSTORE_PASSWORD", "OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o");
 
         ModelLoaderConfig config = new ModelLoaderConfig(props, ".");
 
@@ -94,16 +93,16 @@ public class TestAaiRestClient {
             // GET model
             OperationResult opResult =
                     aaiClient.getResource(getUrl(model, config), "example-trans-id-0", MediaType.APPLICATION_XML_TYPE);
-            assertTrue(opResult.getResultCode() == Response.Status.NOT_FOUND.getStatusCode());
+            assertEquals(opResult.getResultCode(), Response.Status.NOT_FOUND.getStatusCode());
 
             // PUT the model
             opResult = aaiClient.putResource(getUrl(model, config), model.getPayload(), "example-trans-id-1",
                     MediaType.APPLICATION_XML_TYPE);
-            assertTrue(opResult.getResultCode() == Response.Status.CREATED.getStatusCode());
+            assertEquals(opResult.getResultCode(), Response.Status.CREATED.getStatusCode());
 
             // DELETE the model
             opResult = aaiClient.getAndDeleteResource(getUrl(model, config), "example-trans-id-3");
-            assertTrue(opResult.getResultCode() == Response.Status.NO_CONTENT.getStatusCode());
+            assertEquals(opResult.getResultCode(), Response.Status.NO_CONTENT.getStatusCode());
         } catch (Exception e) {
             e.printStackTrace();
         }