Cleanup some Mockito deprecated usage (che6) (#6864)

* Cleanup some Mockito deprecated usage
org.mockito.Matchers —> org.mockito.ArgumentMatchers
org.mockito.runners.MockitoJUnitRunner —> org.mockito.junit.MockitoJUnitRunner

Change-Id: Icf7351cb58e0f42fa95885c2d2cf6b5e98206c35
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
6.19.x
Florent BENOIT 2017-10-21 09:07:43 +02:00 committed by GitHub
parent a1190245f6
commit 3f262e620e
1167 changed files with 1662 additions and 1645 deletions

View File

@ -10,8 +10,8 @@
*/
package org.eclipse.che;
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.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -10,8 +10,8 @@
*/
package org.eclipse.che.api.core;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyLong;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

View File

@ -11,8 +11,8 @@
package org.eclipse.che.api.core.jsonrpc.commons;
import static java.util.Collections.singletonList;
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.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -13,10 +13,10 @@ package org.eclipse.che.api.core.rest;
import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
import static org.eclipse.che.api.core.util.LinksHelper.createLink;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;

View File

@ -10,7 +10,7 @@
*/
package org.eclipse.che.api.core.rest;
import static org.mockito.Matchers.anyString;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

View File

@ -10,8 +10,8 @@
*/
package org.eclipse.che.api.core.util;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;

View File

@ -10,8 +10,8 @@
*/
package org.eclipse.che.api.core.util;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.slf4j.LoggerFactory.getLogger;

View File

@ -10,8 +10,8 @@
*/
package org.eclipse.che.api.core.util.lineconsumer;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;

View File

@ -10,8 +10,8 @@
*/
package org.eclipse.che.api.core.util.lineconsumer;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;

View File

@ -11,8 +11,8 @@
package org.eclipse.che.api.core.websocket.impl;
import static java.util.Collections.emptySet;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -10,7 +10,7 @@
*/
package org.eclipse.che.api.core.websocket.impl;
import static org.mockito.Matchers.anyString;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

View File

@ -15,7 +15,7 @@ import static java.util.Collections.emptyEnumeration;
import static org.eclipse.che.commons.test.SystemPropertiesHelper.overrideSystemProperties;
import static org.eclipse.che.inject.CheBootstrap.CHE_LOCAL_CONF_DIR;
import static org.eclipse.che.inject.CheBootstrap.PROPERTIES_ALIASES_CONFIG_FILE;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

View File

@ -10,10 +10,10 @@
*/
package org.eclipse.che.filter;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -10,11 +10,11 @@
*/
package org.eclipse.che.filter;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.matches;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.matches;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -10,7 +10,7 @@
*/
package org.eclipse.che.commons.lang;
import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

View File

@ -13,7 +13,7 @@ package org.eclipse.che.ide.api.action;
import static org.eclipse.che.ide.api.constraints.Anchor.AFTER;
import static org.eclipse.che.ide.api.constraints.Anchor.BEFORE;
import static org.fest.assertions.Assertions.assertThat;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

View File

@ -24,7 +24,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** Test of the c-style bloc comment close interceptor. */
@RunWith(MockitoJUnitRunner.class)

View File

@ -21,7 +21,7 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Testing {@link AbstractWizardPage}.

View File

@ -12,8 +12,8 @@ package org.eclipse.che.ide.api.wizard;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.mockito.Matchers.anyMapOf;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anyMapOf;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -22,7 +22,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** @author Evgen Vidolob */
@RunWith(MockitoJUnitRunner.class)

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.actions;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.anyObject;
import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -10,8 +10,8 @@
*/
package org.eclipse.che.ide.actions;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -10,7 +10,7 @@
*/
package org.eclipse.che.ide.actions;
import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -11,8 +11,8 @@
package org.eclipse.che.ide.actions;
import static org.eclipse.che.ide.actions.LinkWithEditorAction.LINK_WITH_EDITOR;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -10,7 +10,7 @@
*/
package org.eclipse.che.ide.actions;
import static org.mockito.Matchers.anyObject;
import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -10,9 +10,9 @@
*/
package org.eclipse.che.ide.actions;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@ -33,7 +33,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** @author Max Shaposhnik */
@RunWith(MockitoJUnitRunner.class)

View File

@ -10,7 +10,7 @@
*/
package org.eclipse.che.ide.actions.common;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -10,7 +10,7 @@
*/
package org.eclipse.che.ide.actions.common;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -18,7 +18,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** Tests for {@link CommandEditorProvider}. */
@RunWith(MockitoJUnitRunner.class)

View File

@ -13,9 +13,9 @@ package org.eclipse.che.ide.command.editor;
import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.EMERGE_MODE;
import static org.eclipse.che.ide.api.notification.StatusNotification.Status.WARNING;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ -53,7 +53,7 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** Tests for {@link CommandEditor}. */
@RunWith(MockitoJUnitRunner.class)

View File

@ -11,11 +11,11 @@
package org.eclipse.che.ide.command.editor.page.goal;
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.anySet;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anySet;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
@ -38,7 +38,7 @@ import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** Tests for {@link GoalPage}. */
@RunWith(MockitoJUnitRunner.class)

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.command.editor.page.goal;
import static org.eclipse.che.ide.command.editor.page.goal.GoalPageViewImpl.CREATE_GOAL_ITEM;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.command.editor.page.name;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ -25,7 +25,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** Tests for {@link NamePage}. */
@RunWith(MockitoJUnitRunner.class)

View File

@ -10,7 +10,7 @@
*/
package org.eclipse.che.ide.command.editor.page.name;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -12,7 +12,7 @@ package org.eclipse.che.ide.command.editor.page.project;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

View File

@ -10,8 +10,8 @@
*/
package org.eclipse.che.ide.command.editor.page.project;
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.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;

View File

@ -13,12 +13,12 @@ package org.eclipse.che.ide.command.explorer;
import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.EMERGE_MODE;
import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL;
import static org.junit.Assert.assertEquals;
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 static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.ArgumentMatchers.nullable;
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.Matchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.command.palette;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ -38,9 +38,8 @@ import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.InjectMocks;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** Tests for {@link CommandsPalettePresenter}. */
@RunWith(MockitoJUnitRunner.class)
@ -81,7 +80,7 @@ public class CommandsPalettePresenterTest {
verify(view).show();
verify(commandManager).getCommands();
verify(view).setCommands(Matchers.any());
verify(view).setCommands(org.mockito.ArgumentMatchers.any());
}
@Test

View File

@ -18,7 +18,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** Tests for {@link ShowCommandsPaletteAction}. */
@RunWith(MockitoJUnitRunner.class)

View File

@ -10,8 +10,8 @@
*/
package org.eclipse.che.ide.command.toolbar.commands;
import static org.mockito.Matchers.anySetOf;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anySetOf;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ -32,7 +32,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** Tests for {@link ExecuteCommandPresenter}. */
@RunWith(MockitoJUnitRunner.class)

View File

@ -17,7 +17,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** Tests for {@link AbstractMenuItem}. */
@RunWith(MockitoJUnitRunner.class)

View File

@ -19,7 +19,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** Tests for {@link CommandItem}. */
@RunWith(MockitoJUnitRunner.class)

View File

@ -12,7 +12,7 @@ package org.eclipse.che.ide.command.toolbar.commands.button;
import static org.fest.assertions.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@ -28,7 +28,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** Tests for {@link ExecuteCommandButtonItemsProvider}. */
@RunWith(MockitoJUnitRunner.class)

View File

@ -19,7 +19,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** Tests for {@link MachineItem}. */
@RunWith(MockitoJUnitRunner.class)

View File

@ -25,7 +25,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** Tests for {@link PreviewUrl}. */
@RunWith(MockitoJUnitRunner.class)

View File

@ -20,7 +20,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** @author Artem Zatsarynnyi */
@RunWith(MockitoJUnitRunner.class)

View File

@ -10,7 +10,7 @@
*/
package org.eclipse.che.ide.command.type.custom;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@ -25,7 +25,7 @@ import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** @author Artem Zatsarynnyi */
@RunWith(MockitoJUnitRunner.class)

View File

@ -11,13 +11,13 @@
package org.eclipse.che.ide.editor.macro;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Unit tests for the {@link EditorCurrentFileBaseNameMacro}

View File

@ -11,13 +11,13 @@
package org.eclipse.che.ide.editor.macro;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Unit tests for the {@link EditorCurrentFileNameMacro}

View File

@ -11,14 +11,14 @@
package org.eclipse.che.ide.editor.macro;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import org.eclipse.che.ide.resource.Path;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Unit tests for the {@link EditorCurrentFilePathMacro}

View File

@ -11,13 +11,13 @@
package org.eclipse.che.ide.editor.macro;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Unit tests for the {@link EditorCurrentFileRelativePathMacro}

View File

@ -11,13 +11,13 @@
package org.eclipse.che.ide.editor.macro;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Unit tests for the {@link EditorCurrentProjectNameMacro}

View File

@ -11,13 +11,13 @@
package org.eclipse.che.ide.editor.macro;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Unit tests for the {@link EditorCurrentProjectTypeMacro}

View File

@ -12,7 +12,7 @@ package org.eclipse.che.ide.editor.synchronization;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.mockito.Matchers.anyObject;
import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
@ -36,10 +36,10 @@ import org.eclipse.che.ide.resource.Path;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.mockito.InjectMocks;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** @author Roman Nikitenko */
@RunWith(MockitoJUnitRunner.class)
@ -74,7 +74,8 @@ public class EditorContentSynchronizerImplTest {
@Test
public void constructorShouldBeVerified() {
verify(eventBus, times(3)).addHandler(Matchers.<Event.Type<Object>>anyObject(), anyObject());
verify(eventBus, times(3))
.addHandler(ArgumentMatchers.<Event.Type<Object>>anyObject(), anyObject());
}
@Test

View File

@ -12,11 +12,11 @@ package org.eclipse.che.ide.editor.synchronization;
import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.NOT_EMERGE_MODE;
import static org.eclipse.che.ide.api.notification.StatusNotification.Status.SUCCESS;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
@ -51,9 +51,8 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** @author Roman Nikitenko */
@RunWith(MockitoJUnitRunner.class)
@ -229,7 +228,8 @@ public class EditorGroupSynchronizationImplTest {
verify(documentEventBus)
.addHandler(
Matchers.<DocumentChangedEvent.Type>anyObject(), eq(editorGroupSynchronization));
org.mockito.ArgumentMatchers.<DocumentChangedEvent.Type>anyObject(),
eq(editorGroupSynchronization));
}
@Test
@ -246,7 +246,8 @@ public class EditorGroupSynchronizationImplTest {
verify(document).replace(anyInt(), anyInt(), anyString());
verify(documentEventBus)
.addHandler(
Matchers.<DocumentChangedEvent.Type>anyObject(), eq(editorGroupSynchronization));
org.mockito.ArgumentMatchers.<DocumentChangedEvent.Type>anyObject(),
eq(editorGroupSynchronization));
}
@Test

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.macro;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ -25,7 +25,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Unit tests for the {@link WorkspaceNameMacro}.

