X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-cass%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fdirect%2Ftest%2FJU_DirectAAFLocator.java;h=01d4b9a26652a802270a6f839ca2e3cc183620b3;hb=a47bd51641efcb84e19d68a6383f0947df826636;hp=2801d433a5ab11b97a240538f58b208d54efd898;hpb=aab276e679f221b37fc6be37e5dd0ffd72ffc406;p=aaf%2Fauthz.git

diff --git a/auth/auth-cass/src/test/java/org/onap/aaf/auth/direct/test/JU_DirectAAFLocator.java b/auth/auth-cass/src/test/java/org/onap/aaf/auth/direct/test/JU_DirectAAFLocator.java
index 2801d433..01d4b9a2 100644
--- a/auth/auth-cass/src/test/java/org/onap/aaf/auth/direct/test/JU_DirectAAFLocator.java
+++ b/auth/auth-cass/src/test/java/org/onap/aaf/auth/direct/test/JU_DirectAAFLocator.java
@@ -61,95 +61,130 @@ public class JU_DirectAAFLocator {
 	AuthzTrans trans;
 	
 	@Mock
-	Access access;
+	PropAccess access;
 	
 	@Before
 	public void setUp() throws Exception {
 		initMocks(this);
 	}
-//	
-//	@Test
-//	public void testConstructorExcpetion() {
-//		Mockito.doReturn(access).when(env).access();
-//		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LATITUDE,null);
-//		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LONGITUDE,null);
-//		try {
-//			DirectAAFLocator aafLocatorObj=new DirectAAFLocator(env, ldao,"test","test");
-//		} catch (LocatorException e) {
-////			System.out.println(e.getMessage());
-//			assertEquals("Invalid Version String: test", e.getMessage());
-//		}
-//	}
-//	
+	
+	@Test
+	public void testConstructorVersionExcpetion() {
+		Mockito.doReturn(access).when(env).access();
+		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LATITUDE,null);
+		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LONGITUDE,null);
+		Mockito.doReturn("20").when(access).getProperty(Config.AAF_LOCATOR_CONTAINER,"");
+		try {
+			DirectAAFLocator aafLocatorObj=new DirectAAFLocator(env, ldao,"test","test");
+		} catch (LocatorException e) {
+//			System.out.println(e.getMessage());
+			assertEquals("Invalid Version String: test", e.getMessage());
+		}
+		try {
+			DirectAAFLocator aafLocatorObj=new DirectAAFLocator(env, ldao,"test","20.test");
+		} catch (LocatorException e) {
+//			System.out.println(e.getMessage());
+			assertEquals("Invalid Version String: 20.test", e.getMessage());
+		}try {
+			DirectAAFLocator aafLocatorObj=new DirectAAFLocator(env, ldao,"test","20.20.test");
+		} catch (LocatorException e) {
+//			System.out.println(e.getMessage());
+			assertEquals("Invalid Version String: 20.20.test", e.getMessage());
+		}try {
+			DirectAAFLocator aafLocatorObj=new DirectAAFLocator(env, ldao,"test","20.20.20.test");
+		} catch (LocatorException e) {
+//			System.out.println(e.getMessage());
+			assertEquals("Invalid Version String: 20.20.20.test", e.getMessage());
+		}
+	}
+	
+	@Test
+	public void testConstructorExcpetion() {
+		Mockito.doReturn(access).when(env).access();
+		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LATITUDE,null);
+		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LONGITUDE,null);
+		Mockito.doReturn("20").when(access).getProperty(Config.AAF_LOCATOR_CONTAINER,"");
+		Mockito.doReturn("20").when(access).getProperty(Config.AAF_LOCATOR_APP_NS,"AAF_NS");
+		try {
+			DirectAAFLocator aafLocatorObj=new DirectAAFLocator(env, ldao,"test",null);
+		} catch (LocatorException e) {
+//			System.out.println(e.getMessage());
+		}
+	}
+	
 	// NOTE: These mocks to not well represent the DirectAAFLocator Class.
 	@Test
 	public void testConstructorUriExcpetion() {
-		Assert.assertTrue(true);
+		Mockito.doReturn(access).when(env).access();
+		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LATITUDE,null);
+		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LONGITUDE,null);
+		Mockito.doReturn("20").when(access).getProperty(Config.AAF_LOCATOR_CONTAINER,"");
+		Mockito.doReturn("20 30").when(access).getProperty(Config.AAF_URL,null);
+		try {
+			DirectAAFLocator aafLocatorObj=new DirectAAFLocator(env, ldao,"test","192.0.0.1");
+		} catch (LocatorException e) {
+//			System.out.println(e.getMessage());
+			assertTrue(e.getMessage().contains("Illegal character in path at index 2:"));
+		}
 	}
 
