X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-fs%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Ffs%2Ftest%2FJU_AAF_FS.java;h=e7e5543ab5fe0b3af99663b13e8828a432af30c7;hb=12414fe43077e12d7ef711951b1633ad31d73573;hp=585f8d5a225863ff2aab88cac7897ff5328aba07;hpb=5a081a25fd94da790a59a68195a19bc0ef7aa20c;p=aaf%2Fauthz.git

diff --git a/auth/auth-fs/src/test/java/org/onap/aaf/auth/fs/test/JU_AAF_FS.java b/auth/auth-fs/src/test/java/org/onap/aaf/auth/fs/test/JU_AAF_FS.java
index 585f8d5a..e7e5543a 100644
--- a/auth/auth-fs/src/test/java/org/onap/aaf/auth/fs/test/JU_AAF_FS.java
+++ b/auth/auth-fs/src/test/java/org/onap/aaf/auth/fs/test/JU_AAF_FS.java
@@ -21,34 +21,27 @@
 
 package org.onap.aaf.auth.fs.test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.mock;
 
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+
+import org.eclipse.jetty.server.Server;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.onap.aaf.auth.env.AuthzEnv;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.fs.AAF_FS;
-import org.onap.aaf.auth.rserv.CachingFileAccess;
 import org.onap.aaf.auth.server.JettyServiceStarter;
-import org.onap.aaf.cadi.Access;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.register.Registrant;
 import org.onap.aaf.misc.env.APIException;
-import org.onap.aaf.misc.env.Slot;
-import org.onap.aaf.misc.env.StaticSlot;
-import org.eclipse.jetty.server.Server;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import static org.mockito.Mockito.*;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-
-import org.junit.Test;
 
 public class JU_AAF_FS {
 	AuthzEnv aEnv;
@@ -60,8 +53,7 @@ public class JU_AAF_FS {
 	private static final String testDir = "src/test/resources/logs";
 	private ByteArrayOutputStream outStream;
 	private ByteArrayOutputStream errStream;
-	
-	
+
 	@Before
 	public void setUp() throws APIException, IOException, CadiException {
 		outStream = new ByteArrayOutputStream();
@@ -73,22 +65,23 @@ public class JU_AAF_FS {
 		System.out.println(ClassLoader.getSystemResource("org.osaaf.aaf.log4j.props"));
 		d = new File(testDir);
 		d.mkdirs();
-		fService = new File(d +"/fs-serviceTEST.log");
+		fService = new File(d + "/fs-serviceTEST.log");
 		fService.createNewFile();
 		fEtc = new File(d + "/org.osaaf.aaf.log4j.props");
 		fEtc.createNewFile();
-		
+
 		aEnv = new AuthzEnv();
 		aEnv.staticSlot("test");
 		aEnv.access().setProperty("aaf_public_dir", "test");
-		aEnv.access().setProperty(Config.AAF_COMPONENT, "aaf_com:1.1");
+		aEnv.access().setProperty(Config.AAF_LOCATOR_NAMES, "aaf_com");
+        aEnv.access().setProperty(Config.AAF_LOCATOR_VERSION, "1.1");
 		Server serverMock = mock(Server.class);
-		JettyServiceStarter<AuthzEnv,AuthzTrans> jssMock = mock(JettyServiceStarter.class);
+		JettyServiceStarter<AuthzEnv, AuthzTrans> jssMock = mock(JettyServiceStarter.class);
 		aafFs = new AAF_FS(aEnv);
 		aEnv.access().setProperty(Config.AAF_LOCATE_URL, "aaf_loc:ate.url");
 		aafFs = new AAF_FS(aEnv);
 	}
-	
+
 	@Test
 	public void testRegistrants() throws CadiException, LocatorException {
 		int port = 8008;
@@ -97,30 +90,32 @@ public class JU_AAF_FS {
 		aEnv.access().setProperty(Config.CADI_LONGITUDE, "-90.146942");
 		aEnv.access().setProperty(Config.AAF_LOCATE_URL, "testLocateUrl");
 		aEnv.access().setProperty(Config.HOSTNAME, "testHost");
-		
-		aafFs.registrants(port);
+
+		// Doesn't work within Jenkins
+		Registrant<AuthzEnv>[] registrants = aafFs.registrants(port);
+		assertNotNull(registrants);
 	}
-	
+
 	@Test
 	public void testFilters() throws CadiException, LocatorException {
 		aafFs.filters();
 	}
-	
+
 	@Test
 	public void testMain() {
 		System.setProperty("cadi_exitOnFailure", "false");
 
-		String[] strArr = {"aaf_component=aaf_com:po.nent"};
+		String[] strArr = { "aaf_component=aaf_com:po.nent" };
 		try {
-			//AAF_FS.main(strArr);			//Timeout caused in Jenkins but not in local
-		} catch(Exception e) {
-			//Failure expected until we understand how code is.
+			AAF_FS.main(strArr); // Timeout caused in Jenkins but not in local
+		} catch (Exception e) {
+			// Failure expected until we understand how code is.
 		}
 	}
-	
+
 	@After
 	public void cleanUp() {
-		for(File f : d.listFiles()) {
+		for (File f : d.listFiles()) {
 			f.delete();
 		}
 		d.delete();