[trafficcontrol] 04/12: Updated Java API client unittests

[ne...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

neuman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git

commit d6e7d10a15ba70cb0155d796306d04d304f123e3
Author: nerdynick <ne...@gmail.com>
AuthorDate: Thu May 17 11:44:24 2018 -0600

    Updated Java API client unittests
---
 .../comcast/cdn/traffic_control/TOSessionTest.java | 50 +++++++++++++++++-----
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/traffic_control/clients/java/trafficops/src/test/java/com/comcast/cdn/traffic_control/TOSessionTest.java b/traffic_control/clients/java/trafficops/src/test/java/com/comcast/cdn/traffic_control/TOSessionTest.java
index cfd6d27..3cf550b 100644
--- a/traffic_control/clients/java/trafficops/src/test/java/com/comcast/cdn/traffic_control/TOSessionTest.java
+++ b/traffic_control/clients/java/trafficops/src/test/java/com/comcast/cdn/traffic_control/TOSessionTest.java
@@ -2,6 +2,7 @@ package com.comcast.cdn.traffic_control;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import java.net.URI;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
@@ -23,6 +24,8 @@ import com.comcast.cdn.traffic_control.models.Response.CollectionResponse;
 public class TOSessionTest {
 	private static final Logger LOG = LoggerFactory.getLogger(TOSessionTest.class);
 	
+	public static final URI baseUri = URI.create("http://trafficcontrol.apache.org:443");
+	
 	public static final String DeliveryService_Good_Response = "{\"response\": [{\"cachegroup\": \"us-co-denver\"}]}";
 	
 	private RestApiSession sessionMock;
@@ -38,20 +41,32 @@ public class TOSessionTest {
 
 	@Test
 	public void testBuild() {
-		TOSession.builder().setRestClient(sessionMock).build();
+		TOSession.builder()
+			.setRestClient(sessionMock)
+			.fromURI(baseUri)
+			.build();
 	}
 	
 	@Test(expected=LoginException.class)
 	public void test401Response() throws Throwable {
 		HttpResponse resp = Mockito.mock(HttpResponse.class);
-		Mockito.when(resp.getStatusLine()).thenReturn(new BasicStatusLine(HttpVersion.HTTP_1_0, 401, "Not Auth"));
+		Mockito
+			.when(resp.getStatusLine())
+			.thenReturn(new BasicStatusLine(HttpVersion.HTTP_1_0, 401, "Not Auth"));
 		
-		CompletableFuture<HttpResponse> f = new CompletableFuture<>();
+		final CompletableFuture<HttpResponse> f = new CompletableFuture<>();
 		f.complete(resp);
 		
-		Mockito.doReturn(f).when(sessionMock).execute(Mockito.any(RequestBuilder.class));
+		Mockito
+			.doReturn(f)
+			.when(sessionMock)
+			.execute(Mockito.any(RequestBuilder.class));
 		
-		TOSession session = TOSession.builder().setRestClient(sessionMock).build();
+		TOSession session = TOSession
+				.builder()
+				.fromURI(baseUri)
+				.setRestClient(sessionMock)
+				.build();
 		
 		try {
 			session.getDeliveryServices().get();
@@ -62,16 +77,29 @@ public class TOSessionTest {
 	
 	@Test
 	public void deliveryServices() throws Throwable {
-		HttpResponse resp = Mockito.mock(HttpResponse.class);
-		Mockito.doReturn(new BasicStatusLine(HttpVersion.HTTP_1_0, 200, "Ok")).when(resp).getStatusLine();
-		Mockito.doReturn(new StringEntity(DeliveryService_Good_Response)).when(resp).getEntity();
+		final HttpResponse resp = Mockito.mock(HttpResponse.class);
+		Mockito
+			.doReturn(new BasicStatusLine(HttpVersion.HTTP_1_0, 200, "Ok"))
+			.when(resp)
+			.getStatusLine();
+		Mockito
+			.doReturn(new StringEntity(DeliveryService_Good_Response))
+			.when(resp)
+			.getEntity();
 		
-		CompletableFuture<HttpResponse> f = new CompletableFuture<>();
+		final CompletableFuture<HttpResponse> f = new CompletableFuture<>();
 		f.complete(resp);
 		
-		Mockito.doReturn(f).when(sessionMock).execute(Mockito.any(RequestBuilder.class));
+		Mockito
+			.doReturn(f)
+			.when(sessionMock)
+			.execute(Mockito.any(RequestBuilder.class));
+		
+		final TOSession session = TOSession.builder()
+				.fromURI(baseUri)
+				.setRestClient(sessionMock)
+				.build();
 		
-		TOSession session = TOSession.builder().setRestClient(sessionMock).build();
 		CollectionResponse cResp = session.getDeliveryServices().get();
 		
 		assertNotNull(cResp);