Sonar Fixes, Formatting

[aaf/authz.git] / auth / auth-service / src / test / java / org / onap / aaf / auth / service / validation / test / JU_ServiceValidator.java

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 872161a..c4829ff 100644 (file)
--- 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
@@ -7,9 +7,9 @@
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
  * * You may obtain a copy of the License at
- * * 
+ * *
  *  *      http://www.apache.org/licenses/LICENSE-2.0
- * * 
+ * *
  *  * Unless required by applicable law or agreed to in writing, software
  * * distributed under the License is distributed on an "AS IS" BASIS,
  * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,6 +19,7 @@
  * *
  * *
  ******************************************************************************/
+
 package org.onap.aaf.auth.service.validation.test;
 
 import static org.junit.Assert.assertFalse;
@@ -37,78 +38,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<PermDAO.Data> rpd = Result.err(1, "ERR_Security");
 
-               Result<PermDAO.Data> 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<String> 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<String> permissions = new HashSet<>();
+        permissions.add("perm1");
+        to.perms = permissions;
 
-               Result<RoleDAO.Data> rrd = Result.ok(to);
+        Result<RoleDAO.Data> 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"));
+    }
 
 }