X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Fclient%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Flocator%2Ftest%2FJU_PropertyLocator.java;h=26673dd5c275ef7ee195e35db8528983cefadd82;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=d14e747ad44478fef4c1cd7f1fbaf0fc92c8b08c;hpb=6261a19e61138e861f5c7eaf37835205f19f1fe0;p=aaf%2Fauthz.git

diff --git a/cadi/client/src/test/java/org/onap/aaf/cadi/locator/test/JU_PropertyLocator.java b/cadi/client/src/test/java/org/onap/aaf/cadi/locator/test/JU_PropertyLocator.java
index d14e747a..26673dd5 100644
--- a/cadi/client/src/test/java/org/onap/aaf/cadi/locator/test/JU_PropertyLocator.java
+++ b/cadi/client/src/test/java/org/onap/aaf/cadi/locator/test/JU_PropertyLocator.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,80 +36,81 @@ import org.onap.aaf.cadi.locator.PropertyLocator;
 
 public class JU_PropertyLocator {
 
-	@Mock
-	Socket socketMock;
+    @Mock
+    Socket socketMock;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+
+        when(socketMock.isConnected()).thenReturn(true);
+        when(socketMock.isClosed()).thenReturn(true).thenReturn(false);
+    }
 
-	@Before
-	public void setup() {
-		MockitoAnnotations.initMocks(this);
+    @Test
+    public void test() throws Exception {
+        String uris = "https://fred.wilma.com:26444,https://tom.jerry.com:[534-535]";
+        PropertyLocator pl = new PropertyLocator(uris, 0L, 1000*60*20L) {
+            @Override protected Socket createSocket() { return socketMock; }
+        };
+        String str = pl.toString();
+        assertThat(str.contains("https://fred.wilma.com:26444"), is(true));
+        assertThat(str.contains("https://tom.jerry.com:534"), is(true));
+        assertThat(str.contains("https://tom.jerry.com:535"), is(true));
 
-		when(socketMock.isConnected()).thenReturn(true);
-		when(socketMock.isClosed()).thenReturn(true).thenReturn(false);
-	}
+        Item item = pl.first();
+        assertThat(item.toString(), is("Item: 0 order: 0"));
 
-	@Test
-	public void test() throws Exception {
-		String uris = "https://fred.wilma.com:26444,https://tom.jerry.com:[534-535]";
-		PropertyLocator pl = new PropertyLocator(uris, 0L, 1000*60*20L) {
-			@Override protected Socket createSocket() { return socketMock; }
-		};
-		String str = pl.toString();
-		assertThat(str.contains("https://fred.wilma.com:26444"), is(true));
-		assertThat(str.contains("https://tom.jerry.com:534"), is(true));
-		assertThat(str.contains("https://tom.jerry.com:535"), is(true));
+        URI uri = pl.get(item);
+        assertThat(uri.toString(), is("https://fred.wilma.com:26444"));
 
-		Item item = pl.first();
-		assertThat(item.toString(), is("Item: 0 order: 0"));
+        assertThat(pl.get(null), is(nullValue()));
 
-		URI uri = pl.get(item);
-		assertThat(uri.toString(), is("https://fred.wilma.com:26444"));
+        assertThat(pl.hasItems(), is(true));
 
-		assertThat(pl.get(null), is(nullValue()));
+        assertThat(countItems(pl), is(3));
+        pl.invalidate(pl.best());
 
-		assertThat(pl.hasItems(), is(true));
+        assertThat(countItems(pl), is(2));
+        pl.invalidate(pl.best());
 
-		assertThat(countItems(pl), is(3));
-		pl.invalidate(pl.best());
+        assertThat(countItems(pl), is(1));
 
-		assertThat(countItems(pl), is(2));
-		pl.invalidate(pl.best());
+        pl.invalidate(pl.best());
 
-		assertThat(countItems(pl), is(1));
+        assertThat(pl.hasItems(), is(false));
+        assertThat(countItems(pl), is(0));
 
-		pl.invalidate(pl.best());
+        Thread.sleep(20L); // PL checks same milli...
+        pl.refresh();
 
-		assertThat(pl.hasItems(), is(false));
-		assertThat(countItems(pl), is(0));
+        assertThat(pl.hasItems(), is(true));
 
-		pl.refresh();
+        assertThat(pl.next(null), is(nullValue()));
 
-		assertThat(pl.hasItems(), is(true));
-		
-		assertThat(pl.next(null), is(nullValue()));
+        // coverage...
+        pl.invalidate(null);
+        pl.invalidate(null);
+        pl.invalidate(null);
+        pl.invalidate(null);
 
-		// coverage...
-		pl.invalidate(null);
-		pl.invalidate(null);
-		pl.invalidate(null);
-		pl.invalidate(null);
+        pl.destroy();
 
-		pl.destroy();
+        pl = new PropertyLocator(uris);
 
-		pl = new PropertyLocator(uris);
-		
-	}
+    }
 
-	@Test(expected=LocatorException.class)
-	public void exceptionTest() throws LocatorException {
-		new PropertyLocator(null);
-	}
+    @Test(expected=LocatorException.class)
+    public void exceptionTest() throws LocatorException {
+        new PropertyLocator(null);
+    }
 
-	private int countItems(PropertyLocator pl) throws LocatorException {
-		int count = 0;
-		for(Item i = pl.first(); i != null; i = pl.next(i)) {
-			++count;
-		}
-		return count;
-	}
+    private int countItems(PropertyLocator pl) throws LocatorException {
+        int count = 0;
+        for (Item i = pl.first(); i != null; i = pl.next(i)) {
+            ++count;
+        }
+        return count;
+    }
 
 }