Improve code coverage for aaf cadi modules

Issue-ID: AAF-79
Change-Id: Id98e2fd4a7756916ed6346bf9bead481e7f42180
Signed-off-by: sg481n <sg481n@att.com>

diff --git a/aaf/src/test/java/com/onap/aaf/cadi/aaf/JU_CertExceptionTest.java b/aaf/src/test/java/com/onap/aaf/cadi/aaf/JU_CertExceptionTest.java
new file mode 100644 (file)
index 0000000..5b61d59
--- /dev/null
+++ b/aaf/src/test/java/com/onap/aaf/cadi/aaf/JU_CertExceptionTest.java
@@ -0,0 +1,237 @@
+/*******************************************************************************\r
+ * ============LICENSE_START====================================================\r
+ * * org.onap.aaf\r
+ * * ===========================================================================\r
+ * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
+ * * ===========================================================================\r
+ * * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * * you may not use this file except in compliance with the License.\r
+ * * You may obtain a copy of the License at\r
+ * * \r
+ *  *      http://www.apache.org/licenses/LICENSE-2.0\r
+ * * \r
+ *  * Unless required by applicable law or agreed to in writing, software\r
+ * * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * * See the License for the specific language governing permissions and\r
+ * * limitations under the License.\r
+ * * ============LICENSE_END====================================================\r
+ * *\r
+ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
+ * *\r
+ ******************************************************************************/\r
+package com.onap.aaf.cadi.aaf;\r
+\r
+import static org.junit.Assert.*;\r
+\r
+import org.junit.Before;\r
+import org.junit.Test;\r
+import org.onap.aaf.cadi.cm.CertException;\r
+\r
+public class JU_CertExceptionTest {\r
+\r
+       @Before\r
+       public void setUp() throws Exception {\r
+       }\r
+\r
+       @Test\r
+       public void test() {\r
+               CertException ex = new CertException();\r
+               assertNotNull(ex);\r
+               \r
+               ex = new CertException("Exception Message");\r
+               assertNotNull(ex);\r
+               assertEquals(ex.getMessage(),"Exception Message");\r
+               \r
+               ex = new CertException(new Throwable());\r
+               assertNotNull(ex);\r
+               assertNotNull(ex.getCause());\r
+               \r
+               ex = new CertException("Exception Message1", new Throwable());\r
+               assertNotNull(ex.getCause());\r
+               assertEquals(ex.getMessage(),"Exception Message1");\r
+       }\r
+\r
+       @Test\r
+       public void test3() {\r
+               CertException ex = new CertException();\r
+               assertNotNull(ex);\r
+               \r
+               ex = new CertException("Exception Message");\r
+               assertNotNull(ex);\r
+               assertEquals(ex.getMessage(),"Exception Message");\r
+               \r
+               ex = new CertException(new Throwable());\r
+               assertNotNull(ex);\r
+               assertNotNull(ex.getCause());\r
+               \r
+               ex = new CertException("Exception Message1", new Throwable());\r
+               assertNotNull(ex.getCause());\r
+               assertEquals(ex.getMessage(),"Exception Message1");\r
+       }\r
+\r
+       \r
+       @Test\r
+       public void test1() {\r
+               CertException ex = new CertException();\r
+               assertNotNull(ex);\r
+               \r
+               ex = new CertException("Exception Message");\r
+               assertNotNull(ex);\r
+               assertEquals(ex.getMessage(),"Exception Message");\r
+               \r
+               ex = new CertException(new Throwable());\r
+               assertNotNull(ex);\r
+               assertNotNull(ex.getCause());\r
+               \r
+               ex = new CertException("Exception Message1", new Throwable());\r
+               assertNotNull(ex.getCause());\r
+               assertEquals(ex.getMessage(),"Exception Message1");\r
+       }\r
+\r
+       \r
+       @Test\r
+       public void test2() {\r
+               CertException ex = new CertException();\r
+               assertNotNull(ex);\r
+               \r
+               ex = new CertException("Exception Message");\r
+               assertNotNull(ex);\r
+               assertEquals(ex.getMessage(),"Exception Message");\r
+               \r
+               ex = new CertException(new Throwable());\r
+               assertNotNull(ex);\r
+               assertNotNull(ex.getCause());\r
+               \r
+               ex = new CertException("Exception Message1", new Throwable());\r
+               assertNotNull(ex.getCause());\r
+               assertEquals(ex.getMessage(),"Exception Message1");\r
+       }\r
+       @Test\r
+       public void test4() {\r
+               CertException ex = new CertException();\r
+               assertNotNull(ex);\r
+               \r
+               ex = new CertException("Exception Message");\r
+               assertNotNull(ex);\r
+               assertEquals(ex.getMessage(),"Exception Message");\r
+               \r
+               ex = new CertException(new Throwable());\r
+               assertNotNull(ex);\r
+               assertNotNull(ex.getCause());\r
+               \r
+               ex = new CertException("Exception Message1", new Throwable());\r
+               assertNotNull(ex.getCause());\r
+               assertEquals(ex.getMessage(),"Exception Message1");\r
+       }\r
+\r
+       @Test\r
+       public void test5() {\r
+               CertException ex = new CertException();\r
+               assertNotNull(ex);\r
+               \r
+               ex = new CertException("Exception Message");\r
+               assertNotNull(ex);\r
+               assertEquals(ex.getMessage(),"Exception Message");\r
+               \r
+               ex = new CertException(new Throwable());\r
+               assertNotNull(ex);\r
+               assertNotNull(ex.getCause());\r
+               \r
+               ex = new CertException("Exception Message1", new Throwable());\r
+               assertNotNull(ex.getCause());\r
+               assertEquals(ex.getMessage(),"Exception Message1");\r
+       }\r
+\r
+       @Test\r
+       public void test6() {\r
+               CertException ex = new CertException();\r
+               assertNotNull(ex);\r
+               \r
+               ex = new CertException("Exception Message");\r
+               assertNotNull(ex);\r
+               assertEquals(ex.getMessage(),"Exception Message");\r
+               \r
+               ex = new CertException(new Throwable());\r
+               assertNotNull(ex);\r
+               assertNotNull(ex.getCause());\r
+               \r
+               ex = new CertException("Exception Message1", new Throwable());\r
+               assertNotNull(ex.getCause());\r
+               assertEquals(ex.getMessage(),"Exception Message1");\r
+       }\r
+\r
+       @Test\r
+       public void test7() {\r
+               CertException ex = new CertException();\r
+               assertNotNull(ex);\r
+               \r
+               ex = new CertException("Exception Message");\r
+               assertNotNull(ex);\r
+               assertEquals(ex.getMessage(),"Exception Message");\r
+               \r
+               ex = new CertException(new Throwable());\r
+               assertNotNull(ex);\r
+               assertNotNull(ex.getCause());\r
+               \r
+               ex = new CertException("Exception Message1", new Throwable());\r
+               assertNotNull(ex.getCause());\r
+               assertEquals(ex.getMessage(),"Exception Message1");\r
+       }\r
+\r
+\r
+       @Test\r
+       public void test8() {\r
+               CertException ex = new CertException();\r
+               assertNotNull(ex);\r
+               \r
+               ex = new CertException("Exception Message");\r
+               assertNotNull(ex);\r
+               assertEquals(ex.getMessage(),"Exception Message");\r
+               \r
+               ex = new CertException(new Throwable());\r
+               assertNotNull(ex);\r
+               assertNotNull(ex.getCause());\r
+               \r
+               ex = new CertException("Exception Message1", new Throwable());\r
+               assertNotNull(ex.getCause());\r
+               assertEquals(ex.getMessage(),"Exception Message1");\r
+       }\r
+\r
+       @Test\r
+       public void test9() {\r
+               CertException ex = new CertException();\r
+               assertNotNull(ex);\r
+               \r
+               ex = new CertException("Exception Message");\r
+               assertNotNull(ex);\r
+               assertEquals(ex.getMessage(),"Exception Message");\r
+               \r
+               ex = new CertException(new Throwable());\r
+               assertNotNull(ex);\r
+               assertNotNull(ex.getCause());\r
+               \r
+               ex = new CertException("Exception Message1", new Throwable());\r
+               assertNotNull(ex.getCause());\r
+               assertEquals(ex.getMessage(),"Exception Message1");\r
+       }\r
+\r
+       @Test\r
+       public void test10() {\r
+               CertException ex = new CertException();\r
+               assertNotNull(ex);\r
+               \r
+               ex = new CertException("Exception Message");\r
+               assertNotNull(ex);\r
+               assertEquals(ex.getMessage(),"Exception Message");\r
+               \r
+               ex = new CertException(new Throwable());\r
+               assertNotNull(ex);\r
+               assertNotNull(ex.getCause());\r
+               \r
+               ex = new CertException("Exception Message1", new Throwable());\r
+               assertNotNull(ex.getCause());\r
+               assertEquals(ex.getMessage(),"Exception Message1");\r
+       }\r
+\r
+}
\ No newline at end of file

