This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 40dc6477011 HIVE-27705 : Remove PowerMock from service (hive-service)
and upgrade mockito to 4.11 (#4725). (Kirti Ruge, reviewed by Ayush Saxena,
Zsolt Miskolczi)
40dc6477011 is described below
commit 40dc64770111b2e2c043f94a5fefbf76bba8baf4
Author: rkirtir <[email protected]>
AuthorDate: Wed Sep 27 13:50:13 2023 +0530
HIVE-27705 : Remove PowerMock from service (hive-service) and upgrade
mockito to 4.11 (#4725). (Kirti Ruge, reviewed by Ayush Saxena, Zsolt Miskolczi)
---
service/pom.xml | 12 +++---------
.../org/apache/hive/service/auth/ldap/TestChainFilter.java | 2 +-
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/service/pom.xml b/service/pom.xml
index a111f3b24a2..18b95cf6ab3 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -328,15 +328,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <version>${powermock.version}</version>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-inline</artifactId>
+ <version>4.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/service/src/test/org/apache/hive/service/auth/ldap/TestChainFilter.java
b/service/src/test/org/apache/hive/service/auth/ldap/TestChainFilter.java
index 8043d9c9f48..72055b22943 100644
--- a/service/src/test/org/apache/hive/service/auth/ldap/TestChainFilter.java
+++ b/service/src/test/org/apache/hive/service/auth/ldap/TestChainFilter.java
@@ -91,7 +91,7 @@ public class TestChainFilter {
@Test(expected = AuthenticationException.class)
public void testApplyNegative() throws AuthenticationException,
NamingException, IOException {
- doThrow(AuthenticationException.class).when(filter3).apply((DirSearch)
anyObject(), anyString());
+ doThrow(AuthenticationException.class).when(filter3).apply((DirSearch)
any(), anyString());
when(factory1.getInstance(any(HiveConf.class))).thenReturn(filter1);
when(factory3.getInstance(any(HiveConf.class))).thenReturn(filter3);