View File

@ -10,8 +10,8 @@
*/
package org.eclipse.che.ide.navigation;
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.Mockito.verify;
import static org.mockito.Mockito.when;
@ -30,7 +30,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Test for {@link NavigateToFilePresenter}.

View File

@ -10,9 +10,9 @@
*/
package org.eclipse.che.ide.newresource;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -10,9 +10,9 @@
*/
package org.eclipse.che.ide.newresource;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -13,8 +13,8 @@ package org.eclipse.che.ide.notification;
import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.FLOAT_MODE;
import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.NOT_EMERGE_MODE;
import static org.eclipse.che.ide.api.notification.StatusNotification.Status.SUCCESS;
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.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;

View File

@ -39,7 +39,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.vectomatic.dom.svg.ui.SVGResource;
@ -118,7 +117,8 @@ public class PartStackPresenterTest {
verify(partPresenter).addPropertyListener(listenerCaptor.capture());
listenerCaptor.getValue().propertyChanged(editorPartPresenter, EditorPartPresenter.PROP_DIRTY);
verify(eventBus).fireEvent(Matchers.<EditorDirtyStateChangedEvent>anyObject());
verify(eventBus)
.fireEvent(org.mockito.ArgumentMatchers.<EditorDirtyStateChangedEvent>anyObject());
}
@Test
@ -141,7 +141,7 @@ public class PartStackPresenterTest {
verify(partButton).setDelegate(presenter);
verify(view).addTab(partButton, basePresenter);
verify(view).setTabPositions(Matchers.<List<PartPresenter>>anyObject());
verify(view).setTabPositions(org.mockito.ArgumentMatchers.<List<PartPresenter>>anyObject());
verify(partStackHandler).onRequestFocus(presenter);
}

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.part;
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -20,7 +20,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Testing {@link FocusManager} functionality.