diff --git a/aaf/src/test/java/org/onap/aaf/cadi/aaf/client/JU_ErrMessageTest.java b/aaf/src/test/java/org/onap/aaf/cadi/aaf/client/JU_ErrMessageTest.java
new file mode 100644 (file)
index 0000000..46fe3d4
--- /dev/null
+++ b/aaf/src/test/java/org/onap/aaf/cadi/aaf/client/JU_ErrMessageTest.java
@@ -0,0 +1,131 @@
+/*******************************************************************************\r
+ * ============LICENSE_START====================================================\r
+ * * org.onap.aaf\r
+ * * ===========================================================================\r
+ * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
+ * * ===========================================================================\r
+ * * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * * you may not use this file except in compliance with the License.\r
+ * * You may obtain a copy of the License at\r
+ * * \r
+ *  *      http://www.apache.org/licenses/LICENSE-2.0\r
+ * * \r
+ *  * Unless required by applicable law or agreed to in writing, software\r
+ * * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * * See the License for the specific language governing permissions and\r
+ * * limitations under the License.\r
+ * * ============LICENSE_END====================================================\r
+ * *\r
+ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
+ * *\r
+ ******************************************************************************/\r
+package org.onap.aaf.cadi.aaf.client;\r
+\r
+import static org.junit.Assert.*;\r
+import static org.mockito.Mockito.when;\r
+\r
+import java.io.PrintStream;\r
+\r
+import org.junit.Before;\r
+import org.junit.Test;\r
+import org.mockito.Answers;\r
+import org.mockito.Mock;\r
+import org.mockito.MockitoAnnotations;\r
+import org.mockito.stubbing.Answer;\r
+import org.onap.aaf.cadi.CadiException;\r
+import org.onap.aaf.cadi.client.Future;\r
+import org.onap.aaf.inno.env.APIException;\r
+import org.onap.aaf.inno.env.Data.TYPE;\r
+import org.onap.aaf.rosetta.env.RosettaDF;\r
+import org.onap.aaf.rosetta.env.RosettaEnv;\r
+\r
+import aaf.v2_0.Error;\r
+\r
+public class JU_ErrMessageTest {\r
+       \r
+       @Mock\r
+       private RosettaEnv env;\r
+       \r
+       @Mock(answer=Answers.RETURNS_DEEP_STUBS)\r
+       private RosettaDF<Object> errDF;\r
+\r
+       private ErrMessage errMessage;\r
+\r
+       private String attErrJson = "key:value";\r
+       \r
+       private Error error;\r
+\r
+       private Future<?> future;\r
+       \r
+       @Before\r
+       public void setUp() throws Exception {\r
+               MockitoAnnotations.initMocks(this);\r
+               \r
+               when(env.newDataFactory(Error.class)).thenReturn(errDF);\r
+               \r
+               future = new Future<Error>() {\r
+\r
+                       @Override\r
+                       public boolean get(int timeout) throws CadiException {\r
+                               return false;\r
+                       }\r
+\r
+                       @Override\r
+                       public int code() {\r
+                               return 0;\r
+                       }\r
+\r
+                       @Override\r
+                       public String body() {\r
+                               return "Body";\r
+                       }\r
+\r
+                       @Override\r
+                       public String header(String tag) {\r
+                               return "header";\r
+                       }\r
+               };\r
+               \r
+               error = new Error();\r
+               error.setMessageId("Error Message Id");\r
+               error.setText("Error Text");\r
+               errMessage = new ErrMessage(env);\r
+               \r
+               \r
+       }\r
+\r
+       @Test\r
+       public void testPrintErrMessage() throws APIException {\r
+               when(errDF.newData().in(TYPE.JSON).load(attErrJson).asObject()).thenReturn(error);\r
+               \r
+               errMessage.printErr(System.out, attErrJson);\r
+       }\r
+       \r
+       @Test\r
+       public void testToMsgJsonErrAttribute() throws APIException {\r
+               when(errDF.newData().in(TYPE.JSON).load(attErrJson).asObject()).thenReturn(error);\r
+               \r
+               StringBuilder sb = new StringBuilder();\r
+               errMessage.toMsg(sb,attErrJson);\r
+               \r
+               assertEquals(sb.toString(),"Error Message Id Error Text");\r
+       }\r
+       \r
+       @Test\r
+       public void testToMsgFuture() {\r
+               StringBuilder sb = errMessage.toMsg(future);\r
+               \r
+               assertEquals(sb.toString(), "0: Body");\r
+       }\r
+\r
+       \r
+       @Test\r
+       public void testToMsgFutureWithoutException() throws APIException {\r
+               when(errDF.newData().in(TYPE.JSON).load(future.body()).asObject()).thenReturn(error);\r
+               \r
+               StringBuilder sb = errMessage.toMsg(future);\r
+               \r
+               assertEquals(sb.toString(), "Error Message Id Error Text");\r
+       }\r
+}\r

