Merge branch 'apache:trunk' into YARN-11711

apache · Aug 22, 2024 · 2072263 · 2072263
2 parents 2a60d06 + f6c45e0
commit 2072263
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...ct/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/util/TestCombinedHostsFileReader.java b/...ct/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/util/TestCombinedHostsFileReader.java
@@ -30,10 +30,10 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
+import org.mockito.MockitoAnnotations;
 
 /**
  * Test for JSON based HostsFileReader.
@@ -56,7 +56,7 @@ public class TestCombinedHostsFileReader {
 
   @Before
   public void setUp() throws Exception {
-    callable = Mockito.mock(Callable.class);
+    MockitoAnnotations.initMocks(this);
   }
 
   @After