Merge "AAFcli.java -Declare "value" on a separate line"

[aaf/authz.git] / cadi / client / src / test / java / org / onap / aaf / cadi / http / test / JU_HMangr.java

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 9d87d69..98070d6 100644 (file)
--- 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
@@ -7,9 +7,9 @@
  * 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
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -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,15 +55,17 @@ 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<URI> locMock;
     @Mock SecuritySetter<HttpURLConnection> ssMock;
     @Mock Retryable<Void> retryableMock;
     @Mock Retryable<Integer> goodRetry;
     @Mock Locator.Item itemMock;
     @Mock Rcli<Object> clientMock;
-    
+
     private PropAccess access;
     private URI uri;
     private final static String uriString = "http://example.com";
@@ -76,11 +84,11 @@ public class JU_HMangr {
         when(retryableMock.item()).thenReturn(itemMock);
         when(locMock.get(itemMock)).thenReturn(uri);
         assertThat(hman.same(ssMock, retryableMock), is(nullValue()));
-        
+
         //coverage...
         when(retryableMock.lastClient()).thenReturn(clientMock);
         assertThat(hman.same(ssMock, retryableMock), is(nullValue()));
-        
+
         CadiException cadiException;
 
         ConnectException connectException = new ConnectException();
@@ -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
@@ -197,7 +210,7 @@ public class JU_HMangr {
         assertThat(hman.oneOf(ssMock, retryableMock, false, "host"), is(nullValue()));
 
         assertThat(hman.oneOf(ssMock, retryableMock, false, uriString.substring(7)), is(nullValue()));
-        
+
         CadiException cadiException;
 
         cadiException = new CadiException(new ConnectException());
@@ -231,7 +244,7 @@ public class JU_HMangr {
             fail("Should've thrown an exception");
         } catch (CadiException e) {
         }
-        
+
         doThrow(new ConnectException()).when(retryableMock).code((Rcli<?>) any());
         assertThat(hman.oneOf(ssMock, retryableMock, false, uriString.substring(7)), is(nullValue()));
 
@@ -261,5 +274,5 @@ public class JU_HMangr {
             return null;
         }
     }
-        
+
 }
\ No newline at end of file