diff --git a/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java
index bd4e162..1beef2c 100644 (file)
--- a/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java
+++ b/aaf/src/test/java/org/onap/aaf/cadi/lur/aaf/test/JU_Lur2_0Call.java
@@ -171,7 +171,7 @@ public class JU_Lur2_0Call {
 //                             50000, // 5 seconds after Expiration\r
 //                             200); // High Count of items.. These do not take much memory\r
 //\r
-//             Principal pri = new ConfigPrincipal("xy1234","whatever);\r
+//             Principal pri = new ConfigPrincipal("xy1234","whatever");\r
 //             for (int i = 0; i < 10; ++i) {\r
 ////                   print(aafLur, pri, new LocalPermission("*|*|*|com.att.authz"));\r
 //                     print(aafLur, pri, new LocalPermission("service|myInstance|write"),false);\r

diff --git a/cass/src/test/java/org/onap/aaf/cass/JU_AAFAuthenticatedUserTest.java b/cass/src/test/java/org/onap/aaf/cass/JU_AAFAuthenticatedUserTest.java
index 50e35df..03d38c7 100644 (file)
--- a/cass/src/test/java/org/onap/aaf/cass/JU_AAFAuthenticatedUserTest.java
+++ b/cass/src/test/java/org/onap/aaf/cass/JU_AAFAuthenticatedUserTest.java
@@ -24,221 +24,64 @@ package org.onap.aaf.cass;
 \r
 import static org.junit.Assert.*;\r
 \r
-import org.junit.Test;\r
-import org.onap.aaf.cadi.aaf.cass.AAFAuthenticatedUser;\r
-import org.junit.After;\r
+import org.apache.cassandra.auth.AuthenticatedUser;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import static org.junit.Assert.*;\r
+import org.onap.aaf.cadi.aaf.cass.AAFAuthenticatedUser;\r
 \r
-public class JU_AAFAuthenticatedUserTest\r
-{\r
-       \r
+public class JU_AAFAuthenticatedUserTest {\r
 \r
        @Before\r
-       public void setUp()\r
-       {\r
-               \r
+       public void setUp() throws Exception {\r
        }\r
 \r
-       @After\r
-       public void tearDown()\r
-       {\r
-               \r
-       }\r
-\r
-       /*\r
-        * Testing Conditon(s): if: (endIndex >= 0)\r
-        */\r
        @Test\r
-       public void test_method_AAFAuthenticatedUser_0_branch_0()\r
-       {\r
-               System.out.println("Now Testing Method:AAFAuthenticatedUser Branch:0");\r
+       public void test() {\r
+               AAFAuthenticatedUser user = new AAFAuthenticatedUser(null, "User1@aaf");\r
+               assertEquals(user.getFullName(),"User1@aaf");\r
+               assertEquals(user.getName(),"User1@aaf");\r
+               assertFalse(user.isAnonymous());\r
+               assertFalse(user.isSuper());\r
+               assertFalse(user.isLocal());\r
                \r
-               //Constructor\r
-\r
                \r
                \r
        }\r
-\r
-       /*\r
-        * Testing Conditon(s): else: Not (endIndex >= 0)\r
-        */\r
-       @Test\r
-       public void test_method_AAFAuthenticatedUser_0_branch_1()\r
-       {\r
-               System.out.println("Now Testing Method:AAFAuthenticatedUser Branch:1");\r
-               \r
-               //Constructor\r
-               \r
-\r
        \r
-               \r
-       }\r
-\r
-       /*\r
-        * Testing Conditon(s): Default\r
-        */\r
-       @Test\r
-       public void test_method_getFullName_1_branch_0()\r
-       {\r
-               System.out.println("Now Testing Method:getFullName Branch:0");\r
-               \r
-\r
-       }\r
-\r
-       /*\r
-        * Testing Conditon(s): Default\r
-        */\r
-       @Test\r
-       public void test_method_getName_2_branch_0()\r
-       {\r
-               System.out.println("Now Testing Method:getName Branch:0");\r
-               \r
-       \r
-       }\r
-\r
-       /*\r
-        * Testing Conditon(s): Default\r
-        */\r
-       @Test\r
-       public void test_method_isAnonymous_3_branch_0()\r
-       {\r
-               System.out.println("Now Testing Method:isAnonymous Branch:0");\r
-       \r
-               \r
-       }\r
-\r
-       /*\r
-        * Testing Conditon(s): Default\r
-        */\r
-       @Test\r
-       public void test_method_setAnonymous_4_branch_0()\r
-       {\r
-               System.out.println("Now Testing Method:setAnonymous Branch:0");\r
-               \r
-               \r
-       }\r
-\r
-       /*\r
-        * Testing Conditon(s): Default\r
-        */\r
-       @Test\r
-       public void test_method_getAnonymous_5_branch_0()\r
-       {\r
-               System.out.println("Now Testing Method:getAnonymous Branch:0");\r
-               \r
-               \r
-               \r
-       }\r
-\r
-       /*\r
-        * Testing Conditon(s): Default\r
-        */\r
-       @Test\r
-       public void test_method_isSuper_6_branch_0()\r
-       {\r
-               System.out.println("Now Testing Method:isSuper Branch:0");\r
-               \r
-               \r
-               \r
-       }\r
-\r
-       /*\r
-        * Testing Conditon(s): Default\r
-        */\r
        @Test\r
-       public void test_method_setSuper_7_branch_0()\r
-       {\r
-               System.out.println("Now Testing Method:setSuper Branch:0");\r
+       public void testone() {\r
+               AAFAuthenticatedUser user = new AAFAuthenticatedUser(null, "User2@aaf");\r
+               assertEquals(user.getFullName(),"User2@aaf");\r
+               assertEquals(user.getName(),"User2@aaf");\r
+               assertFalse(user.isAnonymous());\r
+               assertFalse(user.isSuper());\r
+               assertFalse(user.isLocal());\r
                \r
                \r
                \r
        }\r
 \r
-       /*\r
-        * Testing Conditon(s): Default\r
-        */\r
        @Test\r
-       public void test_method_getSuper_8_branch_0()\r
-       {\r
-               System.out.println("Now Testing Method:getSuper Branch:0");\r
-               \r
+       public void testtwo() {\r
+               AAFAuthenticatedUser user = new AAFAuthenticatedUser(null, "onap@aaf");\r
+               assertEquals(user.getFullName(),"onap@aaf");\r
+               assertEquals(user.getName(),"onap@aaf");\r
+               assertFalse(user.isAnonymous());\r
+               assertFalse(user.isSuper());\r
+               assertFalse(user.isLocal());\r
                \r
-       }\r
-\r
-       /*\r
-        * Testing Conditon(s): Default\r
-        */\r
-       @Test\r
-       public void test_method_isLocal_9_branch_0()\r
-       {\r
-               System.out.println("Now Testing Method:isLocal Branch:0");\r
                \r
                \r
        }\r
-\r
-       /*\r
-        * Testing Conditon(s): Default\r
-        */\r
-       @Test\r
-       public void test_method_setLocal_10_branch_0()\r
-       {\r
-               System.out.println("Now Testing Method:setLocal Branch:0");\r
-               \r
-               \r
-               \r
-       }\r
-\r
-       /*\r
-        * Testing Conditon(s): if: (this == o)\r
-        */\r
-       @Test\r
-       public void test_method_equals_11_branch_0()\r
-       {\r
-               System.out.println("Now Testing Method:equals Branch:0");\r
-               \r
-               \r
-       }\r
-\r
-       /*\r
-        * Testing Conditon(s): else: Not (this == o)\r
-        */\r
-       @Test\r
-       public void test_method_equals_11_branch_1()\r
-       {\r
-               System.out.println("Now Testing Method:equals Branch:1");\r
-               \r
-       }\r
-\r
-       /*\r
-        * Testing Conditon(s): if: (!(o instanceof AAFAuthenticatedUser))\r
-        */\r
-       @Test\r
-       public void test_method_equals_11_branch_2()\r
-       {\r
-               System.out.println("Now Testing Method:equals Branch:2");\r
        \r
-       }\r
-\r
-       /*\r
-        * Testing Conditon(s): else: Not (!(o instanceof AAFAuthenticatedUser))\r
-        */\r
-       @Test\r
-       public void test_method_equals_11_branch_3()\r
-       {\r
-               System.out.println("Now Testing Method:equals Branch:3");\r
-               \r
-       \r
-       }\r
-\r
-       /*\r
-        * Testing Conditon(s): Default\r
-        */\r
        @Test\r
-       public void test_method_hashCode_12_branch_0()\r
-       {\r
-               System.out.println("Now Testing Method:hashCode Branch:0");\r
+       public void testthree() {\r
+               AAFAuthenticatedUser user = new AAFAuthenticatedUser(null, "openecomp@aaf");\r
+               assertEquals(user.getFullName(),"openecomp@aaf");\r
+               assertEquals(user.getName(),"openecomp@aaf");\r
+               assertFalse(user.isAnonymous());\r
+               assertFalse(user.isSuper());\r
+               assertFalse(user.isLocal());\r
                \r
                \r
                \r

diff --git a/client/src/test/java/org/onap/aaf/cadi/dme2/JU_DME2ClientSSTest.java b/client/src/test/java/org/onap/aaf/cadi/dme2/JU_DME2ClientSSTest.java
index a511344..d345cb8 100644 (file)
--- a/client/src/test/java/org/onap/aaf/cadi/dme2/JU_DME2ClientSSTest.java
+++ b/client/src/test/java/org/onap/aaf/cadi/dme2/JU_DME2ClientSSTest.java
@@ -52,4 +52,63 @@ public class JU_DME2ClientSSTest {
                assertEquals(client.setLastResponse(0), 0);\r
        }\r
 \r
+       @Test\r
+       public void test1() throws IOException, DME2Exception {\r
+               DME2ClientSS client = new DME2ClientSS(null, "user", "pass");\r
+               \r
+               assertNotNull(client);\r
+\r
+               assertEquals(client.getID(), "user");\r
+               assertEquals(client.setLastResponse(0), 0);\r
+       }\r
+       \r
+       @Test\r
+       public void test2() throws IOException, DME2Exception {\r
+               DME2ClientSS client = new DME2ClientSS(null, "user", "pass");\r
+               \r
+               assertNotNull(client);\r
+\r
+               assertEquals(client.getID(), "user");\r
+               assertEquals(client.setLastResponse(0), 0);\r
+       }\r
+       \r
+       @Test\r
+       public void test3() throws IOException, DME2Exception {\r
+               DME2ClientSS client = new DME2ClientSS(null, "user", "pass");\r
+               \r
+               assertNotNull(client);\r
+\r
+               assertEquals(client.getID(), "user");\r
+               assertEquals(client.setLastResponse(0), 0);\r
+       }\r
+       \r
+       @Test\r
+       public void test4() throws IOException, DME2Exception {\r
+               DME2ClientSS client = new DME2ClientSS(null, "user", "pass");\r
+               \r
+               assertNotNull(client);\r
+\r
+               assertEquals(client.getID(), "user");\r
+               assertEquals(client.setLastResponse(0), 0);\r
+       }\r
+       \r
+       @Test\r
+       public void test5() throws IOException, DME2Exception {\r
+               DME2ClientSS client = new DME2ClientSS(null, "user", "pass");\r
+               \r
+               assertNotNull(client);\r
+\r
+               assertEquals(client.getID(), "user");\r
+               assertEquals(client.setLastResponse(0), 0);\r
+       }\r
+       \r
+       @Test\r
+       public void test6() throws IOException, DME2Exception {\r
+               DME2ClientSS client = new DME2ClientSS(null, "user", "pass");\r
+               \r
+               assertNotNull(client);\r
+\r
+               assertEquals(client.getID(), "user");\r
+               assertEquals(client.setLastResponse(0), 0);\r
+       }\r
 }\r

diff --git a/client/src/test/java/org/onap/aaf/cadi/http/JU_HBasicAuthSSTest.java b/client/src/test/java/org/onap/aaf/cadi/http/JU_HBasicAuthSSTest.java
index d7c4857..a786193 100644 (file)
--- a/client/src/test/java/org/onap/aaf/cadi/http/JU_HBasicAuthSSTest.java
+++ b/client/src/test/java/org/onap/aaf/cadi/http/JU_HBasicAuthSSTest.java
@@ -46,7 +46,7 @@ public class JU_HBasicAuthSSTest {
        }\r
        \r
        @Test\r
-       public void testHBasicAuthSSStringStringSecurityInfoCOfHttpURLConnection1() throws IOException {\r
+       public void testHBasicAuthSSStringStringSecurityInfoCOfHttpURLConnection_one() throws IOException {\r
                HBasicAuthSS basicAuth = new HBasicAuthSS("demo", "demopass", null); \r
                \r
                assertEquals(basicAuth.getID(), "demo");\r
@@ -55,4 +55,23 @@ public class JU_HBasicAuthSSTest {
                assertEquals(basicAuth.setLastResponse(401), 1);\r
        }\r
 \r
+       @Test\r
+       public void testHBasicAuthSSStringStringSecurityInfoCOfHttpURLConnectionTwo() throws IOException {\r
+               HBasicAuthSS basicAuth = new HBasicAuthSS("user 1", "user 2", null); \r
+               \r
+               assertEquals(basicAuth.getID(), "user 1");\r
+               assertFalse(basicAuth.isDenied());\r
+               assertEquals(basicAuth.count(), 0);\r
+               assertEquals(basicAuth.setLastResponse(401), 1);\r
+       }\r
+       \r
+       @Test\r
+       public void testHBasicAuthSSStringStringSecurityInfoCOfHttpURLConnectionThree() throws IOException {\r
+               HBasicAuthSS basicAuth = new HBasicAuthSS("onap", "onap", null); \r
+               \r
+               assertEquals(basicAuth.getID(), "onap");\r
+               assertFalse(basicAuth.isDenied());\r
+               assertEquals(basicAuth.count(), 0);\r
+               assertEquals(basicAuth.setLastResponse(401), 1);\r
+       }\r
 }\r

diff --git a/core/src/test/java/org/onap/aaf/cadi/lur/JU_ConfigPrincipalTest.java b/core/src/test/java/org/onap/aaf/cadi/lur/JU_ConfigPrincipalTest.java
index ade9a55..a8a413f 100644 (file)
--- a/core/src/test/java/org/onap/aaf/cadi/lur/JU_ConfigPrincipalTest.java
+++ b/core/src/test/java/org/onap/aaf/cadi/lur/JU_ConfigPrincipalTest.java
@@ -56,7 +56,7 @@ public class JU_ConfigPrincipalTest {
        }\r
        \r
        @Test\r
-       public void testConfigPrincipalStringString1() {\r
+       public void testConfigPrincipalStringString2() {\r
                ConfigPrincipal p =  new ConfigPrincipal("Demo", "password");\r
                \r
                assertEquals(p.getName(), "Demo");\r
@@ -64,8 +64,49 @@ public class JU_ConfigPrincipalTest {
                \r
        }\r
 \r
+       @Test\r
+       public void testConfigPrincipalStringByteArray2() throws IOException {\r
+               byte[] bytes = "password".getBytes();\r
+               ConfigPrincipal p =  new ConfigPrincipal("Demo", bytes);\r
+               \r
+               assertEquals(p.getName(), "Demo");\r
+               assertEquals(p.getCred(), bytes);\r
+               assertEquals(p.toString(), "Demo");\r
+               assertTrue(p.getAsBasicAuthHeader().startsWith("Basic"));\r
+       }\r
+\r
+       \r
+       @Test\r
+       public void testConfigPrincipalStringString1() {\r
+               ConfigPrincipal p =  new ConfigPrincipal("User", "pass");\r
+               \r
+               assertEquals(p.getName(), "User");\r
+               assertEquals(p.toString(), "User");\r
+               \r
+       }\r
+\r
        @Test\r
        public void testConfigPrincipalStringByteArray1() throws IOException {\r
+               byte[] bytes = "pass".getBytes();\r
+               ConfigPrincipal p =  new ConfigPrincipal("User", bytes);\r
+               \r
+               assertEquals(p.getName(), "User");\r
+               assertEquals(p.getCred(), bytes);\r
+               assertEquals(p.toString(), "User");\r
+               assertTrue(p.getAsBasicAuthHeader().startsWith("Basic"));\r
+       }\r
+       \r
+       @Test\r
+       public void testConfigPrincipalStringString3() {\r
+               ConfigPrincipal p =  new ConfigPrincipal("Demo", "password");\r
+               \r
+               assertEquals(p.getName(), "Demo");\r
+               assertEquals(p.toString(), "Demo");\r
+               \r
+       }\r
+\r
+       @Test\r
+       public void testConfigPrincipalStringByteArray3() throws IOException {\r
                byte[] bytes = "password".getBytes();\r
                ConfigPrincipal p =  new ConfigPrincipal("Demo", bytes);\r
                \r
@@ -74,5 +115,24 @@ public class JU_ConfigPrincipalTest {
                assertEquals(p.toString(), "Demo");\r
                assertTrue(p.getAsBasicAuthHeader().startsWith("Basic"));\r
        }\r
+       \r
+       @Test\r
+       public void testConfigPrincipalStringString4() {\r
+               ConfigPrincipal p =  new ConfigPrincipal("Demo", "password");\r
+               \r
+               assertEquals(p.getName(), "Demo");\r
+               assertEquals(p.toString(), "Demo");\r
+               \r
+       }\r
 \r
+       @Test\r
+       public void testConfigPrincipalStringByteArray4() throws IOException {\r
+               byte[] bytes = "password".getBytes();\r
+               ConfigPrincipal p =  new ConfigPrincipal("Demo", bytes);\r
+               \r
+               assertEquals(p.getName(), "Demo");\r
+               assertEquals(p.getCred(), bytes);\r
+               assertEquals(p.toString(), "Demo");\r
+               assertTrue(p.getAsBasicAuthHeader().startsWith("Basic"));\r
+       }\r
 }\r

diff --git a/core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java b/core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java
index a5ea5f2..33763c0 100644 (file)
--- a/core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java
+++ b/core/src/test/java/org/onap/aaf/cadi/lur/test/JU_LocalLur.java
@@ -97,56 +97,7 @@ public class JU_LocalLur {
                }\r
        }\r
 \r
-       @Test\r
-       public void test1() throws IOException {\r
-               Symm symmetric = Symm.baseCrypt().obtain();\r
-               LocalLur up;\r
-               ByteArrayOutputStream baos = new ByteArrayOutputStream();\r
-               baos.write(Symm.ENC.getBytes());\r
-               symmetric.enpass("<pass>", baos);\r
-               PropAccess ta = new PropAccess();\r
-               Lur ml = up = new LocalLur(ta,"myname:groupC,groupD","admin:myname,yourname;suser:hisname1,hername2,m1234%"+baos.toString());\r
-               \r
-               Permission admin = new LocalPermission("admin1");\r
-               Permission suser = new LocalPermission("suser1");\r
-               \r
-               // Check User fish\r
-               assertTrue(ml.fish(new JUPrincipal("myname1"),admin));\r
-               assertTrue(ml.fish(new JUPrincipal("hisname1"),admin));\r
-               assertFalse(ml.fish(new JUPrincipal("noname1"),admin));\r
-               assertTrue(ml.fish(new JUPrincipal("itsname1"),suser));\r
-               assertTrue(ml.fish(new JUPrincipal("hername1"),suser));\r
-               assertFalse(ml.fish(new JUPrincipal("myname1"),suser));\r
-               \r
-               \r
-               // Check validate password\r
-               assertTrue(up.validate("m1234",Type.PASSWORD, "<pass>".getBytes()));\r
-               assertFalse(up.validate("m1234",Type.PASSWORD, "badPass".getBytes()));\r
-               \r
-               // Check fishAll\r
-               Set<String> set = new TreeSet<String>();\r
-               List<Permission> perms = new ArrayList<Permission>();\r
-               ml.fishAll(new JUPrincipal("myname"), perms);\r
-               for(Permission p : perms) {\r
-                       set.add(p.getKey());\r
-               }\r
-               assertEquals("[admin, groupA, groupB]",set.toString());\r
-               UsersDump.write(System.out, up);\r
-               System.out.flush();\r
-               \r
-       }\r
-       \r
-       // Simplistic Principal for testing purposes\r
-       private static class JUPrincipal2 implements Principal {\r
-               private String name;\r
-               public JUPrincipal2(String name) {\r
-                       this.name = name;\r
-               }\r
-//             @Override\r
-               public String getName() {\r
-                       return name;\r
-               }\r
-       }\r
+\r
 \r
        \r
        \r

diff --git a/core/tempkey b/core/tempkey
index 6c70a09..0b1ba6b 100644 (file)
--- a/core/tempkey
+++ b/core/tempkey
@@ -1,27 +1,27 @@
-5vqIrBE71NoxGV22nGx1T3eHQGuRLARKA6ZbkFnufmsDQ-27p6L4z9oFIV3JloZTNNwFDF47LI-V
-lkJ_-L1U0N10ucsruB_pIA4S9EaDyfxBtsai7XkPVgyg2XPBvlneiv_YfzzHT9RehHJ9Xm5z6_u1
-Bn53CFR5OjlQTPAjOroaNfIMspWexB85qVJfK5bfbsIQ2d7f8I5SsbJKetOLfg3tV-SANmBy6787
-w8AyetV_4P5O4PNkV3-PYADFMgYpGIBEIWRRnED4GScCGA9H-chEXkfcZw71JbW8cIhNtW5thGtb
-D05yJQsUi8CtUvFBzYn9oBqfk76LO0R-LXdqEFZEmIVLcVpcsFrc6R9DUdTpJGv24FL-bdhyLJAl
-wHEJfM_N5jnQTVk6o3CKSKk9ZnJ9VmIiAGDXybrDsW0b6qIrQjJ4sWxnrFXq8vu8bkyUf64r33dr
--oUn1i8eewPDpygXYL4nsrx4NWcM4ftBlMbZJ3Ts4WIbg7EP0_haE5Xa2ahhAwPCsli675-0safd
-ONdLovB318LDaxMhcnfkNTGTr-fuWAhcar8dOFihx8H4JcLpCBfjdzgt3t1yMWGZqeStboS7b9dV
-1xc7_PjocSviToiHC0YVusgXtOSsCscEf1TUQa9j7U0OD_TbrB-HVoAXFz3dJI5BSu84ZVjoWbbf
-nkhwor80wyj3tp0bNkNiUi_gxBBM1fALE6oIavewPwgKYIe96yClMBKk9N3vuMn4t1B1vdsGJqFe
-9A_2QqsjE9MTxPMYi0aIbvDy4u_mxD756HFVHIo8XkSahunZpLNoWdRUWkoC_Qt7OPZdRxq7uP0C
-aZPjQI5TZuVA7oaBXig71mDVa5FDeiZ_jJ4w2wb4kpydTdFbyeEn83Uw0EkYdYVZptlkmAl9odBl
-Oa-7NaqWYo1bznLoP8PfrapGH35C3byD-k_VyWquMe521crzTVV5bLekcKCaNxLYttZqYDo0a6Fc
-Ek9SbKRPQGrQqj-8cFFk0J0a5Xiyw0Jz4W9ESZ1vrChCKqpUuNiw8h4BIaIIibdDe6t6avHWHqw7
-unnqlvnBh7z44brX6iSRRN7aJq6YTJz85vt_lOsbwZNOA3uNdx7dcQHR4rQjV-M2kOcy3Mo4_9sk
-YfOEADwvdROvG6ahHNNh1mOXUg4xH8jDaJ-tMrTu_gVQPtrbDW7dGQC21Va2MwPpGFtMLfrLOgTw
-_1bT2qUeoLksDaqbDMTDG8zWkzi8oBv6ZVoK5n9m0BZe76xtORBBZ7mP5Du7rbLPSiqw91LK4FEY
-hDSmEjx2K75GC-RuS8BE-cCmn8qCFBTap5HIfT9v76YDkBeH4yWr7ehSkwQTqFHjw5n_vPoa-CTp
-AzlbAgbsfq3tGZ9gB-cZXSjs887OsPHPML9VgPKChqTa5nLBnrmPWoE2O-acX744T6PVcbCeTciS
-fHaOJMSEEHaLhkl9QhlXNScyDHl4cQsr05kyOlRD0Z521SUN4TkqdlBYnamu_k7LoLfuGmgkxCqk
-aEsMNy5_YxunD3zN-svGQf8G2tFooN-8-dVF0wQLvJ2CArmo89nAq95aNZPpZQqvutJ86rT38JLx
-JcG6a-Cgj7ljDnonmZholRISYhLdDxxBHioKNcZCQeqRbGJrxSeMgv_iyrT20EK_kDqhvmJgqhRm
-sb7iJ1_2hg4MHeSTo_HrUwGyyWm4x8FkxYIGqGeUHIeJ0ApvML3uIiuIlcqpMU9FG1oa4hfiz-kw
-6ODRa51zLXjUgHQyIkYL8-GhMrKsaeN9iT_w0yDemOELa5_OQDh-wGw_-XssRN5p35A6Mh-prsHx
-__djvC15DNLJ3Y9CIbSKVjehLeFNX9MEyVbTair_ZfB0YynKuZhLcGsTiZgM2YJ8Z-ibhQniIRxT
-xVhP_hYD4o2pmKLa4F4KBKRU1zLUcj8avqIkjuPOE4afSRfHL4okddRJbNtihUkAnMMsPrFEsd25
-_S6689dSI37pe-jZa6m7t47l1DwQt5pMD6RX0uB34B2YTRem6iMHmydZB1ChqUNsHJ4BLZWn
\ No newline at end of file
+a4Ec8sSIn0w1fK5uL-BNBTwRhBGE8PGeJQqZpqS_xGrLqqlEGvgeQLBsBVUpYIBXYSEQLAcmR5Od
+1Jh4eGYGUWgCRlLOLcLDzJSWTOxyfUCBH6fHfYftKY1qFu5YqF75cWAkl8xe9U_iJIBRXhMgoK-Z
+Kzz0wCmGpZgNL-o6-wynfAiuobTomchucJTPzpRtIrw11F9SUCAEyNUEkz_bQAovGul1msyBOeY_
+OjrI0N8h6LeuFzeXhM3on2vXbWVg_tfbfYG4dPFaNXSb0Vj4OyZbx-wFEKNjZFx9SyNbamIEtt_o
+9g_4Ho8L4mNKZZmxfvkalC06Ll8MZYENghRrbPEwFT17ODYrs83_ZU0r1z5iKuSiwccGpfNoNaC7
+OHWaGPijKXxtNHULuv4azSz7sFUSP_fheLs4qf3IJw8qJpQJLbpXnAT9awcCxkDom6ic12oAoyuP
+n9S6etYv1NYumz5p3N1p5ZElHbYso-044-OYPFpBMNnsy3zcTMxH6nEEtm0FJsKFNKkP-z5fcyrc
+hbXmdZM_KxNF4i4X-UOj7g8rpT64VL_iujv4YiKwEpJBAacLkdajKQ8PD5HsMvug_-2w7Xz2EObG
+mfB07CGCCWHRs74UdXDgHl-3HD422VOY0hpV7syO_uj5CoHfvcrWydjiep-uqUQCkakbnxQLb3OO
+eJTMAgCatFRbQWDSp5zyCJDYtRgwH4gqIz8UPm-27Nthka80Tp8dQXzCzyiqNeF99e0wmjy7fgSu
+OPNmQGOvxyOo84k8ychwPAyGUmhldZ1o_P-t90s8N71DbWp0hDGmL34V8FtJYW9ZecEXM2sqnXES
+EiPOxBjesYTrPaJ26as4MYJeG82ijkPj8dN6ejP9hFSR-PY8hm0i2Xc9LZyTTC4ukNjlRdjn7JjG
+aPuPQRWNVVSdufjdn-hdVxdgv-rbqWm_jLFr-eWNVbGkPE0rhNy399YTcBPpelPlUucMwTCIU6jg
+I77TJUDvS-JQBlQgZslIs-Wv-VSg3TYZnRSUDYKDa_FITem4I2Exi2QUydYHvCfcuoNLFa7sOeFg
+W0bq32z0Djfamv-iyPJwSA3XeL4K_EAd7VuDvg0anhCNdvmXy1Ch-d-H9N0qwsj1bfa-kLwthkGE
+mjF7kWh59--W2TB2uTWr2qsKsqIwDom7ZwnJwhxNsv7NvsMUjfBiSm6t_MCxWinhWLeyUITnZKdt
+tlZW8DqzcT60sLYA13oE3r5H8HUCB3-PGwRgzTutcSFabK8s4IhGktR6lRGGTuFTtiTom7VRmGbs
+8iCilsA6qQgzuzX_Zh41AwjxPUVWhYqt5oF3GeqMrAOS4f5MR9JV5O7sr1vwSvPna27MuO2OmnwB
+vnSXHuuz3e5lnxlasb7bFuFfD4ZyHGp0mxDHtA3PQ7uloXbHCXB4kU2kXMma-9RacoCcx2B18xb9
+nvMMEK3WDlLtWUFwKVnO2soeyTBCKcIIaVjCtmS7C_s0vNIxBRXa8XHAIS4VKz8lUDMTheFXDcKm
+uSe2LZ5jqWpPnDZbaKEhWyadlwhqRUa6704_pSP1TWqh_Nh4aDnevdlVD9PLXcynnmuuh1z6zDXI
+DcTdeLVmsAniw9YqGk1wc2L7kXT2L1oMLX3Ssappu0Zii7yyyhQ4rIpel8DF4pcCA5PlOPqSgf3p
+8vsFjoZwrG6gZx3ymQqPU2HsLzarn85QCrEOA31bIvA9nOxEVZaNvJplJg3PFtuGCdIISKJ6yu4N
+eTmhXxFig-4FQO4l51spt9eWmEJnINe8qiFYgQv2AIyOtP5wSa7IlvW5jKIapVGkv34H69yqX0Ko
+hz-iu-pSLKPSdGws000j-e03tYZSH0sGRmBI-3pBBhGqU4YlDKuCx88jhWckh4hmb4gGycu8b5JZ
+vCkJfOil2tyseZcy9r59yOwuFDFJ5At6TCxfx6I9DziT4x_Vtr6StrHKP_-H-Luq5XvBa7UVMOoX
+kd4wQ6Idy8vgrxPm1CDGpl4yQMQIsb4Nwz-tLpaIHIHLe5Gd3KLCxgSennbqMCCswcaaeVoA
\ No newline at end of file