Skip to content

Commit 836e134

Browse files
muskan1012muskan1012
committed
HADOOP-19328. Backport Mockito Changes to 3.4 Branch (apache#6968)
Mockito is now at a JDK-17 compatible version. Contributed by Muskan Mishra
1 parent b5b5e3f commit 836e134

File tree

82 files changed

+276
-141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+276
-141
lines changed

‎hadoop-client-modules/hadoop-client-minicluster/pom.xml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@
407407
<!-- Add back in Mockito since the hadoop-hdfs test jar needs it. -->
408408
<dependency>
409409
<groupId>org.mockito</groupId>
410-
<artifactId>mockito-core</artifactId>
410+
<artifactId>mockito-inline</artifactId>
411411
<optional>true</optional>
412412
</dependency>
413413
<!-- Add back in the transitive dependencies excluded from hadoop-common in client TODO remove once we have a filter for "is in these artifacts" -->
@@ -765,7 +765,7 @@
765765

766766
<!-- Mockito tries to include its own unrelocated copy of hamcrest. :( -->
767767
<filter>
768-
<artifact>org.mockito:mockito-core</artifact>
768+
<artifact>org.mockito:mockito-inline</artifact>
769769
<excludes>
770770
<exclude>asm-license.txt</exclude>
771771
<exclude>cglib-license.txt</exclude>
@@ -777,6 +777,15 @@
777777
<exclude>org/objenesis/*.class</exclude>
778778
</excludes>
779779
</filter>
780+
<!-- Additional filters to exclude unexpected contents -->
781+
<filter>
782+
<artifact>*:*</artifact>
783+
<excludes>
784+
<exclude>mockito-extensions/**</exclude>
785+
<exclude>win32-x86/**</exclude>
786+
<exclude>win32-x86-64/**</exclude>
787+
</excludes>
788+
</filter>
780789
<!-- skip grizzly internals we don't need to run. -->
781790
<filter>
782791
<artifact>org.glassfish.grizzly:grizzly-http-servlet</artifact>

‎hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,27 @@
173173
</dependency>
174174
<dependency>
175175
<groupId>org.powermock</groupId>
176-
<artifactId>powermock-api-mockito</artifactId>
177-
<version>1.7.4</version>
176+
<artifactId>powermock-api-mockito2</artifactId>
177+
<version>2.0.9</version>
178178
<scope>test</scope>
179+
<exclusions>
180+
<exclusion>
181+
<groupId>org.mockito</groupId>
182+
<artifactId>mockito-core</artifactId>
183+
</exclusion>
184+
</exclusions>
179185
</dependency>
180186
<dependency>
181187
<groupId>org.powermock</groupId>
182188
<artifactId>powermock-module-junit4</artifactId>
183-
<version>1.7.4</version>
189+
<version>2.0.9</version>
184190
<scope>test</scope>
191+
<exclusions>
192+
<exclusion>
193+
<groupId>org.mockito</groupId>
194+
<artifactId>mockito-core</artifactId>
195+
</exclusion>
196+
</exclusions>
185197
</dependency>
186198
</dependencies>
187199
</project>

‎hadoop-common-project/hadoop-auth/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<dependency>
5050
<groupId>org.mockito</groupId>
5151
<artifactId>mockito-core</artifactId>
52+
<version>4.11.0</version>
5253
<scope>test</scope>
5354
</dependency>
5455
<dependency>

‎hadoop-common-project/hadoop-common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@
251251
</dependency>
252252
<dependency>
253253
<groupId>org.mockito</groupId>
254-
<artifactId>mockito-core</artifactId>
254+
<artifactId>mockito-inline</artifactId>
255255
<scope>test</scope>
256256
</dependency>
257257
<dependency>

‎hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestServer.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
import org.junit.Test;
3636
import org.slf4j.Logger;
3737

38+
import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions;
39+
3840
/**
3941
* This is intended to be a set of unit tests for the
4042
* org.apache.hadoop.ipc.Server class.

‎hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/http/TestCrossOriginFilter.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
import org.junit.Test;
3737
import org.mockito.Mockito;
3838

39+
import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions;
40+
3941
public class TestCrossOriginFilter {
4042

4143
@Test
@@ -59,7 +61,7 @@ public void testSameOrigin() throws ServletException, IOException {
5961
filter.init(filterConfig);
6062
filter.doFilter(mockReq, mockRes, mockChain);
6163

62-
Mockito.verifyZeroInteractions(mockRes);
64+
verifyZeroInteractions(mockRes);
6365
Mockito.verify(mockChain).doFilter(mockReq, mockRes);
6466
}
6567

@@ -224,7 +226,7 @@ public void testDisallowedOrigin() throws ServletException, IOException {
224226
filter.init(filterConfig);
225227
filter.doFilter(mockReq, mockRes, mockChain);
226228

227-
Mockito.verifyZeroInteractions(mockRes);
229+
verifyZeroInteractions(mockRes);
228230
Mockito.verify(mockChain).doFilter(mockReq, mockRes);
229231
}
230232

@@ -252,7 +254,7 @@ public void testDisallowedMethod() throws ServletException, IOException {
252254
filter.init(filterConfig);
253255
filter.doFilter(mockReq, mockRes, mockChain);
254256

255-
Mockito.verifyZeroInteractions(mockRes);
257+
verifyZeroInteractions(mockRes);
256258
Mockito.verify(mockChain).doFilter(mockReq, mockRes);
257259
}
258260

@@ -283,7 +285,7 @@ public void testDisallowedHeader() throws ServletException, IOException {
283285
filter.init(filterConfig);
284286
filter.doFilter(mockReq, mockRes, mockChain);
285287

286-
Mockito.verifyZeroInteractions(mockRes);
288+
verifyZeroInteractions(mockRes);
287289
Mockito.verify(mockChain).doFilter(mockReq, mockRes);
288290
}
289291

‎hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/http/TestRestCsrfPreventionFilter.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
import org.junit.Test;
3333
import org.mockito.Mockito;
3434

35+
import static org.apache.hadoop.test.MockitoUtil.verifyZeroInteractions;
36+
3537
/**
3638
* This class tests the behavior of the RestCsrfPreventionFilter.
3739
*
@@ -75,7 +77,7 @@ public void testNoHeaderDefaultConfigBadRequest()
7577

7678
verify(mockRes, atLeastOnce()).sendError(
7779
HttpServletResponse.SC_BAD_REQUEST, EXPECTED_MESSAGE);
78-
Mockito.verifyZeroInteractions(mockChain);
80+
verifyZeroInteractions(mockChain);
7981
}
8082

8183
@Test
@@ -110,7 +112,7 @@ public void testNoHeaderCustomAgentConfigBadRequest()
110112

111113
verify(mockRes, atLeastOnce()).sendError(
112114
HttpServletResponse.SC_BAD_REQUEST, EXPECTED_MESSAGE);
113-
Mockito.verifyZeroInteractions(mockChain);
115+
verifyZeroInteractions(mockChain);
114116
}
115117

116118
@Test
@@ -228,7 +230,7 @@ public void testMissingHeaderWithCustomHeaderConfigBadRequest()
228230
filter.init(filterConfig);
229231
filter.doFilter(mockReq, mockRes, mockChain);
230232

231-
Mockito.verifyZeroInteractions(mockChain);
233+
verifyZeroInteractions(mockChain);
232234
}
233235

234236
@Test
@@ -260,7 +262,7 @@ public void testMissingHeaderNoMethodsToIgnoreConfigBadRequest()
260262
filter.init(filterConfig);
261263
filter.doFilter(mockReq, mockRes, mockChain);
262264

263-
Mockito.verifyZeroInteractions(mockChain);
265+
verifyZeroInteractions(mockChain);
264266
}
265267

266268
@Test
@@ -356,6 +358,6 @@ public void testMissingHeaderMultipleIgnoreMethodsConfigBadRequest()
356358
filter.init(filterConfig);
357359
filter.doFilter(mockReq, mockRes, mockChain);
358360

359-
Mockito.verifyZeroInteractions(mockChain);
361+
verifyZeroInteractions(mockChain);
360362
}
361363
}

‎hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MockitoUtil.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,13 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
6161
}
6262
});
6363
}
64+
65+
/**
66+
* Verifies that there were no interactions with the given mock objects.
67+
*
68+
* @param mocks the mock objects to verify
69+
*/
70+
public static void verifyZeroInteractions(Object... mocks) {
71+
Mockito.verifyNoInteractions(mocks);
72+
}
6473
}

‎hadoop-common-project/hadoop-kms/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</dependency>
4646
<dependency>
4747
<groupId>org.mockito</groupId>
48-
<artifactId>mockito-core</artifactId>
48+
<artifactId>mockito-inline</artifactId>
4949
<scope>test</scope>
5050
</dependency>
5151
<dependency>

‎hadoop-common-project/hadoop-nfs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</dependency>
6161
<dependency>
6262
<groupId>org.mockito</groupId>
63-
<artifactId>mockito-core</artifactId>
63+
<artifactId>mockito-inline</artifactId>
6464
<scope>test</scope>
6565
</dependency>
6666
<dependency>

0 commit comments

Comments
 (0)