OOZIE-3528 Migrate to PowerMock 2 and Mockito2 (kmarton via asalamon74)
diff --git a/client/pom.xml b/client/pom.xml
index d6428d7..f5dc164 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -53,7 +53,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 7541bf6..d2a211a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -400,7 +400,7 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
@@ -412,7 +412,7 @@
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
+ <artifactId>powermock-api-mockito2</artifactId>
<scope>test</scope>
</dependency>
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestScriptLanguageActionExecutor.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestScriptLanguageActionExecutor.java
index 0adc190..b877093 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestScriptLanguageActionExecutor.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestScriptLanguageActionExecutor.java
@@ -38,8 +38,9 @@
import java.nio.charset.StandardCharsets;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -70,13 +71,13 @@
@Test
public void multibyteInputsAreAcceptedInScripts() throws Exception {
final String testInput = "林檎";
- doReturn(mockScript).when(mockElement).getChild(anyString(), any(Namespace.class));
+ doReturn(mockScript).when(mockElement).getChild(anyString(), any());
doReturn("script").when(mockScript).getTextTrim();
doReturn(mockActionConfig).when(mockContext).getProtoActionConf();
- doReturn(testInput).when(mockActionConfig).get(anyString());
+ doReturn(testInput).when(mockActionConfig).get(isNull());
doReturn(new Path(".")).when(mockContext).getActionDir();
doReturn(mockFs).when(mockContext).getAppFileSystem();
- doReturn(fsDataOutputStream).when(mockFs).create(any(Path.class));
+ doReturn(fsDataOutputStream).when(mockFs).create(any());
ScriptLanguageActionExecutor scriptLanguageActionExecutor = spy(new ScriptLanguageActionExecutor("pig") {
@Override
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestYarnACLHandler.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestYarnACLHandler.java
index bcb36d3..a7ef4ad 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestYarnACLHandler.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestYarnACLHandler.java
@@ -19,7 +19,7 @@
package org.apache.oozie.action.hadoop;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestYarnApplicationIdFinder.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestYarnApplicationIdFinder.java
index 54570d7..b00318b 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestYarnApplicationIdFinder.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestYarnApplicationIdFinder.java
@@ -20,7 +20,6 @@
import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.api.records.ApplicationReport;
-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.oozie.WorkflowActionBean;
import org.apache.oozie.service.HadoopAccessorException;
@@ -82,8 +81,6 @@
yarnApplicationIdFinder.find());
when(applicationReport.getApplicationType()).thenReturn("Oozie Launcher");
- when(applicationReport.getApplicationId()).thenReturn(applicationId);
- when(applicationId.toString()).thenReturn("application_1534164756526_0001");
when(reader.read()).thenReturn(new ArrayList<>(Arrays.asList(applicationReport)));
assertEquals(
@@ -91,8 +88,6 @@
"application_1534164756526_0000",
yarnApplicationIdFinder.find());
- when(applicationReport.getApplicationType()).thenReturn("MAPREDUCE");
- when(workflowActionBean.getWfId()).thenReturn("workflowId");
assertEquals(
"no Hadoop Job ID nor YARN applications of the same workflow: WorkflowActionBean.externalId should be found",
@@ -112,8 +107,6 @@
public void whenHadoopJobIdIsNotPresentChildYarnApplicationIdIsFound() throws Exception {
when(hadoopJobIdFinder.find()).thenReturn(null);
when(applicationReport.getApplicationType()).thenReturn("MAPREDUCE");
- when(workflowActionBean.getWfId()).thenReturn("workflowId");
- when(applicationReport.getYarnApplicationState()).thenReturn(YarnApplicationState.RUNNING);
when(applicationId.toString()).thenReturn("application_1534164756526_0000");
when(applicationReport.getApplicationId()).thenReturn(applicationId);
when(reader.read()).thenReturn(Arrays.asList(applicationReport));
@@ -136,9 +129,7 @@
throws HadoopAccessorException, IOException, URISyntaxException, InterruptedException, YarnException {
when(hadoopJobIdFinder.find()).thenReturn(mrJobId);
when(applicationReport.getApplicationType()).thenReturn("MAPREDUCE");
- when(workflowActionBean.getWfId()).thenReturn("workflowId");
when(workflowActionBean.getExternalId()).thenReturn(wfExternalId);
- when(applicationReport.getYarnApplicationState()).thenReturn(YarnApplicationState.RUNNING);
when(applicationId.toString()).thenReturn(yarnApplicationId);
when(applicationReport.getApplicationId()).thenReturn(applicationId);
when(reader.read()).thenReturn(Arrays.asList(applicationReport));
@@ -166,25 +157,15 @@
public void whenOldLauncherAndMRobApplicationsAreFinishedAndNewLauncherPresentNewLauncherIsUsed() throws Exception {
final ApplicationReport oldLauncher = mock(ApplicationReport.class);
when(oldLauncher.getApplicationType()).thenReturn("Oozie Launcher");
- when(oldLauncher.getYarnApplicationState()).thenReturn(YarnApplicationState.FINISHED);
- final ApplicationId oldLauncherId = mock(ApplicationId.class);
- when(oldLauncherId.toString()).thenReturn("application_1534164756526_0001");
- when(oldLauncher.getApplicationId()).thenReturn(oldLauncherId);
final ApplicationReport oldMRJob = mock(ApplicationReport.class);
when(oldMRJob.getApplicationType()).thenReturn("MAPREDUCE");
- when(oldMRJob.getYarnApplicationState()).thenReturn(YarnApplicationState.FINISHED);
final ApplicationId oldMRJobId = mock(ApplicationId.class);
when(oldMRJobId.toString()).thenReturn("application_1534164756526_0002");
when(oldMRJob.getApplicationId()).thenReturn(oldMRJobId);
final ApplicationReport newLauncher = mock(ApplicationReport.class);
when(newLauncher.getApplicationType()).thenReturn("Oozie Launcher");
- when(newLauncher.getYarnApplicationState()).thenReturn(YarnApplicationState.FINISHED);
- final ApplicationId newLauncherId = mock(ApplicationId.class);
- when(newLauncherId.toString()).thenReturn("application_1534164756526_0003");
- when(newLauncher.getApplicationId()).thenReturn(newLauncherId);
final ApplicationReport newMRJob = mock(ApplicationReport.class);
when(newMRJob.getApplicationType()).thenReturn("MAPREDUCE");
- when(newMRJob.getYarnApplicationState()).thenReturn(YarnApplicationState.RUNNING);
final ApplicationId newMRJobId = mock(ApplicationId.class);
when(newMRJobId.toString()).thenReturn("application_1534164756526_0004");
when(newMRJob.getApplicationId()).thenReturn(newMRJobId);
@@ -225,14 +206,10 @@
@Test
public void testGetLastYarnIdFromUnorderedListSuccess() {
final ApplicationReport newLauncher = mock(ApplicationReport.class);
- when(newLauncher.getApplicationType()).thenReturn("Oozie Launcher");
- when(newLauncher.getYarnApplicationState()).thenReturn(YarnApplicationState.FINISHED);
final ApplicationId newLauncherId = mock(ApplicationId.class);
when(newLauncherId.toString()).thenReturn("application_1534164756526_0003");
when(newLauncher.getApplicationId()).thenReturn(newLauncherId);
final ApplicationReport newMRJob = mock(ApplicationReport.class);
- when(newMRJob.getApplicationType()).thenReturn("MAPREDUCE");
- when(newMRJob.getYarnApplicationState()).thenReturn(YarnApplicationState.RUNNING);
final ApplicationId newMRJobId = mock(ApplicationId.class);
when(newMRJobId.toString()).thenReturn("application_1534164756526_0004");
when(newMRJob.getApplicationId()).thenReturn(newMRJobId);
diff --git a/core/src/test/java/org/apache/oozie/service/TestAsyncXCommandExecutor.java b/core/src/test/java/org/apache/oozie/service/TestAsyncXCommandExecutor.java
index e0d14d6..67a4535 100644
--- a/core/src/test/java/org/apache/oozie/service/TestAsyncXCommandExecutor.java
+++ b/core/src/test/java/org/apache/oozie/service/TestAsyncXCommandExecutor.java
@@ -59,11 +59,11 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.times;
-import static org.mockito.Matchers.same;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.same;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
@RunWith(MockitoJUnitRunner.class)
@SuppressWarnings("deprecation")
@@ -162,8 +162,6 @@
asyncExecutor = createExecutor(false, 2, DEFAULT_MAXWAIT, TEST_PRIORITIES, AWAIT_TERMINATION_TIMEOUT_SECONDS);
when(callableWrapper.getInitialDelay()).thenReturn(100L);
when(callableWrapper.getDelay(eq(TimeUnit.MILLISECONDS))).thenReturn(50L);
- XCallable<?> wrappedCommand = mock(XCallable.class);
- Mockito.<XCallable<?>>when(callableWrapper.getElement()).thenReturn(wrappedCommand);
configureMockScheduler();
asyncExecutor.queue(callableWrapper, false);
diff --git a/core/src/test/java/org/apache/oozie/servlet/TestHttpResponseHeaderFilter.java b/core/src/test/java/org/apache/oozie/servlet/TestHttpResponseHeaderFilter.java
index 65447c6..666820a 100644
--- a/core/src/test/java/org/apache/oozie/servlet/TestHttpResponseHeaderFilter.java
+++ b/core/src/test/java/org/apache/oozie/servlet/TestHttpResponseHeaderFilter.java
@@ -29,7 +29,7 @@
import java.util.concurrent.atomic.AtomicBoolean;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.verify;
diff --git a/fluent-job/fluent-job-api/pom.xml b/fluent-job/fluent-job-api/pom.xml
index 97ccfbf..f2a5229 100644
--- a/fluent-job/fluent-job-api/pom.xml
+++ b/fluent-job/fluent-job-api/pom.xml
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/fluent-job/fluent-job-client/pom.xml b/fluent-job/fluent-job-client/pom.xml
index c2d70c0..fe16a6b 100644
--- a/fluent-job/fluent-job-client/pom.xml
+++ b/fluent-job/fluent-job-client/pom.xml
@@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 4484833..b2258cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,6 +127,7 @@
<spotbugs.annotations.version>3.1.11</spotbugs.annotations.version>
<spotbugs-maven-plugin.version>3.1.11</spotbugs-maven-plugin.version>
<spotbugs.version>3.1.11</spotbugs.version>
+ <powermock.version>2.0.2</powermock.version>
</properties>
<modules>
@@ -1431,17 +1432,10 @@
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.10.19</version>
- </dependency>
-
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
+ <version>2.28.2</version>
</dependency>
<dependency>
@@ -1453,21 +1447,21 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-core</artifactId>
- <version>1.6.4</version>
+ <version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.6.4</version>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>1.6.4</version>
+ <version>${powermock.version}</version>
<scope>test</scope>
</dependency>
diff --git a/release-log.txt b/release-log.txt
index 99382d1..91c77ba 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.2.0 release (trunk - unreleased)
+OOZIE-3528 Migrate to PowerMock 2 and Mockito2 (kmarton via asalamon74)
OOZIE-3265 Properties RERUN_FAIL_NODES and RERUN_SKIP_NODES should be able to appear together (kmarton via asalamon74)
OOZIE-3024 Email action ignores value of content_type attribute when attachment attribute is set (matijhs via asalamon74)
OOZIE-3526 Global job-xml not being overwritten by job-xml specified for an action (mgogineni via rohini)
diff --git a/server/pom.xml b/server/pom.xml
index c35b636..7c2af98 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -146,7 +146,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/server/src/test/java/org/apache/oozie/server/TestEmbeddedOozieServer.java b/server/src/test/java/org/apache/oozie/server/TestEmbeddedOozieServer.java
index d9784ac..ee12186 100644
--- a/server/src/test/java/org/apache/oozie/server/TestEmbeddedOozieServer.java
+++ b/server/src/test/java/org/apache/oozie/server/TestEmbeddedOozieServer.java
@@ -42,10 +42,10 @@
import java.io.IOException;
import java.net.URISyntaxException;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.never;
@@ -59,7 +59,6 @@
public class TestEmbeddedOozieServer {
@Mock private JspHandler mockJspHandler;
@Mock private Services mockServices;
- @Mock private SslContextFactory mockSSLContextFactory;
@Mock private SSLServerConnectorFactory mockSSLServerConnectorFactory;
@Spy private Server mockServer;
@Mock private ServerConnector mockServerConnector;
@@ -74,7 +73,7 @@
private String confTruststoreFile = "oozie.truststore";
- @Before public void setUp() throws IOException {
+ @Before public void setUp() {
embeddedOozieServer = new EmbeddedOozieServer(mockServer, mockJspHandler, mockServices, mockSSLServerConnectorFactory,
mockOozieRewriteHandler, servletContextHandler, oozieServletMapper, oozieFilterMapper, constraintSecurityHandler);
@@ -82,7 +81,6 @@
doReturn("11443").when(mockConfiguration).get("oozie.https.port");
doReturn("65536").when(mockConfiguration).get("oozie.http.request.header.size");
doReturn("65536").when(mockConfiguration).get("oozie.http.response.header.size");
- doReturn("42").when(mockConfiguration).get("oozie.server.threadpool.max.threads");
doReturn("https://localhost:11443/oozie").when(mockConfiguration).get("oozie.base.url");
doReturn(mockConfiguration).when(mockConfigService).getConf();
doReturn(mockConfigService).when(mockServices).get(ConfigurationService.class);
diff --git a/server/src/test/java/org/apache/oozie/server/TestJspHandler.java b/server/src/test/java/org/apache/oozie/server/TestJspHandler.java
index 741aa5d..be05583 100644
--- a/server/src/test/java/org/apache/oozie/server/TestJspHandler.java
+++ b/server/src/test/java/org/apache/oozie/server/TestJspHandler.java
@@ -33,10 +33,8 @@
import java.net.URI;
import java.net.URISyntaxException;
-import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
diff --git a/server/src/test/java/org/apache/oozie/server/TestSSLServerConnectorFactory.java b/server/src/test/java/org/apache/oozie/server/TestSSLServerConnectorFactory.java
index 1e010c1..f6ff5de 100644
--- a/server/src/test/java/org/apache/oozie/server/TestSSLServerConnectorFactory.java
+++ b/server/src/test/java/org/apache/oozie/server/TestSSLServerConnectorFactory.java
@@ -44,7 +44,7 @@
import static org.apache.oozie.server.SSLServerConnectorFactory.OOZIE_HTTPS_KEYSTORE_PASS;
import static org.apache.oozie.util.ConfigUtils.OOZIE_HTTP_PORT;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
diff --git a/sharelib/oozie/pom.xml b/sharelib/oozie/pom.xml
index fc411d5..b2a1b0a 100644
--- a/sharelib/oozie/pom.xml
+++ b/sharelib/oozie/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
diff --git a/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestHdfsOperations.java b/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestHdfsOperations.java
index 2812593..0c41c53 100644
--- a/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestHdfsOperations.java
+++ b/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestHdfsOperations.java
@@ -19,8 +19,8 @@
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.willThrow;
import static org.mockito.Mockito.verify;
diff --git a/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherAM.java b/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherAM.java
index cad6dac..e87693b 100644
--- a/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherAM.java
+++ b/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherAM.java
@@ -44,10 +44,10 @@
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.willReturn;
import static org.mockito.BDDMockito.willThrow;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
import org.mockito.Mockito;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
diff --git a/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherAMUtils.java b/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherAMUtils.java
index 4d2f426..80af17e 100644
--- a/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherAMUtils.java
+++ b/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherAMUtils.java
@@ -22,8 +22,8 @@
import static org.apache.oozie.action.hadoop.LauncherAMUtils.CONF_OOZIE_ACTION_MAIN_ARG_PREFIX;
import static org.junit.Assert.assertTrue;
import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.anyBoolean;
import java.util.Arrays;
import java.util.List;
diff --git a/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestPrepareActionsHandler.java b/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestPrepareActionsHandler.java
index 2547350..55a698e 100644
--- a/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestPrepareActionsHandler.java
+++ b/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestPrepareActionsHandler.java
@@ -17,7 +17,6 @@
*/
package org.apache.oozie.action.hadoop;
-import org.apache.hadoop.conf.Configuration;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,7 +28,8 @@
import java.io.IOException;
import java.net.URI;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
@@ -48,7 +48,7 @@
public void setUp() throws LauncherException {
prepareActionsHandler = new PrepareActionsHandler(launcherURIHandlerFactory);
- when(launcherURIHandlerFactory.getURIHandler(any(URI.class), any(Configuration.class))).thenReturn(launcherURIHandler);
+ when(launcherURIHandlerFactory.getURIHandler(any(URI.class), isNull())).thenReturn(launcherURIHandler);
}
@Test
diff --git a/tools/pom.xml b/tools/pom.xml
index d4c0327..b48947d 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tools/src/test/java/org/apache/oozie/tools/TestOozieSharelibCLI.java b/tools/src/test/java/org/apache/oozie/tools/TestOozieSharelibCLI.java
index 00cb30e..433cfdb 100644
--- a/tools/src/test/java/org/apache/oozie/tools/TestOozieSharelibCLI.java
+++ b/tools/src/test/java/org/apache/oozie/tools/TestOozieSharelibCLI.java
@@ -40,9 +40,9 @@
import static org.apache.oozie.tools.OozieSharelibCLI.getExtraLibs;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyMap;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyMap;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
diff --git a/tools/src/test/java/org/apache/oozie/tools/diag/TestAppInfoCollector.java b/tools/src/test/java/org/apache/oozie/tools/diag/TestAppInfoCollector.java
index e6ee6b0..c926e13 100644
--- a/tools/src/test/java/org/apache/oozie/tools/diag/TestAppInfoCollector.java
+++ b/tools/src/test/java/org/apache/oozie/tools/diag/TestAppInfoCollector.java
@@ -38,7 +38,7 @@
import static junit.framework.TestCase.assertTrue;
import static org.apache.oozie.tools.diag.TestServerInfoCollector.assertFileContains;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
@RunWith(MockitoJUnitRunner.class)
diff --git a/tools/src/test/java/org/apache/oozie/tools/diag/TestArgParser.java b/tools/src/test/java/org/apache/oozie/tools/diag/TestArgParser.java
index e857d19..4515d0b 100644
--- a/tools/src/test/java/org/apache/oozie/tools/diag/TestArgParser.java
+++ b/tools/src/test/java/org/apache/oozie/tools/diag/TestArgParser.java
@@ -32,7 +32,7 @@
import java.nio.charset.StandardCharsets;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
diff --git a/tools/src/test/java/org/apache/oozie/tools/diag/TestServerInfoCollector.java b/tools/src/test/java/org/apache/oozie/tools/diag/TestServerInfoCollector.java
index d9ab374..a47defa 100644
--- a/tools/src/test/java/org/apache/oozie/tools/diag/TestServerInfoCollector.java
+++ b/tools/src/test/java/org/apache/oozie/tools/diag/TestServerInfoCollector.java
@@ -36,7 +36,8 @@
import java.util.Map;
import static junit.framework.TestCase.assertTrue;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.doReturn;
@RunWith(MockitoJUnitRunner.class)
@@ -57,6 +58,7 @@
@Test
public void testGetShareLibInfo() throws Exception {
+ doReturn("share1\nshare2").when(mockDiagClient).listShareLib(isNull());
doReturn("share1\nshare2").when(mockDiagClient).listShareLib(anyString());
serverInfoCollector.storeShareLibInfo(testTempFolder);
