X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Faaf%2Fv2_0%2Ftest%2FJU_AAFLocator.java;h=4d767c9c63d7bea0012cec4a0137c76bfd9ed68b;hb=af2d592ebbb96d5f5f55f7322f9ecdfdccfce64e;hp=e651fbc7368bc7e8b8d164964d56ba5fa9de7e2e;hpb=45ca42c48030171a5dcf180bb35fb767ae5c2b78;p=aaf%2Fauthz.git

diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/v2_0/test/JU_AAFLocator.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/v2_0/test/JU_AAFLocator.java
index e651fbc7..4d767c9c 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/v2_0/test/JU_AAFLocator.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/aaf/v2_0/test/JU_AAFLocator.java
@@ -21,12 +21,10 @@
 
 package org.onap.aaf.cadi.aaf.v2_0.test;
 
-import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.*;
-import static org.mockito.Mockito.*;
-
-import org.junit.*;
-import org.mockito.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.when;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -38,18 +36,20 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import org.onap.aaf.cadi.PropAccess;
-import org.onap.aaf.cadi.SecuritySetter;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.LocatorException;
-import org.onap.aaf.cadi.aaf.v2_0.AAFLocator;
-import org.onap.aaf.cadi.aaf.v2_0.AbsAAFLocator;
+import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.cadi.client.Future;
 import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.config.SecurityInfoC;
 import org.onap.aaf.cadi.http.HClient;
 import org.onap.aaf.misc.env.Data.TYPE;
-import org.onap.aaf.misc.env.impl.BasicTrans;
 import org.onap.aaf.misc.rosetta.env.RosettaDF;
 
 import locate.v1_0.Endpoint;
@@ -106,12 +106,12 @@ public class JU_AAFLocator {
 		access.setProperty(Config.CADI_LONGITUDE, "90.19");  // St Louis approx lon
 		SecurityInfoC<HttpURLConnection> si = SecurityInfoC.instance(access, HttpURLConnection.class);
 		URI locatorURI = new URI("https://somemachine.moc:10/com.att.aaf.service:2.0");
-		AbsAAFLocator<BasicTrans> al = new AAFLocator(si, locatorURI) {
-			@Override
-			protected HClient createClient(SecuritySetter<HttpURLConnection> ss, URI uri, int connectTimeout) throws LocatorException {
-				return clientMock;
-			}
-		};
+//		AbsAAFLocator<BasicTrans> al = new AAFLocator(si, locatorURI) {
+//			@Override
+//			protected HClient createClient(SecuritySetter<HttpURLConnection> ss, URI uri, int connectTimeout) throws LocatorException {
+//				return clientMock;
+//			}
+//		};
 		// Start over: This was originally calling a developer machine.
 //		assertThat(al.refresh(), is(true));
 //		when(futureMock.get(1)).thenReturn(false);