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=9de694b7cd196898aba9c31cae965a144b19e3b6;hb=3d1706fcbe7f95830ff6fd23cf679ee55c6d0595;hp=eef1a87b7f695f592bad08568392ee351f4d7596;hpb=944be36dc15900cc9b3a8cf04916f5ef446824c6;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 eef1a87b..9de694b7 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
@@ -44,82 +44,83 @@ import org.onap.aaf.cadi.register.Registrant;
 import org.onap.aaf.misc.env.APIException;
 
 public class JU_AAF_FS {
-	AuthzEnv aEnv;
-	AAF_FS aafFs;
-	File fService;
-	File fEtc;
-	String value;
-	File d;
-	private static final String testDir = "src/test/resources/logs";
-	private ByteArrayOutputStream outStream;
-	private ByteArrayOutputStream errStream;
+    AuthzEnv aEnv;
+    AAF_FS aafFs;
+    File fService;
+    File fEtc;
+    String value;
+    File d;
+    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();
-		errStream = new ByteArrayOutputStream();
-		System.setOut(new PrintStream(outStream));
-		System.setErr(new PrintStream(errStream));
-		value = System.setProperty(Config.CADI_LOGDIR, testDir);
-		System.setProperty(Config.CADI_ETCDIR, testDir);
-		System.out.println(ClassLoader.getSystemResource("org.osaaf.aaf.log4j.props"));
-		d = new File(testDir);
-		d.mkdirs();
-		fService = new File(d + "/fs-serviceTEST.log");
-		fService.createNewFile();
-		fEtc = new File(d + "/org.osaaf.aaf.log4j.props");
-		fEtc.createNewFile();
+    @Before
+    public void setUp() throws APIException, IOException, CadiException {
+        outStream = new ByteArrayOutputStream();
+        errStream = new ByteArrayOutputStream();
+        System.setOut(new PrintStream(outStream));
+        System.setErr(new PrintStream(errStream));
+        value = System.setProperty(Config.CADI_LOGDIR, testDir);
+        System.setProperty(Config.CADI_ETCDIR, testDir);
+        System.out.println(ClassLoader.getSystemResource("org.osaaf.aaf.log4j.props"));
+        d = new File(testDir);
+        d.mkdirs();
+        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");
-		Server serverMock = mock(Server.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);
-	}
+        aEnv = new AuthzEnv();
+        aEnv.staticSlot("test");
+        aEnv.access().setProperty("aaf_public_dir", "test");
+        aEnv.access().setProperty(Config.AAF_LOCATOR_ENTRIES, "aaf_com");
+        aEnv.access().setProperty(Config.AAF_LOCATOR_VERSION, "1.1");
+        Server serverMock = mock(Server.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;
-		aEnv.access().setProperty(Config.AAF_URL, "www.google.com");
-		aEnv.access().setProperty(Config.CADI_LATITUDE, "38.550674");
-		aEnv.access().setProperty(Config.CADI_LONGITUDE, "-90.146942");
-		aEnv.access().setProperty(Config.AAF_LOCATE_URL, "testLocateUrl");
-		aEnv.access().setProperty(Config.HOSTNAME, "testHost");
+    @Test
+    public void testRegistrants() throws CadiException, LocatorException {
+        int port = 8008;
+        aEnv.access().setProperty(Config.AAF_URL, "www.google.com");
+        aEnv.access().setProperty(Config.CADI_LATITUDE, "38.550674");
+        aEnv.access().setProperty(Config.CADI_LONGITUDE, "-90.146942");
+        aEnv.access().setProperty(Config.AAF_LOCATE_URL, "testLocateUrl");
+        aEnv.access().setProperty(Config.HOSTNAME, "testHost");
 
-		// Doesn't work within Jenkins
-		Registrant<AuthzEnv>[] registrants = aafFs.registrants(port);
-		assertNotNull(registrants);
-	}
+        // 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 testFilters() throws CadiException, LocatorException {
+        aafFs.filters();
+    }
 
-	@Test
-	public void testMain() {
-		System.setProperty("cadi_exitOnFailure", "false");
+    @Test
+    public void testMain() {
+        System.setProperty("cadi_exitOnFailure", "false");
 
-		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.
-		}
-	}
+        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.
+        }
+    }
 
-	@After
-	public void cleanUp() {
-		for (File f : d.listFiles()) {
-			f.delete();
-		}
-		d.delete();
-		System.setErr(System.err);
-		System.setOut(System.out);
-	}
+    @After
+    public void cleanUp() {
+        for (File f : d.listFiles()) {
+            f.delete();
+        }
+        d.delete();
+        System.setErr(System.err);
+        System.setOut(System.out);
+    }
 
 }