(ranger) branch master updated: RANGER-4645: fixed unit test failures in TestSecurityZoneDBStore

[madhan]

This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new c4e6e94e8 RANGER-4645: fixed unit test failures in 
TestSecurityZoneDBStore
c4e6e94e8 is described below

commit c4e6e94e8af54e56c35d33adc090383c03efc3ad
Author: Madhan Neethiraj <mad...@apache.org>
AuthorDate: Thu Jan 11 12:03:19 2024 -0800

    RANGER-4645: fixed unit test failures in TestSecurityZoneDBStore
---
 .../main/java/org/apache/ranger/biz/SecurityZoneDBStore.java  |  4 ++--
 .../java/org/apache/ranger/biz/TestSecurityZoneDBStore.java   | 11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git 
a/security-admin/src/main/java/org/apache/ranger/biz/SecurityZoneDBStore.java 
b/security-admin/src/main/java/org/apache/ranger/biz/SecurityZoneDBStore.java
index a877597c5..42943946c 100755
--- 
a/security-admin/src/main/java/org/apache/ranger/biz/SecurityZoneDBStore.java
+++ 
b/security-admin/src/main/java/org/apache/ranger/biz/SecurityZoneDBStore.java
@@ -110,7 +110,7 @@ public class SecurityZoneDBStore implements 
SecurityZoneStore {
 
         RangerSecurityZone createdSecurityZone = 
securityZoneService.create(securityZone);
         if (createdSecurityZone == null) {
-            throw new Exception("Cannot create security zone:[" + securityZone 
+ "]");
+            throw restErrorUtil.createRESTException("Cannot create security 
zone:[" + securityZone + "]");
         }
         
securityZoneRefUpdater.createNewZoneMappingForRefTable(createdSecurityZone);
         List<XXTrxLog> trxLogList = 
securityZoneService.getTransactionLog(createdSecurityZone, null, "create");
@@ -126,7 +126,7 @@ public class SecurityZoneDBStore implements 
SecurityZoneStore {
 
         RangerSecurityZone updatedSecurityZone = 
securityZoneService.update(securityZone);
         if (updatedSecurityZone == null) {
-            throw new Exception("Cannot update security zone:[" + securityZone 
+ "]");
+            throw restErrorUtil.createRESTException("Cannot update security 
zone:[" + securityZone + "]");
         }
         
securityZoneRefUpdater.createNewZoneMappingForRefTable(updatedSecurityZone);
         boolean isRenamed = !StringUtils.equals(securityZone.getName(), (null 
== oldSecurityZone) ? null : oldSecurityZone.getName());
diff --git 
a/security-admin/src/test/java/org/apache/ranger/biz/TestSecurityZoneDBStore.java
 
b/security-admin/src/test/java/org/apache/ranger/biz/TestSecurityZoneDBStore.java
index 0a9e3bbb2..f5d60dfdd 100644
--- 
a/security-admin/src/test/java/org/apache/ranger/biz/TestSecurityZoneDBStore.java
+++ 
b/security-admin/src/test/java/org/apache/ranger/biz/TestSecurityZoneDBStore.java
@@ -114,12 +114,8 @@ public class TestSecurityZoneDBStore {
                RangerSecurityZone updateSecurityZone = new 
RangerSecurityZone();
                updateSecurityZone.setId(2L);
 
-               XXSecurityZoneDao xXSecurityZoneDao = 
Mockito.mock(XXSecurityZoneDao.class);
                XXGlobalStateDao xXGlobalStateDao = 
Mockito.mock(XXGlobalStateDao.class);
 
-               
Mockito.when(daoManager.getXXSecurityZoneDao()).thenReturn(xXSecurityZoneDao);
-               
Mockito.when(xXSecurityZoneDao.findByZoneId(securityZone.getId())).thenReturn(xxSecurityZone);
-
                
Mockito.when(daoManager.getXXGlobalState()).thenReturn(xXGlobalStateDao);
                
Mockito.doNothing().when(xXGlobalStateDao).onGlobalStateChange(RANGER_GLOBAL_STATE_NAME);
 
@@ -132,7 +128,6 @@ public class TestSecurityZoneDBStore {
 
                Assert.assertNotNull(xxSecurityZone);
                Assert.assertEquals(updateSecurityZone.getId(), 
expectedSecurityZone.getId());
-               Mockito.verify(daoManager).getXXSecurityZoneDao();
                Mockito.verify(daoManager).getXXGlobalState();
                Mockito.verify(securityZoneService).update(securityZone);
        }
@@ -304,11 +299,13 @@ public class TestSecurityZoneDBStore {
                securityZoneToUpdate.setId(2L);
 
                XXSecurityZoneDao xXSecurityZoneDao = 
Mockito.mock(XXSecurityZoneDao.class);
-               
Mockito.when(daoManager.getXXSecurityZoneDao()).thenReturn(xXSecurityZoneDao);
-               
Mockito.when(xXSecurityZoneDao.findByZoneId(securityZoneToUpdate.getId())).thenReturn(null);
                
Mockito.when(restErrorUtil.createRESTException(Mockito.anyString())).thenThrow(new
 WebApplicationException());
                thrown.expect(WebApplicationException.class);
 
+               XXGlobalStateDao xXGlobalStateDao = 
Mockito.mock(XXGlobalStateDao.class);
+               
Mockito.when(daoManager.getXXGlobalState()).thenReturn(xXGlobalStateDao);
+               
Mockito.doNothing().when(xXGlobalStateDao).onGlobalStateChange(RANGER_GLOBAL_STATE_NAME);
+
                
securityZoneDBStore.updateSecurityZoneById(securityZoneToUpdate);
                Mockito.verify(daoManager, times(1)).getXXSecurityZoneDao();
                Mockito.verify(xXSecurityZoneDao, 
times(1)).findByZoneId(securityZoneToUpdate.getId());