X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Faai%2FAaiQueryMdonsTest.java;h=6c038c292913a8b91a3e0564715c4a247e141de9;hb=6e0fd04861ecd2a00ca2d158b0639454eae94702;hp=21dd44a3f88ecd7e20c518681c92d16365b01fd0;hpb=6af8af01fb0cdceb384cf47cf241736620510465;p=holmes%2Fcommon.git diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java index 21dd44a..6c038c2 100644 --- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java +++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQueryMdonsTest.java @@ -1,5 +1,5 @@ /** - * Copyright 2020 Fujitsu Limited. + * Copyright 2020 - 2023 Fujitsu Limited, ZTE Corporation. *

* 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 @@ -16,6 +16,9 @@ package org.onap.holmes.common.aai; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; import org.easymock.EasyMock; import org.junit.*; import org.junit.rules.ExpectedException; @@ -29,20 +32,16 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import javax.ws.rs.client.Entity; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; import java.io.*; import java.util.HashMap; import java.util.Map; import static org.easymock.EasyMock.anyObject; import static org.junit.Assert.assertEquals; -import static org.onap.holmes.common.config.MicroServiceConfig.MSB_ADDR; @RunWith(PowerMockRunner.class) @PowerMockIgnore("javax.net.ssl.*") -@PrepareForTest({AaiQueryMdons.class, MicroServiceConfig.class}) +@PrepareForTest({AaiQueryMdons.class, MicroServiceConfig.class, JerseyClient.class}) public class AaiQueryMdonsTest { @Rule @@ -53,12 +52,13 @@ public class AaiQueryMdonsTest { private static JsonObject data; - private static final String AAI_ADDR = "https://aai.onap:8443/aai/v19/"; + private static final String AAI_ADDR = "https://aai.onap:443/aai/v19/"; @BeforeClass public static void beforeClass() { - System.setProperty(MSB_ADDR, "127.0.0.1:80"); System.setProperty("ENABLE_ENCRYPT", "true"); + System.setProperty(MicroServiceConfig.AAI_ADDR, "aai"); + System.setProperty(MicroServiceConfig.NAMESPACE, "onap"); File file = new File(AaiQueryMdonsTest.class.getClassLoader().getResource("./aai-mdons.json").getFile()); BufferedReader reader = null;