RANGER-5274 :Test Cases for Security-Admin Module: Package[common , common.view] (#644)

Author: bhaveshamre

security-admin/src/test/java/org/apache/ranger/common/RangerSearchUtilTest.java

@@ -22,23 +22,24 @@
 import org.apache.ranger.entity.XXPortalUser;
 import org.apache.ranger.security.context.RangerContextHolder;
 import org.apache.ranger.security.context.RangerSecurityContext;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+@ExtendWith(MockitoExtension.class)
 public class TestContextUtil {
-    @InjectMocks
     ContextUtil contextUtil = new ContextUtil();
 
     UserSessionBase       currentUserSession = new UserSessionBase();
     XXPortalUser          gjUser             = new XXPortalUser();
     RangerSecurityContext context            = new RangerSecurityContext();
 
-    @Before
+    @BeforeEach
     public void setup() {
         gjUser.setId(1L);
         currentUserSession.setXXPortalUser(gjUser);
@@ -52,7 +53,7 @@ public void testGetCurrentUserId() {
         Long expectedId = 1L;
         Long id         = contextUtil.getCurrentUserId();
 
-        Assert.assertEquals(expectedId, id);
+        assertEquals(expectedId, id);
     }
 
     @SuppressWarnings("static-access")
@@ -62,22 +63,22 @@ public void testGetCurrentUserPublicName() {
         gjUser.setPublicScreenName("rangerAdmin");
 
         String publicName = contextUtil.getCurrentUserPublicName();
-        Assert.assertEquals(expectedName, publicName);
+        assertEquals(expectedName, publicName);
     }
 
     @SuppressWarnings("static-access")
     @Test
     public void testCurrentUserSession() {
         UserSessionBase expectedUserSession = contextUtil.getCurrentUserSession();
-        Assert.assertNotNull(expectedUserSession);
+        assertNotNull(expectedUserSession);
     }
 
     @SuppressWarnings("static-access")
     @Test
     public void testCurrentUserSessionAsNull() {
         context.setUserSession(null);
         UserSessionBase expectedUserSession = contextUtil.getCurrentUserSession();
-        Assert.assertNull(expectedUserSession);
+        assertNull(expectedUserSession);
     }
 
     @SuppressWarnings("static-access")
@@ -86,7 +87,7 @@ public void testCurrentRequestContext() {
         RequestContext requestContext = new RequestContext();
         context.setRequestContext(requestContext);
         RequestContext expectedContext = contextUtil.getCurrentRequestContext();
-        Assert.assertNotNull(expectedContext);
+        assertNotNull(expectedContext);
     }
 
     @SuppressWarnings("static-access")
@@ -95,6 +96,6 @@ public void testCurrentUserLoginId() {
         String expectedLoginId = "rangerAdmin";
         gjUser.setLoginId("rangerAdmin");
         String loginId = contextUtil.getCurrentUserLoginId();
-        Assert.assertEquals(expectedLoginId, loginId);
+        assertEquals(expectedLoginId, loginId);
     }
 }

security-admin/src/test/java/org/apache/ranger/common/TestAppConstants.java

@@ -16,9 +16,10 @@
  */
 package org.apache.ranger.common;
 
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.text.SimpleDateFormat;
@@ -27,23 +28,26 @@
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 @SuppressWarnings("deprecation")
+@ExtendWith(MockitoExtension.class)
 public class TestDateUtil {
     private static final TimeZone gmtTimeZone = TimeZone.getTimeZone("GMT+0");
 
     @Autowired
     DateUtil dateUtil = new DateUtil();
 
     @Test
-    @Ignore
+    @Disabled
     public void testGetDateFromNow() {
         int  days      = 1;
         Date dateCheck = dateUtil.getDateFromNow(days);
         int  minutes   = dateCheck.getMinutes();
         int  hourse    = dateCheck.getHours();
-        Assert.assertEquals(days + 2, dateCheck.getDay());
-        Assert.assertEquals(dateCheck.getMinutes(), minutes);
-        Assert.assertEquals(dateCheck.getHours(), hourse);
+        assertEquals(days + 2, dateCheck.getDay());
+        assertEquals(dateCheck.getMinutes(), minutes);
+        assertEquals(dateCheck.getHours(), hourse);
     }
 
     @Test
@@ -60,9 +64,9 @@ public void testDateFromNow() {
 
         Date actualDate = dateUtil.getDateFromNow(days, hours, minutes);
 
-        Assert.assertEquals(expectedDate.getYear(), actualDate.getYear());
-        Assert.assertEquals(expectedDate.getDay(), actualDate.getDay());
-        Assert.assertEquals(expectedDate.getMonth(), actualDate.getMonth());
+        assertEquals(expectedDate.getYear(), actualDate.getYear());
+        assertEquals(expectedDate.getDay(), actualDate.getDay());
+        assertEquals(expectedDate.getMonth(), actualDate.getMonth());
     }
 
     @Test
@@ -71,7 +75,7 @@ public void testDateToString() {
         SimpleDateFormat dateFormat    = new SimpleDateFormat("dd-MM-yyyy");
         String           dateFormatStr = dateFormat.format(date);
         String           dateCheck     = DateUtil.dateToString(date, dateFormatStr);
-        Assert.assertEquals(dateCheck, dateFormatStr);
+        assertEquals(dateCheck, dateFormatStr);
     }
 
     @Test
@@ -82,19 +86,19 @@ public void testGetDateFromGivenDate() {
         int  minutes     = date.getMinutes();
         int  second      = date.getSeconds();
         Date currentDate = dateUtil.getDateFromGivenDate(date, days, 0, 0, 0);
-        Assert.assertEquals(currentDate.getDay(), date.getDay() + days);
-        Assert.assertEquals(currentDate.getHours(), hours);
-        Assert.assertEquals(currentDate.getMinutes(), minutes);
-        Assert.assertEquals(currentDate.getSeconds(), second);
+        assertEquals(currentDate.getDay(), date.getDay() + days);
+        assertEquals(currentDate.getHours(), hours);
+        assertEquals(currentDate.getMinutes(), minutes);
+        assertEquals(currentDate.getSeconds(), second);
     }
 
     @Test
     public void testAddTimeOffset() {
         Date date        = new Date();
         int  mins        = date.getMinutes();
         Date currentDate = dateUtil.addTimeOffset(date, 0);
-        Assert.assertEquals(currentDate.getDate(), date.getDate());
-        Assert.assertEquals(currentDate.getMinutes(), mins);
+        assertEquals(currentDate.getDate(), date.getDate());
+        assertEquals(currentDate.getMinutes(), mins);
     }
 
     @Test
@@ -108,9 +112,9 @@ public void testStringToDate() {
 
         Date actualDate = DateUtil.stringToDate(dateString, dateFormat);
         if (actualDate != null) {
-            Assert.assertEquals(expectedDate.getYear(), actualDate.getYear());
-            Assert.assertEquals(expectedDate.getDay(), actualDate.getDay());
-            Assert.assertEquals(expectedDate.getMonth(), actualDate.getMonth());
+            assertEquals(expectedDate.getYear(), actualDate.getYear());
+            assertEquals(expectedDate.getDay(), actualDate.getDay());
+            assertEquals(expectedDate.getMonth(), actualDate.getMonth());
         }
     }
 
@@ -124,8 +128,8 @@ public void testGetUTCDate() {
         Date expectedDate = utc.getTime();
 
         Date actualDate = DateUtil.getUTCDate();
-        Assert.assertEquals(actualDate.getDate(), expectedDate.getDate());
-        Assert.assertEquals(actualDate.getMinutes(), expectedDate.getMinutes());
+        assertEquals(actualDate.getDate(), expectedDate.getDate());
+        assertEquals(actualDate.getMinutes(), expectedDate.getMinutes());
     }
 
     @Test
@@ -138,8 +142,8 @@ public void testGetUTCDateEpoh() {
         Date expectedDate = utc.getTime();
 
         Date actualDate = DateUtil.getUTCDate(2008);
-        Assert.assertEquals(actualDate.getDate(), expectedDate.getDate());
-        Assert.assertEquals(actualDate.getMinutes(), expectedDate.getMinutes());
+        assertEquals(actualDate.getDate(), expectedDate.getDate());
+        assertEquals(actualDate.getMinutes(), expectedDate.getMinutes());
     }
 
     @Test
@@ -153,8 +157,8 @@ public void testGetLocalDateForUTCDate() {
         Date expectedDate = utc.getTime();
 
         Date actualDate = DateUtil.getLocalDateForUTCDate(dt);
-        Assert.assertEquals(actualDate.getDate(), expectedDate.getDate());
-        Assert.assertEquals(actualDate.getMinutes(), expectedDate.getMinutes());
-        Assert.assertEquals(actualDate.getHours(), expectedDate.getHours());
+        assertEquals(actualDate.getDate(), expectedDate.getDate());
+        assertEquals(actualDate.getMinutes(), expectedDate.getMinutes());
+        assertEquals(actualDate.getHours(), expectedDate.getHours());
     }
 }

security-admin/src/test/java/org/apache/ranger/common/TestContextUtil.java

@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.ranger.common;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @generated by Cursor
+ * @description : Unit Test cases for ErrorMessageUtil
+ */
+
+@ExtendWith(MockitoExtension.class)
+public class TestErrorMessageUtil {
+    @Test
+    public void testGetMessageReadsFromInternalMap() throws Exception {
+        Field f = ErrorMessageUtil.class.getDeclaredField("messageMap");
+        f.setAccessible(true);
+        Map<String, String> map = new HashMap<>();
+        map.put("err.key1", "Message 1");
+        map.put("err.key2", "Message 2");
+        f.set(null, map);
+
+        assertEquals("Message 1", ErrorMessageUtil.getMessage("err.key1"));
+        assertEquals("Message 2", ErrorMessageUtil.getMessage("err.key2"));
+    }
+}