Clean up of Pair classes - models

[policy/models.git] / models-interactions / model-impl / aai / src / test / java / org / onap / policy / aai / AaiManagerTest.java

diff --git a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiManagerTest.java b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiManagerTest.java
index ff86577..33934d9 100644 (file)
--- a/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiManagerTest.java
+++ b/models-interactions/model-impl/aai/src/test/java/org/onap/policy/aai/AaiManagerTest.java
@@ -3,7 +3,7 @@
  * aai
  * ================================================================================
  * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@ import static org.mockito.ArgumentMatchers.anyMap;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.contains;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.ArgumentMatchers.startsWith;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -38,28 +37,21 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.util.Map;
 import java.util.UUID;
+import org.apache.commons.lang3.tuple.Pair;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.policy.aai.util.Serialization;
 import org.onap.policy.rest.RestManager;
-import org.onap.policy.rest.RestManager.Pair;
 
 public class AaiManagerTest {
-    private static final String VSERVER_NAME = "vserverName";
     private static final String CQ_QUERY_URL = "http://testing.cq.query";
-    private static final String WITCH = "Witch";
     private static final String DOROTHY = "Dorothy";
     private static final String SOME_URL = "http://somewhere.over.the.rainbow";
-    private static final String ANOTHER_URL = "http://somewhere.under.the.rainbow";
     private static final String TENANT_RESPONSE_SAMPLE =
             "src/test/resources/org/onap/policy/aai/AaiTenantResponse.json";
 
     private RestManager restManagerMock;
-    private UUID aaiNqRequestUuid = UUID.randomUUID();
-    private Pair<Integer, String> httpResponseOk;
     private Pair<Integer, String> httpResponseErr0;
     private Pair<Integer, String> httpResponseErr1;
-    private Pair<Integer, String> httpResponseWait;
     private Pair<Integer, String> httpTenantResponseOk;
     private Pair<Integer, String> httpCqResponseOk;
 
@@ -74,13 +66,10 @@ public class AaiManagerTest {
 
         String aaiCqResponse = new AaiCqResponseTest().getAaiCqResponse();
         String tenantResponse = this.getTenantQueryResponse();
-        httpCqResponseOk = restManagerMock.new Pair<>(200, aaiCqResponse);
-        httpTenantResponseOk = restManagerMock.new Pair<>(200, tenantResponse);
-        AaiNqResponse aaiNqResponse = new AaiNqResponseTest().getAaiNqResponse();
-        httpResponseOk = restManagerMock.new Pair<>(200, Serialization.gsonPretty.toJson(aaiNqResponse));
-        httpResponseErr0 = restManagerMock.new Pair<>(200, null);
-        httpResponseErr1 = restManagerMock.new Pair<>(200, "{");
-        httpResponseWait = restManagerMock.new Pair<>(503, null);
+        httpCqResponseOk = Pair.of(200, aaiCqResponse);
+        httpTenantResponseOk = Pair.of(200, tenantResponse);
+        httpResponseErr0 = Pair.of(200, null);
+        httpResponseErr1 = Pair.of(200, "{");
 
     }
 
@@ -130,105 +119,6 @@ public class AaiManagerTest {
         return responseString;
     }
 
-    @Test
-    public void testAaiManagerAaiNqRequest() {
-
-        AaiManager aaiManager = new AaiManager(restManagerMock);
-        assertNotNull(aaiManager);
-
-        UUID aaiNqUuid = UUID.randomUUID();
-
-        AaiNqQueryParameters aaiNqQueryParameters = new AaiNqQueryParameters();
-        AaiNqNamedQuery aaiNqNamedQuery = new AaiNqNamedQuery();
-        aaiNqNamedQuery.setNamedQueryUuid(aaiNqUuid);
-        aaiNqQueryParameters.setNamedQuery(aaiNqNamedQuery);
-
-        AaiNqRequest aaiNqRequest = new AaiNqRequest();
-        aaiNqRequest.setQueryParameters(aaiNqQueryParameters);
-
-        when(restManagerMock.post(startsWith(SOME_URL), eq(DOROTHY), eq("Gale"), anyMap(),
-                anyString(), anyString())).thenReturn(httpResponseOk);
-
-        AaiNqResponse aaiNqOkResponse = aaiManager.postQuery(SOME_URL, DOROTHY, "Gale",
-                aaiNqRequest, aaiNqRequestUuid);
-        assertNotNull(aaiNqOkResponse);
-
-        when(restManagerMock.post(isNull(), eq(DOROTHY), anyString(), anyMap(), anyString(), anyString()))
-                .thenReturn(null);
-
-        AaiNqResponse aaiNqNullResponse = aaiManager.postQuery(null, DOROTHY, "Gale", null, aaiNqRequestUuid);
-        assertNull(aaiNqNullResponse);
-
-        when(restManagerMock.post(startsWith(SOME_URL), eq(WITCH), eq("West"), anyMap(),
-                anyString(), anyString())).thenReturn(httpResponseErr0);
-
-        AaiNqResponse aaiNqNotOkResponse0 = aaiManager.postQuery(SOME_URL, WITCH, "West",
-                aaiNqRequest, aaiNqRequestUuid);
-        assertNull(aaiNqNotOkResponse0);
-
-        when(restManagerMock.post(startsWith(ANOTHER_URL), eq(WITCH), eq("West"), anyMap(),
-                anyString(), anyString())).thenReturn(httpResponseErr1);
-
-        AaiNqResponse aaiNqNotOkResponse1 = aaiManager.postQuery(ANOTHER_URL, WITCH, "West",
-                aaiNqRequest, aaiNqRequestUuid);
-        assertNull(aaiNqNotOkResponse1);
-    }
-
-    @Test
-    public void testAaiManagerQueryByVserverName() {
-        AaiManager aaiManager = new AaiManager(restManagerMock);
-        assertNotNull(aaiManager);
-
-        UUID vserverNameRequestId = UUID.randomUUID();
-
-        when(restManagerMock.get(startsWith(SOME_URL), eq(DOROTHY), eq("Gale"), anyMap()))
-                .thenReturn(httpResponseOk);
-
-        AaiGetVserverResponse vserverResponse = aaiManager.getQueryByVserverName(SOME_URL,
-                DOROTHY, "Gale", vserverNameRequestId, VSERVER_NAME);
-        assertNotNull(vserverResponse);
-
-        AaiGetVserverResponse vserverNullResponse =
-                aaiManager.getQueryByVserverName(null, DOROTHY, "Gale", vserverNameRequestId, VSERVER_NAME);
-        assertNull(vserverNullResponse);
-
-        when(restManagerMock.get(startsWith(ANOTHER_URL), eq(WITCH), eq("West"), anyMap()))
-                .thenReturn(httpResponseErr0);
-
-        AaiGetVserverResponse vserverNotOkResponse0 = aaiManager.getQueryByVserverName(
-                ANOTHER_URL, WITCH, "West", vserverNameRequestId, VSERVER_NAME);
-        assertNull(vserverNotOkResponse0);
-    }
-
-    @Test
-    public void testAaiManagerQueryByVnfId() {
-        AaiManager aaiManager = new AaiManager(restManagerMock);
-        assertNotNull(aaiManager);
-
-        UUID vserverNameRequestId = UUID.randomUUID();
-
-        when(restManagerMock.get(startsWith(SOME_URL), eq(DOROTHY), eq("Gale"), anyMap()))
-                .thenReturn(httpResponseOk);
-
-        AaiGetVnfResponse vnfResponse = aaiManager.getQueryByVnfId(SOME_URL, DOROTHY,
-                "Gale", vserverNameRequestId, "vnfID");
-        assertNotNull(vnfResponse);
-    }
-
-    @Test
-    public void testAaiManagerQueryByVnfName() {
-        AaiManager aaiManager = new AaiManager(restManagerMock);
-        assertNotNull(aaiManager);
-
-        UUID vserverNameRequestId = UUID.randomUUID();
-
-        when(restManagerMock.get(startsWith(SOME_URL), eq(DOROTHY), eq("Gale"), anyMap()))
-                .thenReturn(httpResponseOk);
-
-        AaiGetVnfResponse vnfResponse = aaiManager.getQueryByVnfId(SOME_URL, DOROTHY,
-                "Gale", vserverNameRequestId, "vnfName");
-        assertNotNull(vnfResponse);
-    }
 
     @Test
     public void testAaiManagerGetPnf() {
@@ -238,7 +128,7 @@ public class AaiManagerTest {
         String pnfResponse = "{\"pnf-name\":" + pnfName
                                      + ",\"pnf-id\":\"123456\",\"in-maint\":false,\"ipaddress-v4-oam\":\"1.1.1.1\"}";
 
-        Pair<Integer, String> pnfHttpResponse = restManagerMock.new Pair<>(200, pnfResponse);
+        Pair<Integer, String> pnfHttpResponse = Pair.of(200, pnfResponse);
         when(restManagerMock.get(contains(pnfName), eq(DOROTHY), eq("Gale"), anyMap()))
                 .thenReturn(pnfHttpResponse);