Change API Version to 2.1.15

[aaf/authz.git] / auth / auth-cass / src / test / java / org / onap / aaf / auth / direct / test / JU_DirectAAFLocator.java

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 cf85058..f6d2a59 100644 (file)
--- 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
@@ -45,6 +45,8 @@ import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.cadi.config.Config;
 
+import junit.framework.Assert;
+
 
 @RunWith(MockitoJUnitRunner.class) 
 public class JU_DirectAAFLocator {
@@ -59,7 +61,7 @@ public class JU_DirectAAFLocator {
        AuthzTrans trans;
        
        @Mock
-       Access access;
+       PropAccess access;
        
        @Before
        public void setUp() throws Exception {
@@ -67,34 +69,68 @@ public class JU_DirectAAFLocator {
        }
        
        @Test
-       public void testConstructorExcpetion() {
-
-               PropAccess access = Mockito.mock(PropAccess.class);
+       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("").when(access).getProperty(Config.AAF_LOCATOR_CONTAINER,"");
+               Mockito.doReturn("").when(access).getProperty(Config.AAF_LOCATOR_CONTAINER_NS,"");
+               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() {
-
-               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);
+               Mockito.doReturn("").when(access).getProperty(Config.AAF_LOCATOR_CONTAINER,"");
+               Mockito.doReturn("").when(access).getProperty(Config.AAF_LOCATOR_CONTAINER_NS,"");
+               Mockito.doReturn("20 30").when(access).getProperty(Config.AAF_URL,null);
                try {
-                       DirectAAFLocator aafLocatorObj=new DirectAAFLocator(env, ldao," test","3.2");
+                       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"));
+                       assertTrue(e.getMessage().contains("Illegal character in path at index 2:"));
                }
        }
+
+
        @Test
        public void testRefresh() {
                
@@ -104,13 +140,16 @@ public class JU_DirectAAFLocator {
                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("").when(access).getProperty(Config.AAF_LOCATOR_CONTAINER,"");
+               Mockito.doReturn("").when(access).getProperty(Config.AAF_LOCATOR_CONTAINER_NS,"");
+               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 String[0]);
+               Result<List<Data>> retVal1 = new Result<List<Data>>(null,0,"",new Object[0]);
                
                Data data= new Data();
                data.major=30;
@@ -135,6 +174,9 @@ public class JU_DirectAAFLocator {
                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("").when(access).getProperty(Config.AAF_LOCATOR_CONTAINER,"");
+               Mockito.doReturn("").when(access).getProperty(Config.AAF_LOCATOR_CONTAINER_NS,"");
+               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) {