From 98adb75e5e627d28ecdf659f4c8ed640ce53ed5e Mon Sep 17 00:00:00 2001 From: Instrumental Date: Fri, 31 May 2019 10:02:47 -0500 Subject: Update DNSLocator code and use Issue-ID: AAF-838 Change-Id: Ieaf112365e40237b6f252371d2d2f95e9bc47f89 Signed-off-by: Instrumental --- .../org/onap/aaf/cadi/http/test/JU_HMangr.java | 29 ++++++++++++++++------ .../onap/aaf/cadi/locator/test/JU_DNSLocator.java | 4 +-- 2 files changed, 23 insertions(+), 10 deletions(-) (limited to 'cadi/client/src/test') diff --git a/cadi/client/src/test/java/org/onap/aaf/cadi/http/test/JU_HMangr.java b/cadi/client/src/test/java/org/onap/aaf/cadi/http/test/JU_HMangr.java index 9d87d699..d1744253 100644 --- a/cadi/client/src/test/java/org/onap/aaf/cadi/http/test/JU_HMangr.java +++ b/cadi/client/src/test/java/org/onap/aaf/cadi/http/test/JU_HMangr.java @@ -21,8 +21,14 @@ package org.onap.aaf.cadi.http.test; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.fail; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.when; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -34,10 +40,10 @@ import java.net.URISyntaxException; import javax.net.ssl.SSLHandshakeException; -import static org.hamcrest.CoreMatchers.*; - -import org.junit.*; -import org.mockito.*; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.onap.aaf.cadi.Access; import org.onap.aaf.cadi.CadiException; import org.onap.aaf.cadi.Locator; @@ -49,6 +55,8 @@ import org.onap.aaf.cadi.client.Retryable; import org.onap.aaf.cadi.http.HMangr; import org.onap.aaf.misc.env.APIException; +import junit.framework.Assert; + public class JU_HMangr { @Mock Locator locMock; @@ -173,9 +181,14 @@ public class JU_HMangr { @Test public void allTest() throws LocatorException, CadiException, APIException { HManagerStub hman = new HManagerStub(access, locMock); + assertThat(hman.best(ssMock, retryableMock), is(nullValue())); - assertThat(hman.all(ssMock, retryableMock), is(nullValue())); - assertThat(hman.all(ssMock, retryableMock, true), is(nullValue())); + try { + hman.all(ssMock, retryableMock, true); + Assert.fail("Should have thrown LocatorException"); + } catch (LocatorException e) { + assertEquals(e.getLocalizedMessage(),"No available clients to call"); + } } @Test diff --git a/cadi/client/src/test/java/org/onap/aaf/cadi/locator/test/JU_DNSLocator.java b/cadi/client/src/test/java/org/onap/aaf/cadi/locator/test/JU_DNSLocator.java index 9b5bbafe..dfc7142a 100644 --- a/cadi/client/src/test/java/org/onap/aaf/cadi/locator/test/JU_DNSLocator.java +++ b/cadi/client/src/test/java/org/onap/aaf/cadi/locator/test/JU_DNSLocator.java @@ -53,9 +53,9 @@ public class JU_DNSLocator { item = dl.best(); uri = dl.get(item); - assertThat(uri.toString(), is("https://127.0.0.1:8100")); + assertThat(uri.toString(), is("https://localhost:8100")); item = dl.best(); - assertThat(uri.toString(), is("https://127.0.0.1:8100")); + assertThat(uri.toString(), is("https://localhost:8100")); assertThat(dl.hasItems(), is(true)); for (item = dl.first(); item != null; item = dl.next(item)) { -- cgit 1.2.3-korg