Skip to content

Commit f92bc4f

Browse files
committed
HBASE-28944 TestShadedHBaseTestingUtility fails with NCDFE: org/mockito/stubbing/Answer
- Hadoop versions having HDFS-15915 need to either have mockito in their runtime or need to explicitly add it - Hence, instead of changing dependencies explicitly, we fall back to backporting HBASE-27598 which "Upgrade mockito to 4.x" for branch-2.5" which is present on all other branches, where this test seems to work as expected - Also as part of this fix we have made additional changes for the mockito migration as needed
1 parent fb2820a commit f92bc4f

File tree

43 files changed

+146
-154
lines changed

Some content is hidden

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

43 files changed

+146
-154
lines changed

hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexerViaMocks.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
*/
1818
package org.apache.hadoop.hbase.client;
1919

20-
import static org.mockito.Matchers.any;
21-
import static org.mockito.Matchers.anyInt;
20+
import static org.mockito.ArgumentMatchers.any;
21+
import static org.mockito.ArgumentMatchers.anyInt;
2222
import static org.mockito.Mockito.doCallRealMethod;
2323
import static org.mockito.Mockito.mock;
2424
import static org.mockito.Mockito.times;

hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestReversedScannerCallable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.junit.experimental.categories.Category;
4444
import org.junit.runner.RunWith;
4545
import org.mockito.Mock;
46-
import org.mockito.runners.MockitoJUnitRunner;
46+
import org.mockito.junit.MockitoJUnitRunner;
4747

4848
@RunWith(MockitoJUnitRunner.class)
4949
@Category({ ClientTests.class, SmallTests.class })

hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScannerCallable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.junit.experimental.categories.Category;
4141
import org.junit.runner.RunWith;
4242
import org.mockito.Mock;
43-
import org.mockito.runners.MockitoJUnitRunner;
43+
import org.mockito.junit.MockitoJUnitRunner;
4444

4545
@RunWith(MockitoJUnitRunner.class)
4646
@Category({ ClientTests.class, SmallTests.class })

hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/screen/field/TestFieldScreenPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import org.junit.runner.RunWith;
4343
import org.mockito.InOrder;
4444
import org.mockito.Mock;
45-
import org.mockito.runners.MockitoJUnitRunner;
45+
import org.mockito.junit.MockitoJUnitRunner;
4646

4747
@Category(SmallTests.class)
4848
@RunWith(MockitoJUnitRunner.class)

hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/screen/help/TestHelpScreenPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.junit.experimental.categories.Category;
3333
import org.junit.runner.RunWith;
3434
import org.mockito.Mock;
35-
import org.mockito.runners.MockitoJUnitRunner;
35+
import org.mockito.junit.MockitoJUnitRunner;
3636

3737
@Category(SmallTests.class)
3838
@RunWith(MockitoJUnitRunner.class)

hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/screen/mode/TestModeScreenPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.junit.experimental.categories.Category;
3636
import org.junit.runner.RunWith;
3737
import org.mockito.Mock;
38-
import org.mockito.runners.MockitoJUnitRunner;
38+
import org.mockito.junit.MockitoJUnitRunner;
3939

4040
@Category(SmallTests.class)
4141
@RunWith(MockitoJUnitRunner.class)

hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/screen/top/TestFilterDisplayModeScreenPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.junit.experimental.categories.Category;
3838
import org.junit.runner.RunWith;
3939
import org.mockito.Mock;
40-
import org.mockito.runners.MockitoJUnitRunner;
40+
import org.mockito.junit.MockitoJUnitRunner;
4141

4242
@Category(SmallTests.class)
4343
@RunWith(MockitoJUnitRunner.class)

hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/screen/top/TestInputModeScreenPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.junit.runner.RunWith;
3939
import org.mockito.InOrder;
4040
import org.mockito.Mock;
41-
import org.mockito.runners.MockitoJUnitRunner;
41+
import org.mockito.junit.MockitoJUnitRunner;
4242

4343
@Category(SmallTests.class)
4444
@RunWith(MockitoJUnitRunner.class)

hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/screen/top/TestMessageModeScreenPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.junit.experimental.categories.Category;
3131
import org.junit.runner.RunWith;
3232
import org.mockito.Mock;
33-
import org.mockito.runners.MockitoJUnitRunner;
33+
import org.mockito.junit.MockitoJUnitRunner;
3434

3535
@Category(SmallTests.class)
3636
@RunWith(MockitoJUnitRunner.class)

hbase-hbtop/src/test/java/org/apache/hadoop/hbase/hbtop/screen/top/TestTopScreenModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import org.junit.experimental.categories.Category;
4343
import org.junit.runner.RunWith;
4444
import org.mockito.Mock;
45-
import org.mockito.runners.MockitoJUnitRunner;
45+
import org.mockito.junit.MockitoJUnitRunner;
4646

4747
@Category(SmallTests.class)
4848
@RunWith(MockitoJUnitRunner.class)

0 commit comments

Comments
 (0)