You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by co...@apache.org on 2017/06/08 10:14:49 UTC
[1/2] ranger git commit: RANGER-1616 - Upgrade to Mockito 2
Repository: ranger
Updated Branches:
refs/heads/master 16f3dd3c3 -> 2d8895e6d
RANGER-1616 - Upgrade to Mockito 2
Signed-off-by: Colm O hEigeartaigh <co...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/e1fa93de
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/e1fa93de
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/e1fa93de
Branch: refs/heads/master
Commit: e1fa93de70bdb61fbcc05bda0d5786b7451c2b8c
Parents: 16f3dd3
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu May 25 13:22:58 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jun 8 11:06:07 2017 +0100
----------------------------------------------------------------------
.../validation/TestRangerPolicyValidator.java | 2 +-
plugin-nifi/pom.xml | 2 +-
pom.xml | 2 +-
.../apache/ranger/biz/TestRangerBizUtil.java | 2 +-
.../apache/ranger/biz/TestServiceDBStore.java | 2 +-
.../java/org/apache/ranger/biz/TestUserMgr.java | 60 +++++---------------
.../org/apache/ranger/biz/TestXUserMgr.java | 2 +-
.../ranger/plugin/store/RangerDBStore.java | 2 +-
.../org/apache/ranger/rest/TestAssetREST.java | 6 +-
.../org/apache/ranger/rest/TestPublicAPIs.java | 2 +-
.../apache/ranger/rest/TestPublicAPIsv2.java | 2 +-
.../org/apache/ranger/rest/TestServiceREST.java | 2 +-
.../org/apache/ranger/rest/TestTagREST.java | 30 +++++-----
.../org/apache/ranger/rest/TestUserREST.java | 43 +++++---------
.../org/apache/ranger/rest/TestXAuditREST.java | 2 +-
.../org/apache/ranger/rest/TestXKeyREST.java | 10 ++--
.../org/apache/ranger/rest/TestXUserREST.java | 2 +-
.../ranger/service/TestRangerPolicyService.java | 2 +-
.../service/TestRangerPolicyServiceBase.java | 2 +-
.../service/TestRangerServiceDefService.java | 2 +-
.../TestRangerServiceDefServiceBase.java | 2 +-
.../service/TestRangerServiceService.java | 2 +-
.../service/TestRangerServiceServiceBase.java | 2 +-
.../ranger/service/TestRangerTagDefService.java | 2 +-
.../service/TestRangerTagDefServiceBase.java | 2 +-
25 files changed, 71 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java
index 713c588..9bfa859 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java
@@ -527,7 +527,7 @@ public class TestRangerPolicyValidator {
return argThat(new ArgumentMatcher<RangerPolicy>() {
@Override
- public boolean matches(Object argument) {
+ public boolean matches(RangerPolicy argument) {
return true;
}
});
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/plugin-nifi/pom.xml
----------------------------------------------------------------------
diff --git a/plugin-nifi/pom.xml b/plugin-nifi/pom.xml
index 3873fc4..f7df77a 100644
--- a/plugin-nifi/pom.xml
+++ b/plugin-nifi/pom.xml
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 35c8586..1e31341 100644
--- a/pom.xml
+++ b/pom.xml
@@ -188,7 +188,7 @@
<local.lib.dir>${project.basedir}/../lib/local</local.lib.dir>
<log4j.version>1.2.17</log4j.version>
<metrics.core.version>3.0.2</metrics.core.version>
- <mockito.version>1.8.4</mockito.version>
+ <mockito.version>2.7.22</mockito.version>
<mysql-connector-java.version>5.1.31</mysql-connector-java.version>
<netty.version>3.6.2.Final</netty.version>
<owasp-java-html-sanitizer.version>r239</owasp-java-html-sanitizer.version>
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java b/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
index fdf4dae..10e517f 100644
--- a/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
+++ b/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
@@ -51,7 +51,7 @@ import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public class TestRangerBizUtil {
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java b/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
index eb2f417..976fd0c 100644
--- a/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
+++ b/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
@@ -72,7 +72,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java b/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java
index 0bd39e0..5e0ca20 100644
--- a/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java
+++ b/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java
@@ -64,7 +64,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -280,17 +280,14 @@ public class TestUserMgr {
XXPortalUser user = new XXPortalUser();
Mockito.when(daoManager.getXXPortalUser()).thenReturn(userDao);
- Mockito.when(userDao.findByLoginId(Mockito.anyString())).thenReturn(
- user);
+ Mockito.when(userDao.findByLoginId(Mockito.nullable(String.class))).thenReturn(user);
Mockito.when(
- stringUtil.equals(Mockito.anyString(), Mockito.anyString()))
+ stringUtil.equals(Mockito.anyString(), Mockito.nullable(String.class)))
.thenReturn(true);
Mockito.when(daoManager.getXXPortalUser()).thenReturn(userDao);
- Mockito.when(userDao.getById(Mockito.anyLong())).thenReturn(user);
Mockito.when(
- stringUtil.validatePassword(Mockito.anyString(),
- new String[] { Mockito.anyString() })).thenReturn(true);
+ stringUtil.validatePassword(Mockito.anyString(), Mockito.any(String[].class))).thenReturn(true);
VXResponse dbVXResponse = userMgr.changePassword(pwdChange);
Assert.assertNotNull(dbVXResponse);
@@ -298,9 +295,9 @@ public class TestUserMgr {
dbVXResponse.getStatusCode());
Mockito.verify(stringUtil).equals(Mockito.anyString(),
- Mockito.anyString());
+ Mockito.nullable(String.class));
Mockito.verify(stringUtil).validatePassword(Mockito.anyString(),
- new String[] { Mockito.anyString() });
+ Mockito.any(String[].class));
}
@Test
@@ -321,17 +318,16 @@ public class TestUserMgr {
userKeyAdmin.setLoginId(userProfile.getLoginId());
Mockito.when(daoManager.getXXPortalUser()).thenReturn(userDao);
Mockito.when(userDao.findByLoginId(Mockito.anyString())).thenReturn(userKeyAdmin);
- Mockito.when(stringUtil.equals(Mockito.anyString(), Mockito.anyString())).thenReturn(true);
+ Mockito.when(stringUtil.equals(Mockito.anyString(), Mockito.nullable(String.class))).thenReturn(true);
Mockito.when(daoManager.getXXPortalUser()).thenReturn(userDao);
- Mockito.when(userDao.getById(Mockito.anyLong())).thenReturn(userKeyAdmin);
- Mockito.when(stringUtil.validatePassword(Mockito.anyString(),new String[] { Mockito.anyString() })).thenReturn(true);
+ Mockito.when(stringUtil.validatePassword(Mockito.anyString(), Mockito.any(String[].class))).thenReturn(true);
VXResponse dbVXResponse = userMgr.changePassword(pwdChange);
Assert.assertNotNull(dbVXResponse);
Assert.assertEquals(userProfile.getStatus(),dbVXResponse.getStatusCode());
- Mockito.verify(stringUtil).equals(Mockito.anyString(),Mockito.anyString());
- Mockito.verify(stringUtil).validatePassword(Mockito.anyString(),new String[] { Mockito.anyString() });
+ Mockito.verify(stringUtil).equals(Mockito.anyString(), Mockito.nullable(String.class));
+ Mockito.verify(stringUtil).validatePassword(Mockito.anyString(), Mockito.any(String[].class));
}
@Test
@@ -352,17 +348,16 @@ public class TestUserMgr {
user.setLoginId(userProfile.getLoginId());
Mockito.when(daoManager.getXXPortalUser()).thenReturn(userDao);
Mockito.when(userDao.findByLoginId(Mockito.anyString())).thenReturn(user);
- Mockito.when(stringUtil.equals(Mockito.anyString(), Mockito.anyString())).thenReturn(true);
+ Mockito.when(stringUtil.equals(Mockito.anyString(), Mockito.nullable(String.class))).thenReturn(true);
Mockito.when(daoManager.getXXPortalUser()).thenReturn(userDao);
- Mockito.when(userDao.getById(Mockito.anyLong())).thenReturn(user);
- Mockito.when(stringUtil.validatePassword(Mockito.anyString(),new String[] { Mockito.anyString() })).thenReturn(true);
+ Mockito.when(stringUtil.validatePassword(Mockito.anyString(), Mockito.any(String[].class))).thenReturn(true);
VXResponse dbVXResponse = userMgr.changePassword(pwdChange);
Assert.assertNotNull(dbVXResponse);
Assert.assertEquals(userProfile.getStatus(),dbVXResponse.getStatusCode());
- Mockito.verify(stringUtil).equals(Mockito.anyString(),Mockito.anyString());
- Mockito.verify(stringUtil).validatePassword(Mockito.anyString(),new String[] { Mockito.anyString() });
+ Mockito.verify(stringUtil).equals(Mockito.anyString(), Mockito.nullable(String.class));
+ Mockito.verify(stringUtil).validatePassword(Mockito.anyString(),Mockito.any(String[].class));
}
@Test
@@ -709,21 +704,12 @@ public class TestUserMgr {
Mockito.when(userDao.create((XXPortalUser) Mockito.any()))
.thenReturn(user);
Mockito.when(daoManager.getXXPortalUserRole()).thenReturn(roleDao);
- Mockito.when(roleDao.findByUserId(Mockito.anyLong())).thenReturn(list);
Mockito.when(daoManager.getXXUserPermission()).thenReturn(
xUserPermissionDao);
- Mockito.when(
- xUserPermissionDao
- .findByUserPermissionIdAndIsAllowed(userProfile.getId()))
- .thenReturn(xUserPermissionsList);
Mockito.when(daoManager.getXXGroupPermission()).thenReturn(
xGroupPermissionDao);
- Mockito.when(
- xGroupPermissionDao.findbyVXPortalUserId(userProfile.getId()))
- .thenReturn(xGroupPermissionList);
- Mockito.when(stringUtil.validateEmail(Mockito.anyString())).thenReturn(true);
VXPortalUser dbVXPortalUser = userMgr.createUser(userProfile);
Assert.assertNotNull(dbVXPortalUser);
Assert.assertEquals(user.getId(), dbVXPortalUser.getId());
@@ -759,9 +745,6 @@ public class TestUserMgr {
Mockito.when(userDao.findByLoginId(Mockito.anyString())).thenReturn(
user);
Mockito.when(daoManager.getXXPortalUserRole()).thenReturn(roleDao);
- Mockito.when(roleDao.findByParentId(Mockito.anyLong()))
- .thenReturn(list);
- Mockito.when(stringUtil.validateEmail(Mockito.anyString())).thenReturn(true);
VXPortalUser dbVXPortalUser = userMgr
.createDefaultAccountUser(userProfile);
Assert.assertNotNull(dbVXPortalUser);
@@ -1091,26 +1074,16 @@ public class TestUserMgr {
xGroupPermissionObj.setUpdateTime(new Date());
xGroupPermissionObj.setGroupId(userId);
xGroupPermissionList.add(xGroupPermissionObj);
- VXPortalUser userProfile = userProfile();
Mockito.when(daoManager.getXXPortalUser()).thenReturn(xPortalUserDao);
Mockito.when(xPortalUserDao.getById(userId)).thenReturn(xPortalUser);
Mockito.when(daoManager.getXXPortalUserRole()).thenReturn(
xPortalUserRoleDao);
- Mockito.when(xPortalUserRoleDao.findByParentId(userId)).thenReturn(
- xPortalUserRoleList);
Mockito.when(daoManager.getXXUserPermission()).thenReturn(
xUserPermissionDao);
- Mockito.when(
- xUserPermissionDao
- .findByUserPermissionIdAndIsAllowed(userProfile.getId()))
- .thenReturn(xUserPermissionsList);
Mockito.when(daoManager.getXXGroupPermission()).thenReturn(
xGroupPermissionDao);
- Mockito.when(
- xGroupPermissionDao.findbyVXPortalUserId(userProfile.getId()))
- .thenReturn(xGroupPermissionList);
VXPortalUser dbVXPortalUser = userMgr.getUserProfile(userId);
Assert.assertNotNull(dbVXPortalUser);
@@ -1124,10 +1097,7 @@ public class TestUserMgr {
public void test32getUserProfileByLoginId() {
setup();
XXPortalUserDao xPortalUserDao = Mockito.mock(XXPortalUserDao.class);
- XXPortalUser xPortalUser = Mockito.mock(XXPortalUser.class);
Mockito.when(daoManager.getXXPortalUser()).thenReturn(xPortalUserDao);
- Mockito.when(xPortalUserDao.findByLoginId("1L"))
- .thenReturn(xPortalUser);
VXPortalUser dbVXPortalUser = userMgr.getUserProfileByLoginId();
Assert.assertNull(dbVXPortalUser);
@@ -1223,8 +1193,6 @@ public class TestUserMgr {
Mockito.when(daoManager.getXXPortalUserRole()).thenReturn(
xPortalUserRoleDao);
- Mockito.when(xPortalUserRoleDao.findByUserId(userId)).thenReturn(
- xPortalUserRoleList);
Mockito.when(daoManager.getXXPortalUser()).thenReturn(userDao);
Mockito.when(userDao.getById(userId)).thenReturn(user);
Mockito.when(daoManager.getXXUserPermission()).thenReturn(
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/biz/TestXUserMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestXUserMgr.java b/security-admin/src/test/java/org/apache/ranger/biz/TestXUserMgr.java
index d75ba67..30525b3 100644
--- a/security-admin/src/test/java/org/apache/ranger/biz/TestXUserMgr.java
+++ b/security-admin/src/test/java/org/apache/ranger/biz/TestXUserMgr.java
@@ -90,7 +90,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/plugin/store/RangerDBStore.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/plugin/store/RangerDBStore.java b/security-admin/src/test/java/org/apache/ranger/plugin/store/RangerDBStore.java
index f83f069..cd5bb38 100644
--- a/security-admin/src/test/java/org/apache/ranger/plugin/store/RangerDBStore.java
+++ b/security-admin/src/test/java/org/apache/ranger/plugin/store/RangerDBStore.java
@@ -18,7 +18,7 @@
package org.apache.ranger.plugin.store;
import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
public class RangerDBStore {
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/rest/TestAssetREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestAssetREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestAssetREST.java
index 48a910d..75cbdbd 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestAssetREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestAssetREST.java
@@ -89,7 +89,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -758,7 +758,7 @@ public class TestAssetREST {
Mockito.verify(assetMgr).getAccessLogs(searchCriteria);
Mockito.verify(daoManager).getXXServiceDef();
Mockito.verify(searchUtil, Mockito.times(12)).extractString((HttpServletRequest) Mockito.any(),
- (SearchCriteria) Mockito.any(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString());
+ (SearchCriteria) Mockito.any(), Mockito.anyString(), Mockito.anyString(), Mockito.nullable(String.class));
Mockito.verify(searchUtil, Mockito.times(4)).extractInt((HttpServletRequest) Mockito.any(),
(SearchCriteria) Mockito.any(), Mockito.anyString(), Mockito.anyString());
Mockito.verify(searchUtil, Mockito.times(2)).extractDate((HttpServletRequest) Mockito.any(),
@@ -801,7 +801,7 @@ public class TestAssetREST {
Mockito.verify(assetMgr).getAccessLogs(searchCriteria);
Mockito.verify(daoManager).getXXServiceDef();
Mockito.verify(searchUtil, Mockito.times(12)).extractString((HttpServletRequest) Mockito.any(),
- (SearchCriteria) Mockito.any(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString());
+ (SearchCriteria) Mockito.any(), Mockito.anyString(), Mockito.anyString(), Mockito.nullable(String.class));
Mockito.verify(searchUtil, Mockito.times(4)).extractInt((HttpServletRequest) Mockito.any(),
(SearchCriteria) Mockito.any(), Mockito.anyString(), Mockito.anyString());
Mockito.verify(searchUtil, Mockito.times(2)).extractDate((HttpServletRequest) Mockito.any(),
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIs.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIs.java b/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIs.java
index 9faae93..4eaca03 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIs.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIs.java
@@ -65,7 +65,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIsv2.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIsv2.java b/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIsv2.java
index 9489274..d65a426 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIsv2.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestPublicAPIsv2.java
@@ -60,7 +60,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
index 9f4acc6..68c5771 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
@@ -92,7 +92,7 @@ import org.mockito.InjectMocks;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/rest/TestTagREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestTagREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestTagREST.java
index e269283..90060b2 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestTagREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestTagREST.java
@@ -49,7 +49,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -399,7 +399,7 @@ public class TestTagREST {
ret.add(rangerTagDef);
try {
- Mockito.when(tagStore.getTagDefs((SearchFilter)Mockito.anyObject())).thenReturn(ret);
+ Mockito.when(tagStore.getTagDefs((SearchFilter)Mockito.any())).thenReturn(ret);
} catch (Exception e) {
}
List<RangerTagDef> result = tagREST.getAllTagDefs();
@@ -409,7 +409,7 @@ public class TestTagREST {
Assert.assertEquals(result.get(0).getVersion(), ret.get(0).getVersion());
try {
- Mockito.verify(tagStore).getTagDefs((SearchFilter)Mockito.anyObject());
+ Mockito.verify(tagStore).getTagDefs((SearchFilter)Mockito.any());
} catch (Exception e) {
}
}
@@ -417,7 +417,7 @@ public class TestTagREST {
@Test
public void test15getAllTagDefs() {
try {
- Mockito.when(tagStore.getTagDefs((SearchFilter)Mockito.anyObject())).thenReturn(null);
+ Mockito.when(tagStore.getTagDefs((SearchFilter)Mockito.any())).thenReturn(null);
} catch (Exception e) {
}
Mockito.when(restErrorUtil.createRESTException(Mockito.anyInt(), Mockito.anyString(), Mockito.anyBoolean())).thenThrow(new WebApplicationException());
@@ -425,7 +425,7 @@ public class TestTagREST {
tagREST.getAllTagDefs();
try {
- Mockito.verify(tagStore).getTagDefs((SearchFilter)Mockito.anyObject());
+ Mockito.verify(tagStore).getTagDefs((SearchFilter)Mockito.any());
} catch (Exception e) {
}
Mockito.verify(restErrorUtil).createRESTException(Mockito.anyInt(),
@@ -702,7 +702,7 @@ public class TestTagREST {
ret.add(rangerTag);
try {
- Mockito.when(tagStore.getTags((SearchFilter)Mockito.anyObject())).thenReturn(ret);
+ Mockito.when(tagStore.getTags((SearchFilter)Mockito.any())).thenReturn(ret);
} catch (Exception e) {
}
@@ -712,7 +712,7 @@ public class TestTagREST {
Assert.assertNotNull(result.get(0).getId());
try {
- Mockito.verify(tagStore).getTags((SearchFilter)Mockito.anyObject());
+ Mockito.verify(tagStore).getTags((SearchFilter)Mockito.any());
} catch (Exception e) {
}
}
@@ -722,7 +722,7 @@ public class TestTagREST {
List<RangerTag> ret = new ArrayList<RangerTag>();
try {
- Mockito.when(tagStore.getTags((SearchFilter)Mockito.anyObject())).thenReturn(ret);
+ Mockito.when(tagStore.getTags((SearchFilter)Mockito.any())).thenReturn(ret);
} catch (Exception e) {
}
@@ -730,7 +730,7 @@ public class TestTagREST {
Assert.assertNotNull(result);
try {
- Mockito.verify(tagStore).getTags((SearchFilter)Mockito.anyObject());
+ Mockito.verify(tagStore).getTags((SearchFilter)Mockito.any());
} catch (Exception e) {
}
}
@@ -1028,7 +1028,7 @@ public class TestTagREST {
ret.add(rangerServiceResource);
try {
- Mockito.when(tagStore.getServiceResources((SearchFilter)Mockito.anyObject())).thenReturn(ret);
+ Mockito.when(tagStore.getServiceResources((SearchFilter)Mockito.any())).thenReturn(ret);
} catch (Exception e) {
}
List<RangerServiceResource> result = tagREST.getAllServiceResources();
@@ -1037,7 +1037,7 @@ public class TestTagREST {
Assert.assertEquals(result.get(0).getServiceName(), ret.get(0).getServiceName());
try {
- Mockito.verify(tagStore).getServiceResources((SearchFilter)Mockito.anyObject());
+ Mockito.verify(tagStore).getServiceResources((SearchFilter)Mockito.any());
} catch (Exception e) {
}
}
@@ -1287,7 +1287,7 @@ public class TestTagREST {
ret.add(rangerTagResourceMap);
try {
- Mockito.when(tagStore.getTagResourceMaps((SearchFilter)Mockito.anyObject())).thenReturn(ret);
+ Mockito.when(tagStore.getTagResourceMaps((SearchFilter)Mockito.any())).thenReturn(ret);
} catch (Exception e) {
}
@@ -1297,7 +1297,7 @@ public class TestTagREST {
Assert.assertEquals(result.get(0).getTagId(), ret.get(0).getTagId());
try {
- Mockito.verify(tagStore).getTagResourceMaps((SearchFilter)Mockito.anyObject());
+ Mockito.verify(tagStore).getTagResourceMaps((SearchFilter)Mockito.any());
} catch (Exception e) {
}
}
@@ -1307,7 +1307,7 @@ public class TestTagREST {
List<RangerTagResourceMap> ret = new ArrayList<RangerTagResourceMap>();
try {
- Mockito.when(tagStore.getTagResourceMaps((SearchFilter)Mockito.anyObject())).thenReturn(ret);
+ Mockito.when(tagStore.getTagResourceMaps((SearchFilter)Mockito.any())).thenReturn(ret);
} catch (Exception e) {
}
@@ -1315,7 +1315,7 @@ public class TestTagREST {
Assert.assertNotNull(result);
try {
- Mockito.verify(tagStore).getTagResourceMaps((SearchFilter)Mockito.anyObject());
+ Mockito.verify(tagStore).getTagResourceMaps((SearchFilter)Mockito.any());
} catch (Exception e) {
}
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/rest/TestUserREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestUserREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestUserREST.java
index fc9cdd9..373b6f3 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestUserREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestUserREST.java
@@ -52,7 +52,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -284,10 +284,9 @@ public class TestUserREST {
XXPortalUserDao xxPortalUserDao = Mockito.mock(XXPortalUserDao.class);
Mockito.when(daoManager.getXXPortalUser()).thenReturn(xxPortalUserDao);
- Mockito.when(xxPortalUserDao.getById(Mockito.anyLong())).thenReturn(xxPUserExp);
Mockito.doNothing().when(userManager).checkAccess(xxPUserExp);
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.anyObject(),
- Mockito.anyLong(), Mockito.anyString(), Mockito.anyString())).thenReturn(new WebApplicationException());
+ Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any(),
+ Mockito.nullable(Long.class), Mockito.nullable(String.class), Mockito.anyString())).thenReturn(new WebApplicationException());
thrown.expect(WebApplicationException.class);
@@ -296,7 +295,7 @@ public class TestUserREST {
Mockito.verify(daoManager).getXXPortalUser();
Mockito.verify(xxPortalUserDao).getById(Mockito.anyLong());
Mockito.verify(userManager).checkAccess(xxPUserExp);
- Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums) Mockito.anyObject(),
+ Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any(),
Mockito.anyLong(), Mockito.anyString(), Mockito.anyString());
}
@@ -351,15 +350,15 @@ public class TestUserREST {
Mockito.when(daoManager.getXXPortalUser()).thenReturn(xxPortalUserDao);
Mockito.when(xxPortalUserDao.getById(userId)).thenReturn(xxPUserExp);
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.anyObject(),
- Mockito.anyLong(), Mockito.anyString(), Mockito.anyString())).thenReturn(new WebApplicationException());
+ Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any(),
+ Mockito.nullable(Long.class), Mockito.nullable(String.class), Mockito.anyString())).thenReturn(new WebApplicationException());
thrown.expect(WebApplicationException.class);
userREST.deactivateUser(userId);
Mockito.verify(daoManager).getXXPortalUser();
Mockito.verify(xxPortalUserDao).getById(userId);
- Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums) Mockito.anyObject(),
+ Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any(),
Mockito.anyLong(), Mockito.anyString(), Mockito.anyString());
}
@@ -395,10 +394,6 @@ public class TestUserREST {
XXPortalUserDao xxPortalUserDao = Mockito.mock(XXPortalUserDao.class);
Mockito.when(daoManager.getXXPortalUser()).thenReturn(xxPortalUserDao);
- Mockito.when(xxPortalUserDao.getById(userId)).thenReturn(xxPUser);
- Mockito.doNothing().when(userManager).checkAccessForUpdate(xxPUser);
- Mockito.doNothing().when(changePassword).setId(userId);
- Mockito.when(userManager.changePassword(changePassword)).thenReturn(vxResponseExp);
Mockito.when(restErrorUtil.createRESTException("serverMsg.userRestUser",MessageEnums.DATA_NOT_FOUND, null, null, changePassword.getLoginId())).thenThrow(new WebApplicationException());
thrown.expect(WebApplicationException.class);
VXResponse vxResponseAct = userREST.changePassword(userId, changePassword);
@@ -416,21 +411,18 @@ public class TestUserREST {
@Test
public void test17ChangePassword() {
- XXPortalUser xxPUser = new XXPortalUser();
- xxPUser = null;
XXPortalUserDao xxPortalUserDao = Mockito.mock(XXPortalUserDao.class);
Mockito.when(daoManager.getXXPortalUser()).thenReturn(xxPortalUserDao);
- Mockito.when(xxPortalUserDao.getById(userId)).thenReturn(xxPUser);
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.anyObject(),
- Mockito.anyLong(), Mockito.anyString(), Mockito.anyString())).thenReturn(new WebApplicationException());
+ Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any(),
+ Mockito.nullable(Long.class), Mockito.nullable(String.class), Mockito.nullable(String.class))).thenReturn(new WebApplicationException());
thrown.expect(WebApplicationException.class);
userREST.changePassword(userId, changePassword);
Mockito.verify(daoManager).getXXPortalUser();
Mockito.verify(xxPortalUserDao).getById(userId);
- Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums) Mockito.anyObject(),
+ Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any(),
Mockito.anyLong(), Mockito.anyString(), Mockito.anyString());
}
@@ -442,10 +434,6 @@ public class TestUserREST {
XXPortalUserDao xxPortalUserDao = Mockito.mock(XXPortalUserDao.class);
Mockito.when(daoManager.getXXPortalUser()).thenReturn(xxPortalUserDao);
- Mockito.when(xxPortalUserDao.getById(userId)).thenReturn(xxPUser);
- Mockito.doNothing().when(userManager).checkAccessForUpdate(xxPUser);
- Mockito.doNothing().when(changePassword).setId(userId);
- Mockito.when(userManager.changeEmailAddress(xxPUser, changePassword)).thenReturn(vxPUserExp);
Mockito.when(restErrorUtil.createRESTException("serverMsg.userRestUser",MessageEnums.DATA_NOT_FOUND, null, null, changePassword.getLoginId())).thenThrow(new WebApplicationException());
thrown.expect(WebApplicationException.class);
VXPortalUser vxPortalUserAct = userREST.changeEmailAddress(userId, changePassword);
@@ -464,21 +452,18 @@ public class TestUserREST {
@Test
public void test19ChangeEmailAddress() {
- XXPortalUser xxPUser = new XXPortalUser();
- xxPUser = null;
XXPortalUserDao xxPortalUserDao = Mockito.mock(XXPortalUserDao.class);
Mockito.when(daoManager.getXXPortalUser()).thenReturn(xxPortalUserDao);
- Mockito.when(xxPortalUserDao.getById(userId)).thenReturn(xxPUser);
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.anyObject(),
- Mockito.anyLong(), Mockito.anyString(), Mockito.anyString())).thenReturn(new WebApplicationException());
+ Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any(),
+ Mockito.nullable(Long.class), Mockito.nullable(String.class), Mockito.nullable(String.class))).thenReturn(new WebApplicationException());
thrown.expect(WebApplicationException.class);
userREST.changeEmailAddress(userId, changePassword);
Mockito.verify(daoManager).getXXPortalUser();
Mockito.verify(xxPortalUserDao).getById(userId);
- Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums) Mockito.anyObject(),
+ Mockito.verify(restErrorUtil).createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any(),
Mockito.anyLong(), Mockito.anyString(), Mockito.anyString());
}
@@ -492,4 +477,4 @@ public class TestUserREST {
vxPUserExp.setLoginId(loginId);
return vxPUserExp;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/rest/TestXAuditREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestXAuditREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestXAuditREST.java
index 8a90ac8..2864cd3 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestXAuditREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestXAuditREST.java
@@ -38,7 +38,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/rest/TestXKeyREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestXKeyREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestXKeyREST.java
index f244b47..c0a858d 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestXKeyREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestXKeyREST.java
@@ -37,7 +37,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -127,7 +127,7 @@ public class TestXKeyREST {
public void Test4RolloverKey() throws Exception {
VXKmsKey vxKeyExp = new VXKmsKey();
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any()))
+ Mockito.when(restErrorUtil.createRESTException(Mockito.nullable(String.class), (MessageEnums) Mockito.any()))
.thenReturn(new WebApplicationException());
thrown.expect(WebApplicationException.class);
@@ -147,7 +147,7 @@ public class TestXKeyREST {
@Test
public void Test6DeleteKey() throws Exception {
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any()))
+ Mockito.when(restErrorUtil.createRESTException(Mockito.nullable(String.class), (MessageEnums) Mockito.any()))
.thenReturn(new WebApplicationException());
thrown.expect(WebApplicationException.class);
@@ -195,7 +195,7 @@ public class TestXKeyREST {
public void Test8CreateKey() throws Exception {
VXKmsKey vxKeyExp = new VXKmsKey();
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any()))
+ Mockito.when(restErrorUtil.createRESTException(Mockito.nullable(String.class), (MessageEnums) Mockito.any()))
.thenReturn(new WebApplicationException());
thrown.expect(WebApplicationException.class);
@@ -223,7 +223,7 @@ public class TestXKeyREST {
@Test
public void Test10GetKey() throws Exception {
- Mockito.when(restErrorUtil.createRESTException(Mockito.anyString(), (MessageEnums) Mockito.any()))
+ Mockito.when(restErrorUtil.createRESTException(Mockito.nullable(String.class), (MessageEnums) Mockito.any()))
.thenReturn(new WebApplicationException());
thrown.expect(WebApplicationException.class);
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/rest/TestXUserREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestXUserREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestXUserREST.java
index ff40a19..1bf3099 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestXUserREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestXUserREST.java
@@ -94,7 +94,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
import org.apache.ranger.entity.XXGroup;
import org.apache.ranger.db.XXGroupPermissionDao;
import org.apache.ranger.db.XXResourceDao;
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/service/TestRangerPolicyService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerPolicyService.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerPolicyService.java
index b10d2fd..d33b24b 100644
--- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerPolicyService.java
+++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerPolicyService.java
@@ -48,7 +48,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/service/TestRangerPolicyServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerPolicyServiceBase.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerPolicyServiceBase.java
index 803a0cb..c32422e 100644
--- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerPolicyServiceBase.java
+++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerPolicyServiceBase.java
@@ -49,7 +49,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java
index 56109d8..685c8ea 100644
--- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java
+++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java
@@ -47,7 +47,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefServiceBase.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefServiceBase.java
index 15857cb..a56809d 100644
--- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefServiceBase.java
+++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefServiceBase.java
@@ -65,7 +65,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceService.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceService.java
index f6b02a8..163e416 100644
--- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceService.java
+++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceService.java
@@ -53,7 +53,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceServiceBase.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceServiceBase.java
index 54fee7d..43c49e4 100644
--- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceServiceBase.java
+++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceServiceBase.java
@@ -46,7 +46,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/service/TestRangerTagDefService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerTagDefService.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerTagDefService.java
index 2ca0fd2..8f19ffd 100644
--- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerTagDefService.java
+++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerTagDefService.java
@@ -35,7 +35,7 @@ import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
http://git-wip-us.apache.org/repos/asf/ranger/blob/e1fa93de/security-admin/src/test/java/org/apache/ranger/service/TestRangerTagDefServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerTagDefServiceBase.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerTagDefServiceBase.java
index 15fd503..a759c20 100644
--- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerTagDefServiceBase.java
+++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerTagDefServiceBase.java
@@ -28,7 +28,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
[2/2] ranger git commit: RANGER-1621 - Fix knox pom to pick up base
knox version
Posted by co...@apache.org.
RANGER-1621 - Fix knox pom to pick up base knox version
Signed-off-by: Colm O hEigeartaigh <co...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/2d8895e6
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/2d8895e6
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/2d8895e6
Branch: refs/heads/master
Commit: 2d8895e6de2b1d04ce57e18c8b21a1fdff3b44b8
Parents: e1fa93d
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Jun 1 15:14:42 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jun 8 11:06:43 2017 +0100
----------------------------------------------------------------------
knox-agent/pom.xml | 2 +-
ranger-knox-plugin-shim/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/2d8895e6/knox-agent/pom.xml
----------------------------------------------------------------------
diff --git a/knox-agent/pom.xml b/knox-agent/pom.xml
index 63b06f6..9874912 100644
--- a/knox-agent/pom.xml
+++ b/knox-agent/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.knox</groupId>
<artifactId>gateway-spi</artifactId>
- <version>0.5.0</version>
+ <version>${knox.gateway.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
http://git-wip-us.apache.org/repos/asf/ranger/blob/2d8895e6/ranger-knox-plugin-shim/pom.xml
----------------------------------------------------------------------
diff --git a/ranger-knox-plugin-shim/pom.xml b/ranger-knox-plugin-shim/pom.xml
index f2d710b..8d2638c 100644
--- a/ranger-knox-plugin-shim/pom.xml
+++ b/ranger-knox-plugin-shim/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.knox</groupId>
<artifactId>gateway-spi</artifactId>
- <version>0.5.0</version>
+ <version>${knox.gateway.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>