You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2023/05/31 05:09:24 UTC
[ranger] branch master updated: RANGER-4168: fixed NPE in recently added unit tests - #2
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 340ed0c54 RANGER-4168: fixed NPE in recently added unit tests - #2
340ed0c54 is described below
commit 340ed0c54287a387a558e70bf0087b84bf643e8d
Author: Madhan Neethiraj <ma...@apache.org>
AuthorDate: Tue May 30 22:09:14 2023 -0700
RANGER-4168: fixed NPE in recently added unit tests - #2
---
.../src/test/java/org/apache/ranger/biz/TestTagDBStore.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestTagDBStore.java b/security-admin/src/test/java/org/apache/ranger/biz/TestTagDBStore.java
index 99858a568..10c3eb4bb 100644
--- a/security-admin/src/test/java/org/apache/ranger/biz/TestTagDBStore.java
+++ b/security-admin/src/test/java/org/apache/ranger/biz/TestTagDBStore.java
@@ -31,6 +31,7 @@ import org.apache.ranger.db.XXServiceDao;
import org.apache.ranger.db.XXServiceResourceDao;
import org.apache.ranger.db.XXServiceVersionInfoDao;
import org.apache.ranger.db.XXTagDao;
+import org.apache.ranger.db.XXTagDefDao;
import org.apache.ranger.db.XXTagResourceMapDao;
import org.apache.ranger.entity.XXService;
import org.apache.ranger.entity.XXServiceResource;
@@ -852,14 +853,18 @@ public class TestTagDBStore {
@Test
public void testGetServiceTagsIfUpdated() throws Exception {
XXServiceVersionInfo serviceVersionInfoDbObj = createXXServiceVersionInfo();
+ XXTagDefDao xxTagDefDao = Mockito.mock(XXTagDefDao.class);
XXServiceVersionInfoDao xxServiceVersionInfoDao = Mockito.mock(XXServiceVersionInfoDao.class);
XXServiceDao xxServiceDao = Mockito.mock(XXServiceDao.class);
+ XXServiceResourceDao xxServiceResourceDao = Mockito.mock(XXServiceResourceDao.class);
XXService xxService = createXXService();
RangerServiceDef rangerServiceDef = createRangerServiceDef();
Mockito.when(daoManager.getXXServiceVersionInfo()).thenReturn(xxServiceVersionInfoDao);
Mockito.when(xxServiceVersionInfoDao.findByServiceName(serviceName)).thenReturn(serviceVersionInfoDbObj);
+ Mockito.when(daoManager.getXXTagDef()).thenReturn(xxTagDefDao);
Mockito.when(daoManager.getXXService()).thenReturn(xxServiceDao);
+ Mockito.when(daoManager.getXXServiceResource()).thenReturn(xxServiceResourceDao);
Mockito.when(xxServiceDao.findIdByName(serviceName)).thenReturn(id);
Mockito.when(xxServiceDao.findByName(serviceName)).thenReturn(xxService);
Mockito.when(svcStore.getServiceDef(Mockito.any())).thenReturn(rangerServiceDef);
@@ -874,14 +879,18 @@ public class TestTagDBStore {
@Test
public void testGetServiceTags() throws Exception {
XXServiceVersionInfo serviceVersionInfoDbObj = createXXServiceVersionInfo();
+ XXTagDefDao xxTagDefDao = Mockito.mock(XXTagDefDao.class);
XXServiceVersionInfoDao xxServiceVersionInfoDao = Mockito.mock(XXServiceVersionInfoDao.class);
XXServiceDao xxServiceDao = Mockito.mock(XXServiceDao.class);
+ XXServiceResourceDao xxServiceResourceDao = Mockito.mock(XXServiceResourceDao.class);
XXService xxService = createXXService();
RangerServiceDef rangerServiceDef = createRangerServiceDef();
Mockito.when(daoManager.getXXServiceVersionInfo()).thenReturn(xxServiceVersionInfoDao);
Mockito.when(xxServiceVersionInfoDao.findByServiceName(serviceName)).thenReturn(serviceVersionInfoDbObj);
+ Mockito.when(daoManager.getXXTagDef()).thenReturn(xxTagDefDao);
Mockito.when(daoManager.getXXService()).thenReturn(xxServiceDao);
+ Mockito.when(daoManager.getXXServiceResource()).thenReturn(xxServiceResourceDao);
Mockito.when(xxServiceDao.findByName(serviceName)).thenReturn(xxService);
Mockito.when(svcStore.getServiceDef(Mockito.any())).thenReturn(rangerServiceDef);