X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-service%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fservice%2Fvalidation%2Ftest%2FJU_ServiceValidator.java;h=1a3b02659d30d955951c93c5a62fd9cf60f83bda;hb=4b5a7d721d994a49057e9bfb403c7bff1b376660;hp=872161a07de4f1da4d54104878204ddb54c62950;hpb=824dc7b5fc0e1ccdf7f460479aff344727f0f01e;p=aaf%2Fauthz.git diff --git a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/validation/test/JU_ServiceValidator.java b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/validation/test/JU_ServiceValidator.java index 872161a0..1a3b0265 100644 --- a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/validation/test/JU_ServiceValidator.java +++ b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/validation/test/JU_ServiceValidator.java @@ -37,78 +37,78 @@ import org.onap.aaf.auth.validation.Validator; public class JU_ServiceValidator { - ServiceValidator validator; + ServiceValidator validator; - @Before - public void setUp() { - validator = new ServiceValidator(); - } + @Before + public void setUp() { + validator = new ServiceValidator(); + } - @Test - public void permNotOk() { + @Test + public void permNotOk() { - Result rpd = Result.err(1, "ERR_Security"); + Result rpd = Result.err(1, "ERR_Security"); - validator.perm(rpd); - assertTrue(validator.errs().equals("ERR_Security\n")); + validator.perm(rpd); + assertTrue(validator.errs().equals("ERR_Security\n")); - } - - @Test - public void permInstance() { - assertFalse(validator.permInstance("hello").err()); - assertFalse(validator.permInstance("hello32").err()); - assertFalse(validator.permInstance("hello-32").err()); - assertFalse(validator.permInstance(":asdf:*:sdf*:sdk").err()); - assertFalse(validator.permInstance(":asdf:*:sdf*:sdk*").err()); - // Perms may not end in ":" - assertTrue(validator.permInstance(":").err()); - assertTrue(validator.permInstance(":hello:").err()); - } + } + + @Test + public void permInstance() { + assertFalse(validator.permInstance("hello").err()); + assertFalse(validator.permInstance("hello32").err()); + assertFalse(validator.permInstance("hello-32").err()); + assertFalse(validator.permInstance(":asdf:*:sdf*:sdk").err()); + assertFalse(validator.permInstance(":asdf:*:sdf*:sdk*").err()); + // Perms may not end in ":" + assertTrue(validator.permInstance(":").err()); + assertTrue(validator.permInstance(":hello:").err()); + } - @Test - public void permOkNull() { + @Test + public void permOkNull() { - Result rpd = Result.ok(); + Result rpd = Result.ok(); - validator.perm(rpd); - assertTrue(validator.errs().equals("Perm Data is null.\n")); + validator.perm(rpd); + assertTrue(validator.errs().equals("Perm Data is null.\n")); - } + } - @Test - public void roleOkNull() { + @Test + public void roleOkNull() { - Result rrd = Result.ok(); + Result rrd = Result.ok(); - validator.role(rrd); - assertTrue(validator.errs().equals("Role Data is null.\n")); - } + validator.role(rrd); + assertTrue(validator.errs().equals("Role Data is null.\n")); + } - @Test - public void roleOk() { - RoleDAO.Data to = new RoleDAO.Data(); - to.ns = "namespace"; - to.name = "name"; - to.description = "description"; - Set permissions = new HashSet<>(); - permissions.add("perm1"); - to.perms = permissions; + @Test + public void roleOk() { + RoleDAO.Data to = new RoleDAO.Data(); + to.ns = "namespace"; + to.name = "name"; + to.description = "description"; + Set permissions = new HashSet<>(); + permissions.add("perm1"); + to.perms = permissions; - Result rrd = Result.ok(to); + Result rrd = Result.ok(to); - validator.role(rrd); - assertTrue( - validator.errs().equals("Perm [perm1] in Role [namespace.name] is not correctly separated with '|'\n")); - } + validator.role(rrd); + assertTrue( + validator.errs().equals("Perm [perm1] in Role [namespace.name] is not correctly separated with '|'\n")); + } - @Test - public void roleNotOk() { + @Test + public void roleNotOk() { - Result rrd = Result.err(1, "ERR_Security"); + Result rrd = Result.err(1, "ERR_Security"); - validator.role(rrd); - assertTrue(validator.errs().equals("ERR_Security\n")); - } + validator.role(rrd); + assertTrue(validator.errs().equals("ERR_Security\n")); + } }