Increased code coverage auth batch

Issue-ID: AAF-233
Change-Id: I74b116e62c98d8cece3ff07594f469051a695797
Signed-off-by: gabe.maurer <gabe.maurer@att.com>

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/UserRole.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/UserRole.java
index d990bb1..9f366c8 100644 (file)
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/UserRole.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/helpers/UserRole.java
@@ -130,7 +130,7 @@ public class UserRole implements Cloneable, CacheChange.Data  {
        }
        
        public int totalLoaded() {
-               return totalLoaded();
+               return totalLoaded;
        }
        
        public int deleted() {

diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Role.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Role.java
new file mode 100644 (file)
index 0000000..fcfbec1
--- /dev/null
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_Role.java
@@ -0,0 +1,94 @@
+/**
+ * ============LICENSE_START====================================================
+ * org.onap.aaf
+ * ===========================================================================
+ * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * ===========================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END====================================================
+ *
+ */
+
+package org.onap.aaf.auth.helpers.test;
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.onap.aaf.auth.helpers.Perm;
+import org.onap.aaf.auth.helpers.Role;
+
+import junit.framework.Assert;
+
+import static org.mockito.Mockito.*;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Test;
+
+public class JU_Role {
+       
+       Role shortRole;
+       Role longRole;
+       Set set;
+       
+       @Before
+       public void setUp() {
+               set = new HashSet();
+               shortRole = new Role("full");
+               longRole = new Role("ns", "name", "description", set);
+       }
+
+       @Test
+       public void testEncode() {
+               Assert.assertEquals("ns|name", longRole.encode());
+       }
+       
+       @Test
+       public void testFullName() {
+               Assert.assertEquals("ns.name", longRole.fullName());
+               Assert.assertEquals("full", shortRole.fullName());
+               
+               longRole.fullName("test");
+       }
+       
+       @Test
+       public void testToString() {
+               Assert.assertEquals("ns|name", longRole.toString());
+       }
+       
+       @Test
+       public void testHashCode() {
+               Assert.assertEquals(-2043567518, longRole.hashCode());
+       }
+       
+       @Test
+       public void testEquals() {
+               Assert.assertEquals(false, longRole.equals(longRole));
+       }
+       
+       @Test
+       public void testCompareTo() {
+               Assert.assertEquals(-14, longRole.compareTo(shortRole));
+               Assert.assertEquals(14, shortRole.compareTo(longRole));
+       }
+       
+       @Test
+       public void testStageRemove() {
+               longRole.stageRemove(shortRole);
+       }
+
+}

diff --git a/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_UserRole.java b/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_UserRole.java
new file mode 100644 (file)
index 0000000..5b4d0b0
--- /dev/null
+++ b/auth/auth-batch/src/test/java/org/onap/aaf/auth/helpers/test/JU_UserRole.java
@@ -0,0 +1,63 @@
+/**
+ * ============LICENSE_START====================================================
+ * org.onap.aaf
+ * ===========================================================================
+ * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * ===========================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END====================================================
+ *
+ */
+
+package org.onap.aaf.auth.helpers.test;
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.onap.aaf.auth.helpers.UserRole;
+
+import junit.framework.Assert;
+
+import static org.mockito.Mockito.*;
+
+import java.util.Date;
+
+import org.junit.Test;
+
+public class JU_UserRole {
+       
+       UserRole userRole;
+       UserRole userRole1;
+       Date date;
+       
+       @Before
+       public void setUp() {
+               date = new Date();
+               userRole = new UserRole("user", "ns", "rname", date);
+               userRole = new UserRole("user", "role", "ns", "rname", date);
+       }
+
+//     @Test                                                           //stackoverflow
+//     public void testTotalLoaded() {
+//             userRole.totalLoaded();
+//     }
+       
+       @Test
+       public void testDeleted() {
+               Assert.assertEquals(0, userRole.deleted());
+       }
+
+}