-//		PropAccess access = Mockito.mock(PropAccess.class);
-//		Mockito.doReturn(access).when(env).access();
-//		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LATITUDE,null);
-//		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LONGITUDE,null);
-//		try {
-//			DirectAAFLocator aafLocatorObj=new DirectAAFLocator(env, ldao," test","3.2");
-//		} catch (LocatorException e) {
-////			System.out.println(e.getMessage());
-//			assertTrue(e.getMessage().contains("Illegal character in path at index"));
-//		}
-//	}
-//	@Test
-//	public void testRefresh() {
-//		
-//		DirectAAFLocator aafLocatorObj=null;
-//		PropAccess access = Mockito.mock(PropAccess.class);
-//		Mockito.doReturn(access).when(env).access();
-//		Mockito.doReturn(trans).when(env).newTransNoAvg();
-//		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LATITUDE,null);
-//		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LONGITUDE,null);
-//		try {
-//			aafLocatorObj = new DirectAAFLocator(env, ldao,"test","30.20.30.30");
-//		} catch (LocatorException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-//		Result<List<Data>> retVal1 = new Result<List<Data>>(null,0,"",new String[0]);
-//		
-//		Data data= new Data();
-//		data.major=30;
-//		data.minor=30;
-//		data.patch=30;
-//		data.pkg=30;
-//		retVal1.value = new ArrayList<Data>();
-//		retVal1.value.add(data);
-//		
-//		Mockito.doReturn(retVal1).when(ldao).readByName(trans,"test");
-//		boolean retVal = aafLocatorObj.refresh();
-////		System.out.println(retVal);
-//		assertTrue(retVal);
-//	}	
-//	
-//	@Test
-//	public void testRefreshNOK() {
-//		
-//		DirectAAFLocator aafLocatorObj=null;
-//		PropAccess access = Mockito.mock(PropAccess.class);
-//		Mockito.doReturn(access).when(env).access();
-//		Mockito.doReturn(trans).when(env).newTransNoAvg();
-//		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LATITUDE,null);
-//		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LONGITUDE,null);
-//		try {
-//			aafLocatorObj = new DirectAAFLocator(env, ldao,"test","30.20.30.30");
-//		} catch (LocatorException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-//		Result<List<Data>> retVal1 = new Result<List<Data>>(null,1,"",new String[0]);
-//		
-//		Mockito.doReturn(retVal1).when(ldao).readByName(trans,"test");
-//		boolean retVal = aafLocatorObj.refresh();
-////		System.out.println(retVal);
-//		assertFalse(retVal);
-//	}	
-//	
+
+	@Test
+	public void testRefresh() {
+		
+		DirectAAFLocator aafLocatorObj=null;
+		PropAccess access = Mockito.mock(PropAccess.class);
+		Mockito.doReturn(access).when(env).access();
+		Mockito.doReturn(trans).when(env).newTransNoAvg();
+		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LATITUDE,null);
+		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LONGITUDE,null);
+		Mockito.doReturn("20").when(access).getProperty(Config.AAF_LOCATOR_CONTAINER,"");
+		Mockito.doReturn("http://aafurl.com").when(access).getProperty(Config.AAF_URL,null);
+		try {
+			aafLocatorObj = new DirectAAFLocator(env, ldao,"test","30.20.30.30");
+		} catch (LocatorException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		Result<List<Data>> retVal1 = new Result<List<Data>>(null,0,"",new Object[0]);
+		
+		Data data= new Data();
+		data.major=30;
+		data.minor=30;
+		data.patch=30;
+		data.pkg=30;
+		retVal1.value = new ArrayList<Data>();
+		retVal1.value.add(data);
+		
+		Mockito.doReturn(retVal1).when(ldao).readByName(trans,"test");
+		boolean retVal = aafLocatorObj.refresh();
+//		System.out.println(retVal);
+		assertTrue(retVal);
+	}	
+	
+	@Test
+	public void testRefreshNOK() {
+		
+		DirectAAFLocator aafLocatorObj=null;
+		PropAccess access = Mockito.mock(PropAccess.class);
+		Mockito.doReturn(access).when(env).access();
+		Mockito.doReturn(trans).when(env).newTransNoAvg();
+		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LATITUDE,null);
+		Mockito.doReturn("20").when(access).getProperty(Config.CADI_LONGITUDE,null);
+		Mockito.doReturn("20").when(access).getProperty(Config.AAF_LOCATOR_CONTAINER,"");
+		Mockito.doReturn("http://aafurl.com").when(access).getProperty(Config.AAF_URL,null);
+		try {
+			aafLocatorObj = new DirectAAFLocator(env, ldao,"test","30.20.30.30");
+		} catch (LocatorException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		Result<List<Data>> retVal1 = new Result<List<Data>>(null,1,"",new String[0]);
+		
+		Mockito.doReturn(retVal1).when(ldao).readByName(trans,"test");
+		boolean retVal = aafLocatorObj.refresh();
+//		System.out.println(retVal);
+		assertFalse(retVal);
+	}	
+	
 }
\ No newline at end of file