View File

@ -18,10 +18,10 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
@ -73,7 +73,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.vectomatic.dom.svg.ui.SVGResource;
@ -198,9 +197,12 @@ public class EditorPartStackPresenterTest {
public void constructorShouldBeVerified() {
verify(view, times(2)).setDelegate(presenter);
verify(view).addPaneMenuButton(editorPaneMenu);
verify(editorPaneMenuItemFactory, times(4)).createMenuItem(Matchers.<BaseAction>anyObject());
verify(editorPaneMenu).addItem(Matchers.<PaneMenuActionItemWidget>anyObject(), eq(true));
verify(editorPaneMenu, times(3)).addItem(Matchers.<PaneMenuActionItemWidget>anyObject());
verify(editorPaneMenuItemFactory, times(4))
.createMenuItem(org.mockito.ArgumentMatchers.<BaseAction>anyObject());
verify(editorPaneMenu)
.addItem(org.mockito.ArgumentMatchers.<PaneMenuActionItemWidget>anyObject(), eq(true));
verify(editorPaneMenu, times(3))
.addItem(org.mockito.ArgumentMatchers.<PaneMenuActionItemWidget>anyObject());
}
@Test
@ -214,7 +216,8 @@ public class EditorPartStackPresenterTest {
public void partShouldBeAdded() {
presenter.addPart(partPresenter1);
verify(partPresenter1, times(2)).addPropertyListener(Matchers.<PropertyListener>anyObject());
verify(partPresenter1, times(2))
.addPropertyListener(org.mockito.ArgumentMatchers.<PropertyListener>anyObject());
verify(tabItemFactory).createEditorPartButton(partPresenter1, presenter);

View File

@ -11,9 +11,9 @@
package org.eclipse.che.ide.part.editor.multipart;
import static org.eclipse.che.ide.api.constraints.Direction.HORIZONTALLY;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isNull;
import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
@ -34,7 +34,6 @@ import org.eclipse.che.ide.part.editor.EditorPartStackPresenter;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mock;
/** @author Roman Nikitenko */
@ -71,7 +70,9 @@ public class EditorMultiPartStackPresenterTest {
@Test
public void constructorShouldBeVerified() {
verify(eventBus).addHandler(Matchers.<ActivePartChangedEvent.Type>anyObject(), eq(presenter));
verify(eventBus)
.addHandler(
org.mockito.ArgumentMatchers.<ActivePartChangedEvent.Type>anyObject(), eq(presenter));
}
@Test

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.part.explorer.project.macro;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import com.google.common.base.Joiner;

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.part.explorer.project.macro;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import com.google.common.base.Joiner;

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.part.explorer.project.macro;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import com.google.common.base.Joiner;

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.part.explorer.project.macro;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import com.google.common.base.Joiner;

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.part.explorer.project.macro;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import com.google.common.base.Joiner;

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.part.explorer.project.macro;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import com.google.gwtmockito.GwtMockitoTestRunner;

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.part.explorer.project.macro;
import static org.junit.Assert.assertSame;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import com.google.gwtmockito.GwtMockitoTestRunner;

View File

@ -12,9 +12,9 @@ package org.eclipse.che.ide.part.explorer.project.synchronize;
import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.EMERGE_MODE;
import static org.eclipse.che.ide.api.notification.StatusNotification.Status.SUCCESS;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ -47,7 +47,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Matchers;
import org.mockito.Mock;
@RunWith(GwtMockitoTestRunner.class)
@ -158,7 +157,7 @@ public class ProjectConfigSynchronizedTest {
String projectRemoved = "project removed";
when(resource.delete()).thenReturn(deleteProjectPromise);
when(deleteProjectPromise.then(Matchers.<Operation<Void>>any()))
when(deleteProjectPromise.then(org.mockito.ArgumentMatchers.<Operation<Void>>any()))
.thenReturn(deleteProjectPromise);
when(locale.projectRemoved(PROJECT_NAME)).thenReturn(projectRemoved);
@ -209,7 +208,7 @@ public class ProjectConfigSynchronizedTest {
when(sourceStorage.getLocation()).thenReturn(null);
when(changeLocationWidget.getText()).thenReturn(newLocation);
when(dialogFactory.createConfirmDialog(
anyString(), Matchers.<IsWidget>any(), anyObject(), anyObject()))
anyString(), org.mockito.ArgumentMatchers.<IsWidget>any(), anyObject(), anyObject()))
.thenReturn(changeConfirmDialog);
subscribeToOnBeforeLoadNodeEvent();

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.part.perspectives.general;
import static org.fest.assertions.Assertions.assertThat;
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.when;
@ -44,7 +44,6 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@ -92,13 +91,16 @@ public class AbstractPerspectivePersistenceTest {
when(partStackPresenter.getPartStackState()).thenReturn(PartStack.State.NORMAL);
when(controllerFactory.createController(
Matchers.<SplitLayoutPanel>anyObject(), Matchers.<SimplePanel>anyObject()))
org.mockito.ArgumentMatchers.<SplitLayoutPanel>anyObject(),
org.mockito.ArgumentMatchers.<SimplePanel>anyObject()))
.thenReturn(workBenchController);
when(partStackViewFactory.create(Matchers.<FlowPanel>anyObject())).thenReturn(partStackView);
when(partStackViewFactory.create(org.mockito.ArgumentMatchers.<FlowPanel>anyObject()))
.thenReturn(partStackView);
when(stackPresenterFactory.create(
Matchers.<PartStackView>anyObject(), Matchers.<WorkBenchPartController>anyObject()))
org.mockito.ArgumentMatchers.<PartStackView>anyObject(),
org.mockito.ArgumentMatchers.<WorkBenchPartController>anyObject()))
.thenReturn(partStackPresenter);
perspective =

View File

@ -43,7 +43,6 @@ import org.eclipse.che.providers.DynaProvider;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mock;
/** @author Dmitry Shnurenko */
@ -90,13 +89,16 @@ public class AbstractPerspectiveTest {
when(view.getToolPanel()).thenReturn(simplePanel);
when(controllerFactory.createController(
Matchers.<SplitLayoutPanel>anyObject(), Matchers.<SimplePanel>anyObject()))
org.mockito.ArgumentMatchers.<SplitLayoutPanel>anyObject(),
org.mockito.ArgumentMatchers.<SimplePanel>anyObject()))
.thenReturn(workBenchController);
when(partStackViewFactory.create(Matchers.<FlowPanel>anyObject())).thenReturn(partStackView);
when(partStackViewFactory.create(org.mockito.ArgumentMatchers.<FlowPanel>anyObject()))
.thenReturn(partStackView);
when(stackPresenterFactory.create(
Matchers.<PartStackView>anyObject(), Matchers.<WorkBenchPartController>anyObject()))
org.mockito.ArgumentMatchers.<PartStackView>anyObject(),
org.mockito.ArgumentMatchers.<WorkBenchPartController>anyObject()))
.thenReturn(partStackPresenter);
perspective =

