code improvement

[dmaap/messagerouter/dmaapclient.git] / src / test / java / org / onap / dmaap / mr / client / impl / DMaapClientUtilTest.java

diff --git a/src/test/java/org/onap/dmaap/mr/client/impl/DMaapClientUtilTest.java b/src/test/java/org/onap/dmaap/mr/client/impl/DMaapClientUtilTest.java
index 21c3b6c..a845572 100644 (file)
--- a/src/test/java/org/onap/dmaap/mr/client/impl/DMaapClientUtilTest.java
+++ b/src/test/java/org/onap/dmaap/mr/client/impl/DMaapClientUtilTest.java
@@ -22,45 +22,42 @@
 package org.onap.dmaap.mr.client.impl;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.Invocation.Builder;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Response;
-
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
 
 public class DMaapClientUtilTest {
-    
-       Builder builder;
-       
-       Response response;
-       
-       WebTarget target;
-       
+    @Mock
+    Response response;
+    @Mock
+    Builder builder;
+    @Mock
+    WebTarget target;
+
     @Before
     public void setup(){
-        Mockito.mock(HttpServletRequest.class);
-        builder = Mockito.mock(Invocation.Builder.class);
-        response = Mockito.mock(Response.class);
-        target = Mockito.mock(WebTarget.class);
-        
+        MockitoAnnotations.initMocks(this);
     }
     
     @Test
-    public void testGetTarget() throws IOException{
+    public void testGetTarget() {
        WebTarget actual = DmaapClientUtil.getTarget("testpath");
         
         assertEquals("testpath", actual.getUri().getPath());
     }
     
     @Test
-    public void testGetTargetWithParams() throws IOException{
+    public void testGetTargetWithParams() {
         WebTarget actual = DmaapClientUtil.getTarget("testpath", "testuser", "testpassword");
         
         assertEquals("testpath", actual.getUri().getPath());
@@ -74,8 +71,10 @@ public class DMaapClientUtilTest {
        Mockito.when(builder.get()).thenReturn(response);
        
         Response actual = DmaapClientUtil.getResponsewtCambriaAuth(target, "testuser", "testpassword");
-        
+
         assertEquals(response, actual);
+        verify(target).request();
+        verify(builder, times(2)).header((String) any(), any());
     }