/**
- * Copyright 2018 ZTE Corporation.
+ * Copyright 2018-2021 ZTE Corporation.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
package org.onap.holmes.common.aai;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
import org.easymock.EasyMock;
import org.junit.*;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.onap.holmes.common.aai.config.AaiConfig;
import org.onap.holmes.common.exception.CorrelationException;
+import org.onap.holmes.common.utils.JerseyClient;
import org.powermock.api.easymock.PowerMock;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.powermock.reflect.Whitebox;
-import javax.ws.rs.client.*;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.util.HashMap;
+import java.util.Map;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.anyString;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.onap.holmes.common.config.MicroServiceConfig.MSB_ADDR;
@RunWith(PowerMockRunner.class)
-@PrepareForTest({ClientBuilder.class, Client.class, Builder.class, WebTarget.class, Response.class})
+@PrepareForTest(JerseyClient.class)
public class AaiQuery4CcvpnTest {
@Rule
public ExpectedException thrown = ExpectedException.none();
- private static JSONObject data;
+ private static JsonObject data;
- private static AaiQuery4Ccvpn aai = new AaiQuery4Ccvpn();
+ private static AaiQuery4Ccvpn aai = AaiQuery4Ccvpn.newInstance();
- private static MultivaluedMap<String, Object> headers = new MultivaluedHashMap<>();
- private static Client client;
- private static WebTarget webTarget;
- private static Builder builder;
- private static Response response;
+ private static Map<String, Object> headers = new HashMap<>();
+
+ private static JerseyClient client;
@BeforeClass
static public void beforeClass() {
reader = new BufferedReader(new FileReader(file));
StringBuilder sb = new StringBuilder();
reader.lines().forEach(l -> sb.append(l));
- data = JSONObject.parseObject(sb.toString());
+ data = JsonParser.parseString(sb.toString()).getAsJsonObject();
} catch (FileNotFoundException e) {
// Do nothing
} catch (IOException e) {
}
}
- headers.add("X-TransactionId", AaiConfig.X_TRANSACTION_ID);
- headers.add("X-FromAppId", AaiConfig.X_FROMAPP_ID);
- headers.add("Authorization", AaiConfig.getAuthenticationCredentials());
- headers.add("Accept", "application/json");
+ headers.put("X-TransactionId", AaiConfig.X_TRANSACTION_ID);
+ headers.put("X-FromAppId", AaiConfig.X_FROMAPP_ID);
+ headers.put("Authorization", AaiConfig.getAuthenticationCredentials());
+ headers.put("Accept", "application/json");
+ headers.put("Content-Type", "application/json");
Whitebox.setInternalState(aai, "headers", headers);
}
@Before
public void before() {
- PowerMock.mockStatic(ClientBuilder.class);
- client = PowerMock.createMock(Client.class);
- webTarget = PowerMock.createMock(WebTarget.class);
- builder = PowerMock.createMock(Builder.class);
- response = PowerMock.createMock(Response.class);
+ PowerMock.mockStatic(JerseyClient.class);
+ client = PowerMock.createMock(JerseyClient.class);
+ EasyMock.expect(JerseyClient.newInstance()).andReturn(client).anyTimes();
}
@After
}
@Test
- public void test_getPath() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+ public void test_getPath() throws Exception {
String path = "/aai/v14/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances?service-instance-id={servId}";
-
- Method method = AaiQuery4Ccvpn.class.getDeclaredMethod("getPath", String.class);
- method.setAccessible(true);
-
- String ret = (String) method.invoke(aai, path);
-
+ String ret = Whitebox.invokeMethod(aai, "getPath", path);
assertThat(ret, equalTo("/api/aai-business/v14/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances?service-instance-id={servId}"));
-
- }
-
- @Test
- public void test_getLogicLink_exception() {
- mockGetMethod();
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2);
-
- thrown.expect(RuntimeException.class);
-
- PowerMock.replayAll();
-
- String linkId = aai.getLogicLink("network-1", "pnf-1", "interface-1", "DOWN");
-
- PowerMock.verifyAll();
-
- assertThat(linkId, equalTo("logic-link-1"));
-
}
@Test
public void test_getLogicLink() {
- mockGetMethod();
- EasyMock.expect(response.getEntity()).andReturn(data.getJSONObject("logic-link"));
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
+ mockGetMethod(data.get("logic-link").toString());
PowerMock.replayAll();
}
- @Test
- public void test_getServiceInstances_exception() {
- mockGetMethod();
- EasyMock.expect(response.getEntity()).andReturn(data.getJSONObject("vpn-binding"));
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- mockGetMethod();
- EasyMock.expect(response.getEntity()).andReturn(data.getJSONObject("connectivity"));
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- mockGetMethod();
- EasyMock.expect(response.getEntity()).andReturn(data.getJSONObject("service-instance-by-connectivity"));
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- mockGetMethod();
- EasyMock.expect(response.getEntity()).andReturn(data.getJSONObject("service-instances-by-service-type"));
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2);
-
- thrown.expect(RuntimeException.class);
-
- PowerMock.replayAll();
-
- JSONArray instances = aai.getServiceInstances("network-1", "pnf-1", "interface-1", "DOWN");
-
- PowerMock.verifyAll();
-
- assertThat(instances, equalTo("logic-link-1"));
-
- }
@Test
- public void test_getServiceInstances() {
- mockGetMethod();
- EasyMock.expect(response.getEntity()).andReturn(data.getJSONObject("vpn-binding"));
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- mockGetMethod();
- EasyMock.expect(response.getEntity()).andReturn(data.getJSONObject("connectivity"));
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- mockGetMethod();
- EasyMock.expect(response.getEntity()).andReturn(data.getJSONObject("service-instance-by-connectivity"));
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- mockGetMethod();
- EasyMock.expect(response.getEntity()).andReturn(data.getJSONObject("service-instances-by-service-type"));
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
+ public void test_getServiceInstance() {
+ mockGetMethod(data.get("vpn-binding").toString());
+ mockGetMethod(data.get("connectivity").toString());
+ mockGetMethod(data.get("service-instance-by-connectivity").toString());
+ mockGetMethod(data.get("service-instances-by-service-type").toString());
PowerMock.replayAll();
- JSONArray instances = aai.getServiceInstances("network-1", "pnf-1", "interface-1", "DOWN");
+ JsonObject instance = aai.getServiceInstance("network-1", "pnf-1", "interface-1", "DOWN");
PowerMock.verifyAll();
- assertThat(instances.getJSONObject(0).getString("service-instance-id"), equalTo("some id 1"));
- assertThat(instances.getJSONObject(1).getString("service-instance-id"), equalTo("some id 2"));
- assertThat(instances.getJSONObject(2).getString("service-instance-id"), equalTo("some id 3"));
- }
-
- @Test
- public void test_getServiceInstances_1() throws CorrelationException {
- mockGetMethod();
- EasyMock.expect(response.getEntity()).andReturn(data.getJSONObject("service-instances-by-service-type"));
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- PowerMock.replayAll();
-
- JSONArray instances = aai.getServiceInstances("custom-1", "service-type-1");
-
- PowerMock.verifyAll();
-
- assertThat(instances.getJSONObject(0).getString("service-instance-id"), equalTo("some id 1"));
- assertThat(instances.getJSONObject(1).getString("service-instance-id"), equalTo("some id 2"));
- assertThat(instances.getJSONObject(2).getString("service-instance-id"), equalTo("some id 3"));
- }
-
- @Test
- public void test_getServiceInstances_1_exception() throws CorrelationException {
- mockGetMethod();
- EasyMock.expect(response.getEntity()).andReturn(data.getJSONObject("service-instances-by-service-type"));
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2);
-
- thrown.expect(CorrelationException.class);
-
- PowerMock.replayAll();
-
- JSONArray instances = aai.getServiceInstances("custom-1", "service-type-1");
-
- PowerMock.verifyAll();
-
- assertThat(instances.getJSONObject(0).getString("service-instance-id"), equalTo("some id 1"));
- assertThat(instances.getJSONObject(1).getString("service-instance-id"), equalTo("some id 2"));
- assertThat(instances.getJSONObject(2).getString("service-instance-id"), equalTo("some id 3"));
+ assertThat(instance.get("service-instance-id").getAsString(), equalTo("some id 1"));
+ assertThat(instance.get("globalSubscriberId").getAsString(), equalTo("e151059a-d924-4629-845f-264db19e50b4"));
+ assertThat(instance.get("serviceType").getAsString(), equalTo("volte"));
}
@Test
public void test_updateTerminalPointStatus() throws CorrelationException {
- mockPatchMethod();
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
+ mockGetMethod(data.toString());
+ mockPutMethod("ok");
PowerMock.replayAll();
PowerMock.verifyAll();
}
- @Test
- public void test_updateTerminalPointStatus_exception() throws CorrelationException {
- mockPatchMethod();
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2);
-
- thrown.expect(CorrelationException.class);
-
- PowerMock.replayAll();
-
- aai.updateTerminalPointStatus("network-1", "pnf-1", "if-1", new HashMap<>());
-
- PowerMock.verifyAll();
- }
-
- @Test
- public void test_updateLogicLinkStatus() throws CorrelationException {
- mockPatchMethod();
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- PowerMock.replayAll();
-
- aai.updateLogicLinkStatus("link-1", new HashMap<>());
-
- PowerMock.verifyAll();
- }
@Test
- public void test_updateLogicLinkStatus_exception() throws CorrelationException {
- mockPatchMethod();
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2);
-
- thrown.expect(CorrelationException.class);
+ public void test_updateLogicLinkStatus() {
+ mockGetMethod(data.toString());
+ mockPutMethod("ok");
PowerMock.replayAll();
aai.updateLogicLinkStatus("link-1", new HashMap<>());
PowerMock.verifyAll();
-
- }
-
- private void mockGetMethod() {
- initCommonMock();
- EasyMock.expect(builder.get()).andReturn(response);
}
- private void mockPatchMethod() {
- initCommonMock();
- EasyMock.expect(builder.method(EasyMock.anyObject(String.class), EasyMock.anyObject(Entity.class))).andReturn(response);
+ private void mockGetMethod(String ret) {
+ EasyMock.expect(client.path(anyString())).andReturn(client);
+ EasyMock.expect(client.headers(anyObject())).andReturn(client);
+ EasyMock.expect(client.get(anyString())).andReturn(ret);
}
- private void initCommonMock() {
- EasyMock.expect(ClientBuilder.newClient()).andReturn(client);
- EasyMock.expect(client.target(EasyMock.anyObject(String.class))).andReturn(webTarget);
- EasyMock.expect(webTarget.path(EasyMock.anyObject(String.class))).andReturn(webTarget);
- EasyMock.expect(webTarget.request()).andReturn(builder);
- EasyMock.expect(builder.headers(headers)).andReturn(builder);
+ private void mockPutMethod(String ok) {
+ EasyMock.expect(client.path(anyString())).andReturn(client);
+ EasyMock.expect(client.headers(anyObject())).andReturn(client);
+ EasyMock.expect(client.put(anyString(), anyObject())).andReturn(ok);
}
}
\ No newline at end of file
Code Review / holmes / common.git / blobdiff