View File

@ -24,7 +24,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** @author Dmitry Shnurenko */
@RunWith(MockitoJUnitRunner.class)

View File

@ -37,7 +37,6 @@ import org.eclipse.che.providers.DynaProvider;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Matchers;
import org.mockito.Mock;
/** @author Dmitry Shnurenko */
@ -83,13 +82,16 @@ public class ProjectPerspectiveTest {
when(view.getToolPanel()).thenReturn(simplePanel);
when(controllerFactory.createController(
Matchers.<SplitLayoutPanel>anyObject(), Matchers.<SimplePanel>anyObject()))
org.mockito.ArgumentMatchers.<SplitLayoutPanel>anyObject(),
org.mockito.ArgumentMatchers.<SimplePanel>anyObject()))
.thenReturn(workBenchController);
when(partViewFactory.create(Matchers.<FlowPanel>anyObject())).thenReturn(partStackView);
when(partViewFactory.create(org.mockito.ArgumentMatchers.<FlowPanel>anyObject()))
.thenReturn(partStackView);
when(stackPresenterFactory.create(
Matchers.<PartStackView>anyObject(), Matchers.<WorkBenchPartController>anyObject()))
org.mockito.ArgumentMatchers.<PartStackView>anyObject(),
org.mockito.ArgumentMatchers.<WorkBenchPartController>anyObject()))
.thenReturn(partStackPresenter);
perspective =

