Improve code coverage for aaf authz modules

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

diff --git a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Api.java b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Api.java
index 08e8b4f..f4158ce 100644 (file)
--- a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Api.java
+++ b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Api.java
@@ -26,11 +26,13 @@ import static org.junit.Assert.*;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
+import org.junit.runner.RunWith;\r
 import org.mockito.Mock;\r
 import org.onap.aaf.authz.facade.AuthzFacade;\r
 import org.onap.aaf.authz.service.AuthAPI;\r
 import org.onap.aaf.authz.service.api.API_Api;\r
-\r
+import org.powermock.modules.junit4.PowerMockRunner;\r
+@RunWith(PowerMockRunner.class)\r
 public class JU_API_Api {\r
        API_Api api_Api;\r
        @Mock\r

diff --git a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Approval.java b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Approval.java
index e210bbc..d3bd5de 100644 (file)
--- a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Approval.java
+++ b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Approval.java
@@ -26,11 +26,13 @@ import static org.junit.Assert.*;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
+import org.junit.runner.RunWith;\r
 import org.mockito.Mock;\r
 import org.onap.aaf.authz.facade.AuthzFacade;\r
 import org.onap.aaf.authz.service.AuthAPI;\r
 import org.onap.aaf.authz.service.api.API_Approval;\r
-\r
+import org.powermock.modules.junit4.PowerMockRunner;\r
+@RunWith(PowerMockRunner.class)\r
 public class JU_API_Approval {\r
        API_Approval api_Approval;\r
        \r

diff --git a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Creds.java b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Creds.java
index 442de9e..d8ebc50 100644 (file)
--- a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Creds.java
+++ b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Creds.java
@@ -26,6 +26,7 @@ import static org.junit.Assert.*;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
+import org.junit.runner.RunWith;\r
 import org.mockito.Mock;\r
 import org.onap.aaf.authz.cadi.DirectAAFUserPass;\r
 import org.onap.aaf.authz.facade.AuthzFacade;\r
@@ -33,7 +34,8 @@ import org.onap.aaf.authz.service.AuthAPI;
 import org.onap.aaf.authz.service.api.API_Creds;\r
 \r
 import org.onap.aaf.inno.env.Env;\r
-\r
+import org.powermock.modules.junit4.PowerMockRunner;\r
+@RunWith(PowerMockRunner.class)\r
 public class JU_API_Creds {\r
 \r
 API_Creds api_Creds;\r

diff --git a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Delegate.java b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Delegate.java
index 79c716a..2be9bbc 100644 (file)
--- a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Delegate.java
+++ b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Delegate.java
@@ -24,11 +24,13 @@ package org.onap.aaf.authz.service.api;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
+import org.junit.runner.RunWith;\r
 import org.mockito.Mock;\r
 import org.onap.aaf.authz.facade.AuthzFacade;\r
 import org.onap.aaf.authz.service.AuthAPI;\r
 import org.onap.aaf.authz.service.api.API_Delegate;\r
-\r
+import org.powermock.modules.junit4.PowerMockRunner;\r
+@RunWith(PowerMockRunner.class)\r
 public class JU_API_Delegate {\r
 API_Delegate api_Delegate;\r
 @Mock\r

diff --git a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_History.java b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_History.java
index 99bc9bf..3f624bf 100644 (file)
--- a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_History.java
+++ b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_History.java
@@ -26,11 +26,13 @@ import static org.junit.Assert.*;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
+import org.junit.runner.RunWith;\r
 import org.mockito.Mock;\r
 import org.onap.aaf.authz.facade.AuthzFacade;\r
 import org.onap.aaf.authz.service.AuthAPI;\r
 import org.onap.aaf.authz.service.api.API_History;\r
-\r
+import org.powermock.modules.junit4.PowerMockRunner;\r
+@RunWith(PowerMockRunner.class)\r
 public class JU_API_History {\r
        API_History api_History;\r
        \r

diff --git a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Mgmt.java b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Mgmt.java
index d99818c..9fc2eef 100644 (file)
--- a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Mgmt.java
+++ b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Mgmt.java
@@ -26,11 +26,13 @@ import static org.junit.Assert.*;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
+import org.junit.runner.RunWith;\r
 import org.mockito.Mock;\r
 import org.onap.aaf.authz.facade.AuthzFacade;\r
 import org.onap.aaf.authz.service.AuthAPI;\r
 import org.onap.aaf.authz.service.api.API_Mgmt;\r
-\r
+import org.powermock.modules.junit4.PowerMockRunner;\r
+@RunWith(PowerMockRunner.class)\r
 public class JU_API_Mgmt {\r
        API_Mgmt api_Mgmt;\r
        \r

diff --git a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_NS.java b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_NS.java
index d2cb4e2..8509304 100644 (file)
--- a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_NS.java
+++ b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_NS.java
@@ -25,11 +25,13 @@ package org.onap.aaf.authz.service.api;
 import static org.junit.Assert.*;\r
 \r
 import org.junit.Test;\r
+import org.junit.runner.RunWith;\r
 import org.mockito.Mock;\r
 import org.onap.aaf.authz.facade.AuthzFacade;\r
 import org.onap.aaf.authz.service.AuthAPI;\r
 import org.onap.aaf.authz.service.api.API_NS;\r
-\r
+import org.powermock.modules.junit4.PowerMockRunner;\r
+@RunWith(PowerMockRunner.class)\r
 public class JU_API_NS {\r
        API_NS api_Ns;\r
        @Mock\r

diff --git a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Perms.java b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Perms.java
index b1b3f5b..15674f7 100644 (file)
--- a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Perms.java
+++ b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Perms.java
@@ -26,11 +26,13 @@ import static org.junit.Assert.*;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
+import org.junit.runner.RunWith;\r
 import org.mockito.Mock;\r
 import org.onap.aaf.authz.facade.AuthzFacade;\r
 import org.onap.aaf.authz.service.AuthAPI;\r
 import org.onap.aaf.authz.service.api.API_Perms;\r
-\r
+import org.powermock.modules.junit4.PowerMockRunner;\r
+@RunWith(PowerMockRunner.class)\r
 public class JU_API_Perms {\r
        API_Perms api_Perms;\r
        @Mock\r

diff --git a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Roles.java b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Roles.java
index f52f7f6..43cc8d5 100644 (file)
--- a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Roles.java
+++ b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_Roles.java
@@ -26,11 +26,13 @@ import static org.junit.Assert.*;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
+import org.junit.runner.RunWith;\r
 import org.mockito.Mock;\r
 import org.onap.aaf.authz.facade.AuthzFacade;\r
 import org.onap.aaf.authz.service.AuthAPI;\r
 import org.onap.aaf.authz.service.api.API_Roles;\r
-\r
+import org.powermock.modules.junit4.PowerMockRunner;\r
+@RunWith(PowerMockRunner.class)\r
 public class JU_API_Roles {\r
        API_Roles api_Roles;\r
        @Mock\r

diff --git a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_User.java b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_User.java
index 2348eff..29eee9f 100644 (file)
--- a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_User.java
+++ b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_User.java
@@ -26,11 +26,13 @@ import static org.junit.Assert.*;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
+import org.junit.runner.RunWith;\r
 import org.mockito.Mock;\r
 import org.onap.aaf.authz.facade.AuthzFacade;\r
 import org.onap.aaf.authz.service.AuthAPI;\r
 import org.onap.aaf.authz.service.api.API_User;\r
-\r
+import org.powermock.modules.junit4.PowerMockRunner;\r
+@RunWith(PowerMockRunner.class)\r
 public class JU_API_User {\r
        API_User api_User;\r
        @Mock\r

diff --git a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_UserRole.java b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_UserRole.java
index 16b8ba4..8adcb64 100644 (file)
--- a/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_UserRole.java
+++ b/authz-service/src/test/java/org/onap/aaf/authz/service/api/JU_API_UserRole.java
@@ -26,11 +26,13 @@ import static org.junit.Assert.*;
 \r
 import org.junit.Before;\r
 import org.junit.Test;\r
+import org.junit.runner.RunWith;\r
 import org.mockito.Mock;\r
 import org.onap.aaf.authz.facade.AuthzFacade;\r
 import org.onap.aaf.authz.service.AuthAPI;\r
 import org.onap.aaf.authz.service.api.API_UserRole;\r
-\r
+import org.powermock.modules.junit4.PowerMockRunner;\r
+@RunWith(PowerMockRunner.class)\r
 public class JU_API_UserRole {\r
        API_UserRole api_UserRole;\r
        @Mock\r

diff --git a/authz-service/src/test/java/org/onap/aaf/authz/service/validation/JU_Validator.java b/authz-service/src/test/java/org/onap/aaf/authz/service/validation/JU_Validator.java
index 1277b97..e0b49d4 100644 (file)
--- a/authz-service/src/test/java/org/onap/aaf/authz/service/validation/JU_Validator.java
+++ b/authz-service/src/test/java/org/onap/aaf/authz/service/validation/JU_Validator.java
@@ -22,32 +22,27 @@
  ******************************************************************************/\r
 package org.onap.aaf.authz.service.validation;\r
 \r
-import static org.junit.Assert.assertEquals;\r
 import static org.junit.Assert.assertFalse;\r
 import static org.junit.Assert.assertTrue;\r
 \r
+import java.util.HashSet;\r
+import java.util.Set;\r
+\r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.onap.aaf.authz.cadi.DirectAAFLur.PermPermission;\r
-import org.onap.aaf.authz.env.AuthzTrans;\r
 import org.onap.aaf.authz.layer.Result;\r
-import org.onap.aaf.authz.org.Organization;\r
-import org.onap.aaf.authz.service.validation.Validator;\r
-import org.onap.aaf.dao.aaf.cass.CredDAO;\r
-import org.onap.aaf.dao.aaf.cass.DelegateDAO;\r
-import org.onap.aaf.dao.aaf.cass.Namespace;\r
 import org.onap.aaf.dao.aaf.cass.PermDAO;\r
 import org.onap.aaf.dao.aaf.cass.RoleDAO;\r
-import org.onap.aaf.dao.aaf.cass.UserRoleDAO;\r
 \r
 public class JU_Validator {\r
-       \r
+\r
+       Validator validator;\r
+\r
        @Before\r
-       public void setUp(){\r
-               Validator validator = new Validator();\r
+       public void setUp() {\r
+               validator = new Validator();\r
        }\r
 \r
-\r
        @Test\r
        public void test() {\r
                assertTrue(Validator.ACTION_CHARS.matcher("HowdyDoody").matches());\r
@@ -57,14 +52,14 @@ public class JU_Validator {
                assertFalse(Validator.INST_CHARS.matcher("Howd?yDoody").matches());\r
                assertTrue(Validator.INST_CHARS.matcher("_HowdyDoody").matches());\r
 \r
-               //              \r
+               //\r
                assertTrue(Validator.ACTION_CHARS.matcher("*").matches());\r
                assertTrue(Validator.INST_CHARS.matcher("*").matches());\r
                assertFalse(Validator.ACTION_CHARS.matcher(":*").matches());\r
                assertTrue(Validator.INST_CHARS.matcher(":*").matches());\r
                assertFalse(Validator.ACTION_CHARS.matcher(":*:*").matches());\r
                assertTrue(Validator.INST_CHARS.matcher(":*:*").matches());\r
-               \r
+\r
                assertFalse(Validator.ACTION_CHARS.matcher(":hello").matches());\r
                assertTrue(Validator.INST_CHARS.matcher(":hello").matches());\r
                assertFalse(Validator.INST_CHARS.matcher("hello:").matches());\r
@@ -91,7 +86,6 @@ public class JU_Validator {
                assertFalse(Validator.INST_CHARS.matcher(":h:*:*h").matches());\r
                assertTrue(Validator.INST_CHARS.matcher(":com.test.*:ns:*").matches());\r
 \r
-               \r
                assertFalse(Validator.ACTION_CHARS.matcher("1234+235gd").matches());\r
                assertTrue(Validator.ACTION_CHARS.matcher("1234-235gd").matches());\r
                assertTrue(Validator.ACTION_CHARS.matcher("1234-23_5gd").matches());\r
@@ -105,7 +99,7 @@ public class JU_Validator {
                assertFalse(Validator.ACTION_CHARS.matcher("").matches());\r
                assertFalse(Validator.ACTION_CHARS.matcher(" ").matches());\r
 \r
-               // Allow % and =   (Needed for Escaping & Base64 usages) jg \r
+               // Allow % and = (Needed for Escaping & Base64 usages) jg\r
                assertTrue(Validator.ACTION_CHARS.matcher("1234%235g=d").matches());\r
                assertFalse(Validator.ACTION_CHARS.matcher(":1234%235g=d").matches());\r
                assertTrue(Validator.INST_CHARS.matcher("1234%235g=d").matches());\r
@@ -116,7 +110,7 @@ public class JU_Validator {
                assertTrue(Validator.INST_CHARS.matcher(":1234%235g=d:==%20:*").matches());\r
                assertTrue(Validator.INST_CHARS.matcher(":*:==%20:*").matches());\r
 \r
-               // Allow / instead of :  (more natural instance expression) jg \r
+               // Allow / instead of : (more natural instance expression) jg\r
                assertFalse(Validator.INST_CHARS.matcher("1234/a").matches());\r
                assertTrue(Validator.INST_CHARS.matcher("/1234/a").matches());\r
                assertTrue(Validator.INST_CHARS.matcher("/1234/*/a/").matches());\r
@@ -125,7 +119,6 @@ public class JU_Validator {
                assertFalse(Validator.ACTION_CHARS.matcher("/1234/*/a/").matches());\r
                assertFalse(Validator.ACTION_CHARS.matcher("1234//a").matches());\r
 \r
-\r
                assertFalse(Validator.INST_CHARS.matcher("1234+235gd").matches());\r
                assertTrue(Validator.INST_CHARS.matcher("1234-235gd").matches());\r
                assertTrue(Validator.INST_CHARS.matcher("1234-23_5gd").matches());\r
@@ -136,40 +129,91 @@ public class JU_Validator {
                assertFalse(Validator.INST_CHARS.matcher("123#4-23@5g:d").matches());\r
                assertFalse(Validator.INST_CHARS.matcher("").matches());\r
 \r
-               \r
-               for( char c=0x20;c<0x7F;++c) {\r
+               for (char c = 0x20; c < 0x7F; ++c) {\r
                        boolean b;\r
-                       switch(c) {\r
-                               case '?':\r
-                               case '|':\r
-                               case '*':\r
-                                       continue; // test separately\r
-                               case '~':\r
-                               case ',':\r
-                                       b = false;\r
-                                       break;\r
-                               default:\r
-                                       b=true;\r
+                       switch (c) {\r
+                       case '?':\r
+                       case '|':\r
+                       case '*':\r
+                               continue; // test separately\r
+                       case '~':\r
+                       case ',':\r
+                               b = false;\r
+                               break;\r
+                       default:\r
+                               b = true;\r
                        }\r
                }\r
-               \r
+\r
                assertFalse(Validator.ID_CHARS.matcher("abc").matches());\r
                assertFalse(Validator.ID_CHARS.matcher("").matches());\r
                assertTrue(Validator.ID_CHARS.matcher("abc@att.com").matches());\r
                assertTrue(Validator.ID_CHARS.matcher("ab-me@att.com").matches());\r
                assertTrue(Validator.ID_CHARS.matcher("ab-me_.x@att._-com").matches());\r
-               \r
+\r
                assertFalse(Validator.NAME_CHARS.matcher("ab-me_.x@att._-com").matches());\r
                assertTrue(Validator.NAME_CHARS.matcher("ab-me").matches());\r
                assertTrue(Validator.NAME_CHARS.matcher("ab-me_.xatt._-com").matches());\r
 \r
-               \r
                // 7/22/2016\r
-               assertTrue(Validator.INST_CHARS.matcher(\r
-                               "/!com.att.*/role/write").matches());\r
-               assertTrue(Validator.INST_CHARS.matcher(\r
-                               ":!com.att.*:role:write").matches());\r
+               assertTrue(Validator.INST_CHARS.matcher("/!com.att.*/role/write").matches());\r
+               assertTrue(Validator.INST_CHARS.matcher(":!com.att.*:role:write").matches());\r
+\r
+       }\r
+\r
+       @Test\r
+       public void permNotOk() {\r
+\r
+               Result<PermDAO.Data> rpd = Result.err(1, "ERR_Security");\r
+\r
+               validator.perm(rpd);\r
+               assertTrue(validator.errs().equals("ERR_Security\n"));\r
+\r
+       }\r
+\r
+       @Test\r
+       public void permOkNull() {\r
+\r
+               Result rpd = Result.ok();\r
+\r
+               validator.perm(rpd);\r
+               assertTrue(validator.errs().equals("Perm Data is null.\n"));\r
+\r
+       }\r
+\r
+       @Test\r
+       public void roleOkNull() {\r
+\r
+               Result rrd = Result.ok();\r
+\r
+               validator.role(rrd);\r
+               assertTrue(validator.errs().equals("Role Data is null.\n"));\r
+       }\r
+\r
+       @Test\r
+       public void roleOk() {\r
+               RoleDAO.Data to = new RoleDAO.Data();\r
+               to.ns = "namespace";\r
+               to.name = "name";\r
+               to.description = "description";\r
+               Set<String> permissions = new HashSet<String>();\r
+               permissions.add("perm1");\r
+               to.perms = permissions;\r
+\r
+               Result<RoleDAO.Data> rrd = Result.ok(to);\r
+\r
+               validator.role(rrd);\r
+               assertTrue(\r
+                               validator.errs().equals("Perm [perm1] in Role [namespace.name] is not correctly separated with '|'\n"));\r
+       }\r
+\r
+       @Test\r
+       public void roleNotOk() {\r
+\r
+               Result rrd = Result.err(1, "ERR_Security");\r
 \r
+               validator.role(rrd);\r
+               assertTrue(validator.errs().equals("ERR_Security\n"));\r
        }\r
 \r
 }\r