View File

@ -35,7 +35,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Matchers;
import org.mockito.Mock;
import org.vectomatic.dom.svg.OMSVGSVGElement;
import org.vectomatic.dom.svg.ui.SVGImage;
@ -154,7 +153,7 @@ public class EditorTabWidgetTest {
verify(editorPartPresenter, times(2)).getEditorInput();
verify(editorPartPresenter, times(2)).getTitleImage();
verify(tab.iconPanel).setWidget(Matchers.<SVGImage>anyObject());
verify(tab.iconPanel).setWidget(org.mockito.ArgumentMatchers.<SVGImage>anyObject());
}
@Test

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.processes;
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import com.google.gwtmockito.GwtMockitoTestRunner;

View File

@ -13,7 +13,7 @@ package org.eclipse.che.ide.processes.runtime;
import static java.util.Collections.singletonMap;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

View File

@ -60,7 +60,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatchers;
import org.mockito.Captor;
import org.mockito.Mock;
@ -146,7 +145,7 @@ public class ProjectServiceClientTest {
when(requestFactory.createPostRequest(any(String.class), anyList())).thenReturn(asyncRequest);
when(requestFactory.createPostRequest(any(String.class), any())).thenReturn(asyncRequest);
when(requestFactory.createPostRequest(
any(String.class), ArgumentMatchers.<List<NewProjectConfigDto>>any()))
any(String.class), org.mockito.ArgumentMatchers.<List<NewProjectConfigDto>>any()))
.thenReturn(asyncRequest);
when(requestFactory.createPostRequest(any(String.class), nullable(MimeType.class)))
.thenReturn(asyncRequest);

View File

@ -18,7 +18,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* @author Artem Zatsarynnyi

View File

@ -12,10 +12,10 @@ package org.eclipse.che.ide.projectimport.wizard;
import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL;
import static org.eclipse.che.ide.api.notification.StatusNotification.Status.SUCCESS;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -10,8 +10,8 @@
*/
package org.eclipse.che.ide.projectimport.wizard;
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.Mockito.verify;
import static org.mockito.Mockito.when;
@ -31,7 +31,7 @@ import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* @author Dmitry Shnurenko

View File

@ -10,9 +10,9 @@
*/
package org.eclipse.che.ide.projectimport.zip;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@ -28,7 +28,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Testing {@link ZipImporterPagePresenter} functionality.

View File

@ -17,7 +17,7 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** @author Artem Zatsarynnyi */
@RunWith(MockitoJUnitRunner.class)

View File

@ -13,8 +13,8 @@ package org.eclipse.che.ide.projecttype.wizard;
import static org.eclipse.che.ide.api.project.type.wizard.ProjectWizardMode.CREATE;
import static org.eclipse.che.ide.api.project.type.wizard.ProjectWizardMode.IMPORT;
import static org.eclipse.che.ide.api.project.type.wizard.ProjectWizardMode.UPDATE;
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.Mockito.verify;
import static org.mockito.Mockito.when;
@ -43,7 +43,7 @@ import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Testing {@link ProjectWizard}.

View File

@ -25,7 +25,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** @author Dmitry Shnurenko */
@RunWith(MockitoJUnitRunner.class)

View File

@ -10,10 +10,10 @@
*/
package org.eclipse.che.ide.search;
import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -13,8 +13,8 @@ package org.eclipse.che.ide.search.presentation;
import static java.util.Collections.emptyList;
import static org.eclipse.che.ide.search.FullTextSearchPresenter.SEARCH_RESULT_ITEMS;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
@ -41,7 +41,6 @@ import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.InjectMocks;
import org.mockito.Matchers;
import org.mockito.Mock;
/**
@ -74,7 +73,7 @@ public class FindResultPresenterTest {
}
when(projectServiceClient.search(queryExpression)).thenReturn(searchResultPromise);
when(searchResultPromise.then(Matchers.<Operation<SearchResult>>any()))
when(searchResultPromise.then(org.mockito.ArgumentMatchers.<Operation<SearchResult>>any()))
.thenReturn(searchResultPromise);
when(result.getItemReferences()).thenReturn(items);
}

View File

@ -25,7 +25,6 @@ import org.eclipse.che.ide.ui.smartTree.data.settings.SettingsProvider;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Matchers;
import org.mockito.Mock;
/**
@ -47,7 +46,7 @@ public class SelectPathPresenterTest {
public void windowShouldBeShown() throws Exception {
when(appContext.getProjects()).thenReturn(new Project[0]);
selectPathPresenter.show(searcher);
verify(view).setStructure(Matchers.<List<Node>>any());
verify(view).setStructure(org.mockito.ArgumentMatchers.<List<Node>>any());
verify(view).show();
}

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.selection;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
@ -33,7 +33,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
import org.vectomatic.dom.svg.ui.SVGResource;
/**

View File

@ -11,8 +11,8 @@
package org.eclipse.che.ide.statepersistance;
import static org.fest.assertions.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

View File

@ -10,8 +10,8 @@
*/
package org.eclipse.che.ide.upload.file;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.anyObject;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.workspace;
import static org.fest.assertions.Assertions.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ -33,7 +33,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/**
* Unit tests for the {@link org.eclipse.che.ide.workspace.WorkspacePresenter}.

View File

@ -11,7 +11,7 @@
package org.eclipse.che.ide.ui.dialogs.confirm;
import static org.eclipse.che.ide.ui.dialogs.confirm.ConfirmDialogView.ActionDelegate;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import org.eclipse.che.ide.ui.dialogs.BaseTest;

View File

@ -10,9 +10,9 @@
*/
package org.eclipse.che.ide.ui.dialogs.input;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;

View File

@ -10,7 +10,7 @@
*/
package org.eclipse.che.ide.ui.dialogs.input;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import org.eclipse.che.ide.ui.UILocalizationConstant;

View File

@ -10,7 +10,7 @@
*/
package org.eclipse.che.ide.ui.dialogs.message;
import static org.mockito.Matchers.eq;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

View File

@ -10,8 +10,8 @@
*/
package org.eclipse.che.ide.jsonrpc;
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.Mockito.verify;
import static org.mockito.Mockito.when;
@ -26,7 +26,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.junit.MockitoJUnitRunner;
/** Tests for {@link JsonRpcErrorTransmitter} */
@RunWith(MockitoJUnitRunner.class)

Some files were not shown because too many files have changed in this diff Show More