From 3f262e620e793b158f35f0ba5684b14c855aaedc Mon Sep 17 00:00:00 2001 From: Florent BENOIT Date: Sat, 21 Oct 2017 09:07:43 +0200 Subject: [PATCH] Cleanup some Mockito deprecated usage (che6) (#6864) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- .../che/DashboardRedirectionFilterTest.java | 4 +- .../org/eclipse/che/api/core/PagesTest.java | 4 +- .../commons/JsonRpcMessageReceiverTest.java | 4 +- .../core/rest/DefaultHttpJsonRequestTest.java | 6 +- .../rest/RemoteServiceDescriptorTest.java | 2 +- .../core/util/CompositeLineConsumerTest.java | 4 +- .../api/core/util/FileLineConsumerTest.java | 4 +- .../ConcurrentCompositeLineConsumerTest.java | 4 +- .../ConcurrentFileLineConsumerTest.java | 4 +- .../BasicWebSocketMessageTransmitterTest.java | 4 +- .../websocket/impl/MessagesReSenderTest.java | 2 +- .../eclipse/che/inject/CheBootstrapTest.java | 2 +- .../filter/CheCacheDisablingFilterTest.java | 8 +-- .../che/filter/CheCacheForcingFilterTest.java | 10 ++-- .../che/commons/lang/ZipUtilsTest.java | 2 +- .../api/action/DefaultActionGroupTest.java | 2 +- ...oseCStyleCommentChangeInterceptorTest.java | 2 +- .../api/wizard/AbstractWizardPageTest.java | 2 +- .../ide/api/wizard/AbstractWizardTest.java | 4 +- .../che/ide/actions/ActionManagerTest.java | 2 +- .../ConvertFolderToProjectActionTest.java | 2 +- .../che/ide/actions/DownloadWsActionTest.java | 4 +- .../ide/actions/FullTextSearchActionTest.java | 2 +- .../ide/actions/LinkWithEditorActionTest.java | 4 +- .../che/ide/actions/RenameItemActionTest.java | 2 +- .../che/ide/actions/RunCommandActionTest.java | 6 +- .../common/CollapseTreeActionTest.java | 2 +- .../actions/common/ExpandTreeActionTest.java | 2 +- .../editor/CommandEditorProviderTest.java | 2 +- .../ide/command/editor/CommandEditorTest.java | 8 +-- .../editor/page/goal/GoalPageTest.java | 10 ++-- .../page/goal/GoalPageViewImplTest.java | 2 +- .../editor/page/name/NamePageTest.java | 4 +- .../page/name/NamePageViewImplTest.java | 2 +- .../editor/page/project/ProjectsPageTest.java | 2 +- .../project/ProjectsPageViewImplTest.java | 4 +- .../CommandsExplorerPresenterTest.java | 10 ++-- .../palette/CommandsPalettePresenterTest.java | 7 +-- .../ShowCommandsPaletteActionTest.java | 2 +- .../commands/ExecuteCommandPresenterTest.java | 6 +- .../commands/button/AbstractMenuItemTest.java | 2 +- .../commands/button/CommandItemTest.java | 2 +- ...ExecuteCommandButtonItemsProviderTest.java | 4 +- .../commands/button/MachineItemTest.java | 2 +- .../toolbar/previews/PreviewUrlTest.java | 2 +- .../type/custom/CustomCommandTypeTest.java | 2 +- .../type/custom/CustomPagePresenterTest.java | 4 +- .../EditorCurrentFileBaseNameMacroTest.java | 4 +- .../macro/EditorCurrentFileNameMacroTest.java | 4 +- .../macro/EditorCurrentFilePathMacroTest.java | 4 +- ...ditorCurrentFileRelativePathMacroTest.java | 4 +- .../EditorCurrentProjectNameMacroTest.java | 4 +- .../EditorCurrentProjectTypeMacroTest.java | 4 +- .../EditorContentSynchronizerImplTest.java | 9 +-- .../EditorGroupSynchronizationImplTest.java | 19 +++--- .../che/ide/macro/WorkspaceNameMacroTest.java | 4 +- .../NavigateToFilePresenterTest.java | 6 +- .../AbstractNewResourceActionTest.java | 6 +- .../ide/newresource/NewFolderActionTest.java | 6 +- .../NotificationManagerImplTest.java | 4 +- .../che/ide/part/PartStackPresenterTest.java | 6 +- .../che/ide/part/PartStackViewImplTest.java | 2 +- .../che/ide/part/TestFocusManager.java | 2 +- .../editor/EditorPartStackPresenterTest.java | 19 +++--- .../EditorMultiPartStackPresenterTest.java | 11 ++-- .../ExplorerCurrentFileBaseNameMacroTest.java | 2 +- .../ExplorerCurrentFileNameMacroTest.java | 2 +- ...xplorerCurrentFileParentPathMacroTest.java | 2 +- .../ExplorerCurrentFilePathMacroTest.java | 2 +- ...lorerCurrentFileRelativePathMacroTest.java | 2 +- .../ExplorerCurrentProjectNameMacroTest.java | 2 +- .../ExplorerCurrentProjectTypeMacroTest.java | 2 +- .../ProjectConfigSynchronizedTest.java | 11 ++-- .../AbstractPerspectivePersistenceTest.java | 12 ++-- .../general/AbstractPerspectiveTest.java | 10 ++-- .../general/PerspectiveManagerTest.java | 2 +- .../project/ProjectPerspectiveTest.java | 10 ++-- .../editortab/EditorTabWidgetTest.java | 3 +- .../ide/processes/NewTerminalActionTest.java | 2 +- .../ContextBasedRuntimeInfoProviderTest.java | 2 +- .../ide/project/ProjectServiceClientTest.java | 3 +- .../wizard/ImportWizardTest.java | 2 +- ...rojectImportOutputJsonRpcNotifierTest.java | 6 +- .../wizard/ProjectImporterTest.java | 6 +- .../zip/ZipImporterPagePresenterTest.java | 6 +- .../BlankProjectWizardRegistrarTest.java | 2 +- .../projecttype/wizard/ProjectWizardTest.java | 6 +- .../reference/ShowReferencePresenterTest.java | 2 +- .../search/FullTextSearchPresenterTest.java | 6 +- .../presentation/FindResultPresenterTest.java | 7 +-- .../selectpath/SelectPathPresenterTest.java | 3 +- .../che/ide/selection/TestSelectionAgent.java | 4 +- .../statepersistance/AppStateManagerTest.java | 2 +- .../upload/file/UploadFileViewImplTest.java | 4 +- .../WorkspacePresenterPersistenceTest.java | 4 +- .../confirm/ConfirmDialogViewTest.java | 2 +- .../input/InputDialogPresenterTest.java | 4 +- .../ui/dialogs/input/InputDialogViewTest.java | 2 +- .../message/MessageDialogViewTest.java | 2 +- .../jsonrpc/JsonRpcErrorTransmitterTest.java | 6 +- .../WebSocketJsonRpcInitializerTest.java | 2 +- .../impl/BasicWebSocketEndpointTest.java | 2 +- .../BasicWebSocketMessageTransmitterTest.java | 4 +- .../websocket/impl/MessagesReSenderTest.java | 6 +- .../impl/WebSocketConnectionManagerTest.java | 2 +- .../WebSocketConnectionSustainerTest.java | 2 +- .../impl/WebSocketDispatcherTest.java | 2 +- .../impl/WebSocketInitializerTest.java | 2 +- .../impl/WebSocketPropertyManagerTest.java | 2 +- .../DockerConnectorConfigurationTest.java | 2 +- .../docker/client/DockerConnectorTest.java | 26 +++++---- ...DockerRegistryCredentialsProviderTest.java | 2 +- .../docker/DockerInternalRuntimeTest.java | 2 +- .../container/DockerContainersTest.java | 2 +- ...LocalCheInfrastructureProvisionerTest.java | 2 +- .../ProjectsVolumeProvisionerTest.java | 2 +- ...alProjectsFolderOnWorkspaceRemoveTest.java | 2 +- .../ToolingServersEnvVarsProvisionerTest.java | 4 +- ...penShiftInfrastructureProvisionerTest.java | 2 +- .../OpenShiftInternalRuntimeTest.java | 6 +- .../OpenShiftEnvironmentParserTest.java | 2 +- .../RemoveProjectOnWorkspaceRemoveTest.java | 2 +- .../server/HttpPermissionCheckerImplTest.java | 6 +- .../server/PermissionCheckerImplTest.java | 4 +- .../server/HttpPermissionCheckerImplTest.java | 6 +- .../api/OrganizationManagerTest.java | 12 ++-- .../api/OrganizationServiceTest.java | 8 +-- .../OrganizationEmailNotificationsTest.java | 2 +- ...ganizationNotificationEmailSenderTest.java | 4 +- .../OrganizationPermissionsFilterTest.java | 8 +-- ...tributionServicePermissionsFilterTest.java | 8 +-- ...zationalAccountPermissionsCheckerTest.java | 2 +- ...ationResourcesDistributionServiceTest.java | 6 +- .../OrganizationResourcesDistributorTest.java | 8 +-- ...AccountAvailableResourcesProviderTest.java | 14 ++--- .../SuborganizationResourcesProviderTest.java | 4 +- .../AdminPermissionInitializerTest.java | 8 +-- .../server/PermissionsManagerTest.java | 8 +-- .../filter/GetPermissionsFilterTest.java | 8 +-- .../filter/RemovePermissionsFilterTest.java | 6 +- .../filter/SetPermissionsFilterTest.java | 4 +- .../resource/api/ResourceAggregatorTest.java | 4 +- .../api/free/FreeResourceManagerTest.java | 4 +- .../free/FreeResourcesLimitServiceTest.java | 4 +- .../free/FreeResourcesLimitValidatorTest.java | 2 +- .../license/AccountLicenseManagerTest.java | 4 +- ...ntLicenseServicePermissionsFilterTest.java | 4 +- .../license/AccountLicenseServiceTest.java | 2 +- ...DefaultAvailableResourcesProviderTest.java | 4 +- .../api/usage/ResourceUsageServiceTest.java | 4 +- .../tracker/EnvironmentRamCalculatorTest.java | 2 +- .../tracker/RamResourceUsageTrackerTest.java | 8 +-- .../RuntimeResourceUsageTrackerTest.java | 8 +-- .../WorkspaceResourceUsageTrackerTest.java | 8 +-- .../LimitsCheckingWorkspaceManagerTest.java | 6 +- ...emoveFreeResourcesLimitSubscriberTest.java | 2 +- .../agent/MachineLoginFilterTest.java | 4 +- .../server/MachineTokenInterceptorTest.java | 2 +- .../MachineTokenPermissionsFilterTest.java | 4 +- .../factory/FactoryPermissionsFilterTest.java | 4 +- ...rcesLimitServicePermissionsFilterTest.java | 4 +- ...urceUsageServicePermissionsFilterTest.java | 2 +- .../SystemServicePermissionsFilterTest.java | 2 +- .../UserServicePermissionsFilterTest.java | 6 +- .../filters/StackPermissionsFilterTest.java | 27 ++++----- .../WorkspacePermissionsFilterTest.java | 8 +-- .../StackCreatorPermissionsProviderTest.java | 2 +- .../ActivityPermissionsFilterTest.java | 4 +- .../WorkspaceActivityManagerTest.java | 2 +- .../WorkspaceActivityServiceTest.java | 4 +- .../debugger/ide/ChangeVariableValueTest.java | 8 +-- .../debugger/ide/EvaluateExpressionTest.java | 12 ++-- .../debugger/ide/actions/DebugActionTest.java | 2 +- .../DebugConfigurationActionTest.java | 2 +- .../DebugConfigurationsGroupTest.java | 2 +- .../DebugConfigurationsManagerImplTest.java | 8 +-- .../ide/debug/DebuggerPresenterTest.java | 4 +- .../debugger/ide/debug/DebuggerTest.java | 8 +-- .../GdbConfigurationPagePresenterTest.java | 4 +- .../che/ide/ext/git/client/BaseTest.java | 4 +- .../git/client/BranchFilterByRemoteTest.java | 2 +- .../client/add/AddToIndexPresenterTest.java | 8 +-- .../client/branch/BranchPresenterTest.java | 12 ++-- .../checkout/CheckoutReferenceTest.java | 8 +-- .../client/commit/CommitPresenterTest.java | 14 ++--- .../git/client/fetch/FetchPresenterTest.java | 10 ++-- .../client/history/HistoryPresenterTest.java | 12 ++-- .../page/GitImporterPagePresenterTest.java | 6 +- .../init/InitRepositoryPresenterTest.java | 10 ++-- .../git/client/merge/MergePresenterTest.java | 8 +-- .../CommitterPreferencePresenterTest.java | 4 +- .../add/AddRemoteRepositoryPresenterTest.java | 8 +-- .../reset/files/ResetFilesPresenterTest.java | 10 ++-- .../commit/RevertCommitPresenterTest.java | 10 ++-- .../status/StatusCommandPresenterTest.java | 6 +- .../GithubFactoryParametersResolverTest.java | 6 +- .../GitHubAuthenticatorImplTest.java | 22 ++++--- .../page/GithubImporterPagePresenterTest.java | 19 +++--- .../client/command/GwtCommandTypeTest.java | 2 +- .../client/command/GwtPagePresenterTest.java | 4 +- ...vaDebugConfigurationPagePresenterTest.java | 2 +- .../command/ClasspathContainerTest.java | 4 +- .../command/JavaCommandPagePresenterTest.java | 2 +- .../valueproviders/ClasspathMacroTest.java | 4 +- .../valueproviders/OutputDirMacroTest.java | 2 +- .../valueproviders/SourcepathMacroTest.java | 4 +- .../editor/JavaReconcilerStrategyTest.java | 10 ++-- .../FormatterPreferencePagePresenterTest.java | 8 +-- .../FileStructurePresenterTest.java | 20 ++++--- .../OpenImplementationPresenterTest.java | 8 +-- .../OrganizeImportsPresenterTest.java | 19 +++--- .../move/CutJavaSourceActionTest.java | 2 +- .../move/wizard/MovePresenterTest.java | 15 ++--- .../preview/PreviewPresenterTest.java | 6 +- .../rename/JavaRefactoringRenameTest.java | 26 ++++----- .../rename/wizard/RenamePresenterTest.java | 36 +++++++----- .../JavaCompilerPreferencePresenterTest.java | 15 ++--- .../property/PropertyNameManagerTest.java | 2 +- .../property/PropertyWidgetImplTest.java | 4 +- .../main/java/com/codenvy/test/MyClass.java | 2 +- .../test/java/com/codenvy/testtest/Test.java | 2 +- .../resolve/src/ResolveArrayLength.java | 2 +- .../workspace/resolve/src/ResolveClass1.java | 2 +- .../workspace/resolve/src/ResolveClass2.java | 2 +- .../workspace/resolve/src/ResolveClass3.java | 2 +- .../workspace/resolve/src/ResolveClass4.java | 2 +- .../workspace/resolve/src/ResolveClass5.java | 2 +- .../workspace/resolve/src/ResolveClass6.java | 2 +- .../resolve/src/ResolveConstructor.java | 2 +- .../ResolveExplicitSuperConstructorCall.java | 2 +- .../ResolveExplicitThisConstructorCall.java | 2 +- .../workspace/resolve/src/ResolveField.java | 2 +- .../src/ResolveInnerClassAsParamater.java | 2 +- .../resolve/src/ResolveInterface.java | 2 +- .../resolve/src/ResolveLocalClass1.java | 2 +- .../resolve/src/ResolveLocalClass2.java | 2 +- .../resolve/src/ResolveLocalClass3.java | 2 +- .../resolve/src/ResolveLocalClass4.java | 2 +- .../resolve/src/ResolveLocalClass5.java | 2 +- .../resolve/src/ResolveLocalClass6.java | 2 +- .../resolve/src/ResolveLocalClass7.java | 2 +- .../resolve/src/ResolveLocalConstructor.java | 2 +- .../resolve/src/ResolveLocalField.java | 2 +- .../resolve/src/ResolveLocalField2.java | 2 +- .../src/ResolveLocalFieldDeclaration.java | 2 +- .../resolve/src/ResolveLocalMethod.java | 2 +- .../resolve/src/ResolveLocalMethod2.java | 2 +- .../resolve/src/ResolveLocalName.java | 2 +- .../src/ResolveMessageSendOnBaseType.java | 2 +- .../src/ResolveTypeEmptySelection.java | 2 +- .../src/ResolveTypeEmptySelection2.java | 2 +- .../resolve/src/ResolveTypeInComment.java | 2 +- .../workspace/resolve/src2/test0001/Test.java | 2 +- .../workspace/resolve/src2/test0002/Test.java | 2 +- .../workspace/resolve/src2/test0003/Test.java | 2 +- .../workspace/resolve/src2/test0005/Test.java | 2 +- .../RenameMethodInInterface/test0/in/A.java | 2 +- .../RenameMethodInInterface/test0/out/A.java | 2 +- .../RenameMethodInInterface/test1/in/A.java | 2 +- .../RenameMethodInInterface/test1/out/A.java | 2 +- .../RenameMethodInInterface/test10/in/A.java | 2 +- .../RenameMethodInInterface/test10/out/A.java | 2 +- .../RenameMethodInInterface/test11/in/A.java | 2 +- .../RenameMethodInInterface/test11/out/A.java | 2 +- .../RenameMethodInInterface/test12/in/A.java | 2 +- .../RenameMethodInInterface/test12/out/A.java | 2 +- .../RenameMethodInInterface/test15/in/A.java | 2 +- .../RenameMethodInInterface/test15/out/A.java | 2 +- .../RenameMethodInInterface/test16/in/A.java | 2 +- .../RenameMethodInInterface/test16/out/A.java | 2 +- .../RenameMethodInInterface/test17/in/A.java | 2 +- .../RenameMethodInInterface/test17/out/A.java | 2 +- .../RenameMethodInInterface/test18/in/A.java | 2 +- .../RenameMethodInInterface/test18/out/A.java | 2 +- .../RenameMethodInInterface/test2/in/A.java | 2 +- .../RenameMethodInInterface/test2/out/A.java | 2 +- .../RenameMethodInInterface/test20/in/A.java | 2 +- .../RenameMethodInInterface/test20/out/A.java | 2 +- .../RenameMethodInInterface/test21/in/A.java | 2 +- .../RenameMethodInInterface/test21/out/A.java | 2 +- .../RenameMethodInInterface/test22/in/A.java | 2 +- .../RenameMethodInInterface/test22/out/A.java | 2 +- .../RenameMethodInInterface/test24/in/A.java | 2 +- .../RenameMethodInInterface/test24/out/A.java | 2 +- .../RenameMethodInInterface/test25/in/A.java | 2 +- .../RenameMethodInInterface/test25/out/A.java | 2 +- .../RenameMethodInInterface/test26/in/A.java | 2 +- .../RenameMethodInInterface/test26/out/A.java | 2 +- .../RenameMethodInInterface/test28/in/A.java | 2 +- .../RenameMethodInInterface/test28/out/A.java | 2 +- .../RenameMethodInInterface/test29/in/A.java | 2 +- .../RenameMethodInInterface/test29/out/A.java | 2 +- .../RenameMethodInInterface/test3/in/A.java | 2 +- .../RenameMethodInInterface/test3/out/A.java | 2 +- .../RenameMethodInInterface/test30/in/A.java | 2 +- .../RenameMethodInInterface/test30/out/A.java | 2 +- .../RenameMethodInInterface/test31/in/A.java | 2 +- .../RenameMethodInInterface/test31/out/A.java | 2 +- .../RenameMethodInInterface/test32/in/A.java | 2 +- .../RenameMethodInInterface/test32/out/A.java | 2 +- .../RenameMethodInInterface/test33/in/A.java | 2 +- .../RenameMethodInInterface/test33/out/A.java | 2 +- .../RenameMethodInInterface/test34/in/A.java | 2 +- .../RenameMethodInInterface/test34/out/A.java | 2 +- .../RenameMethodInInterface/test35/in/A.java | 2 +- .../RenameMethodInInterface/test35/out/A.java | 2 +- .../RenameMethodInInterface/test36/in/A.java | 2 +- .../RenameMethodInInterface/test36/out/A.java | 2 +- .../RenameMethodInInterface/test37/in/A.java | 2 +- .../RenameMethodInInterface/test37/out/A.java | 2 +- .../RenameMethodInInterface/test38/in/A.java | 2 +- .../RenameMethodInInterface/test38/out/A.java | 2 +- .../RenameMethodInInterface/test39/in/A.java | 2 +- .../RenameMethodInInterface/test39/out/A.java | 2 +- .../RenameMethodInInterface/test4/in/A.java | 2 +- .../RenameMethodInInterface/test4/out/A.java | 2 +- .../RenameMethodInInterface/test40/in/A.java | 2 +- .../RenameMethodInInterface/test40/out/A.java | 2 +- .../RenameMethodInInterface/test41/in/A.java | 2 +- .../RenameMethodInInterface/test41/out/A.java | 2 +- .../RenameMethodInInterface/test42/in/A.java | 2 +- .../RenameMethodInInterface/test42/out/A.java | 2 +- .../RenameMethodInInterface/test43/in/A.java | 2 +- .../RenameMethodInInterface/test43/out/A.java | 2 +- .../RenameMethodInInterface/test44/in/A.java | 2 +- .../RenameMethodInInterface/test44/out/A.java | 2 +- .../RenameMethodInInterface/test45/in/A.java | 2 +- .../RenameMethodInInterface/test45/out/A.java | 2 +- .../RenameMethodInInterface/test46/in/A.java | 2 +- .../RenameMethodInInterface/test46/out/A.java | 2 +- .../RenameMethodInInterface/test5/in/A.java | 2 +- .../RenameMethodInInterface/test5/out/A.java | 2 +- .../RenameMethodInInterface/test6/in/A.java | 2 +- .../RenameMethodInInterface/test6/out/A.java | 2 +- .../RenameMethodInInterface/test7/in/A.java | 2 +- .../RenameMethodInInterface/test7/out/A.java | 2 +- .../testAnnotation2/in/A.java | 2 +- .../testAnnotation2/out/A.java | 2 +- .../testAnnotation4/in/A.java | 2 +- .../testAnnotation4/out/A.java | 2 +- .../testFail0/in/A.java | 2 +- .../testFail1/in/A.java | 2 +- .../testFail10/in/A.java | 2 +- .../testFail11/in/A.java | 2 +- .../testFail12/in/A.java | 2 +- .../testFail13/in/A.java | 2 +- .../testFail14/in/A.java | 2 +- .../testFail15/in/A.java | 2 +- .../testFail16/in/A.java | 2 +- .../testFail17/in/A.java | 2 +- .../testFail18/in/A.java | 2 +- .../testFail19/in/A.java | 2 +- .../testFail21/in/A.java | 2 +- .../testFail22/in/A.java | 2 +- .../testFail23/in/A.java | 2 +- .../testFail24/in/A.java | 2 +- .../testFail25/in/A.java | 2 +- .../testFail26/in/A.java | 2 +- .../testFail27/in/A.java | 2 +- .../testFail28/in/A.java | 2 +- .../testFail29/in/A.java | 2 +- .../testFail30/in/A.java | 2 +- .../testFail31/in/A.java | 2 +- .../testFail32/in/A.java | 2 +- .../testFail33/in/A.java | 2 +- .../testFail34/in/A.java | 2 +- .../testFail35/in/A.java | 2 +- .../testFail36/in/A.java | 2 +- .../testFail37/in/A.java | 2 +- .../testFail38/in/A.java | 2 +- .../testFail39/in/A.java | 2 +- .../testFail40/in/A.java | 2 +- .../testFail41/in/A.java | 2 +- .../testFail42/in/A.java | 2 +- .../testFail43/in/A.java | 2 +- .../testFail44/in/A.java | 2 +- .../testFail45/in/A.java | 2 +- .../testFail7/in/A.java | 2 +- .../testFail8/in/A.java | 2 +- .../RenameNonPrivateField/test0/in/A.java | 2 +- .../RenameNonPrivateField/test0/out/A.java | 2 +- .../RenameNonPrivateField/test1/in/A.java | 2 +- .../RenameNonPrivateField/test1/out/A.java | 2 +- .../RenameNonPrivateField/test10/in/A.java | 2 +- .../RenameNonPrivateField/test10/out/A.java | 2 +- .../RenameNonPrivateField/test11/in/A.java | 2 +- .../RenameNonPrivateField/test11/out/A.java | 2 +- .../RenameNonPrivateField/test12/in/A.java | 2 +- .../RenameNonPrivateField/test12/out/A.java | 2 +- .../RenameNonPrivateField/test13/in/A.java | 2 +- .../RenameNonPrivateField/test13/out/A.java | 2 +- .../RenameNonPrivateField/test14/in/A.java | 2 +- .../RenameNonPrivateField/test14/out/A.java | 2 +- .../RenameNonPrivateField/test15/in/A.java | 2 +- .../RenameNonPrivateField/test15/out/A.java | 2 +- .../RenameNonPrivateField/test16/in/A.java | 2 +- .../RenameNonPrivateField/test16/out/A.java | 2 +- .../RenameNonPrivateField/test17/in/A.java | 2 +- .../RenameNonPrivateField/test17/out/A.java | 2 +- .../RenameNonPrivateField/test18/in/A.java | 2 +- .../RenameNonPrivateField/test18/out/A.java | 2 +- .../RenameNonPrivateField/test19/in/A.java | 2 +- .../RenameNonPrivateField/test19/out/A.java | 2 +- .../RenameNonPrivateField/test2/in/A.java | 2 +- .../RenameNonPrivateField/test2/out/A.java | 2 +- .../RenameNonPrivateField/test20/in/A.java | 2 +- .../RenameNonPrivateField/test20/out/A.java | 2 +- .../RenameNonPrivateField/test21/in/A.java | 2 +- .../RenameNonPrivateField/test21/out/A.java | 2 +- .../RenameNonPrivateField/test22/in/A.java | 2 +- .../RenameNonPrivateField/test22/out/A.java | 2 +- .../RenameNonPrivateField/test23/in/A.java | 2 +- .../RenameNonPrivateField/test23/out/A.java | 2 +- .../RenameNonPrivateField/test3/in/A.java | 2 +- .../RenameNonPrivateField/test3/out/A.java | 2 +- .../RenameNonPrivateField/test4/in/A.java | 2 +- .../RenameNonPrivateField/test4/out/A.java | 2 +- .../RenameNonPrivateField/test5/in/A.java | 2 +- .../RenameNonPrivateField/test5/out/A.java | 2 +- .../RenameNonPrivateField/test6/in/A.java | 2 +- .../RenameNonPrivateField/test6/out/A.java | 2 +- .../RenameNonPrivateField/test7/in/A.java | 2 +- .../RenameNonPrivateField/test7/out/A.java | 2 +- .../RenameNonPrivateField/test8/in/A.java | 2 +- .../RenameNonPrivateField/test8/out/A.java | 2 +- .../RenameNonPrivateField/test9/in/A.java | 2 +- .../RenameNonPrivateField/test9/out/A.java | 2 +- .../testAnnotation1/in/A.java | 2 +- .../testAnnotation1/out/A.java | 2 +- .../testEnumField/in/A.java | 2 +- .../testEnumField/out/A.java | 2 +- .../RenameNonPrivateField/testFail0/in/A.java | 2 +- .../RenameNonPrivateField/testFail1/in/A.java | 2 +- .../testFail10/in/A.java | 2 +- .../testFail11/in/A.java | 2 +- .../testFail12/in/A.java | 2 +- .../testFail13/in/A.java | 2 +- .../testFail14/in/A.java | 2 +- .../RenameNonPrivateField/testFail2/in/A.java | 2 +- .../RenameNonPrivateField/testFail3/in/A.java | 2 +- .../RenameNonPrivateField/testFail4/in/A.java | 2 +- .../RenameNonPrivateField/testFail5/in/A.java | 2 +- .../RenameNonPrivateField/testFail6/in/A.java | 2 +- .../RenameNonPrivateField/testFail7/in/A.java | 2 +- .../RenameNonPrivateField/testFail8/in/A.java | 2 +- .../RenameNonPrivateField/testFail9/in/A.java | 2 +- .../testGenerics1/in/A.java | 2 +- .../testGenerics1/out/A.java | 2 +- .../testGenerics3/in/A.java | 2 +- .../testGenerics3/out/A.java | 2 +- .../testRenameNLSAccessor01/in/A.java | 2 +- .../testRenameNLSAccessor01/out/A.java | 2 +- .../resources/RenamePackage/test0/in/r/A.java | 2 +- .../RenamePackage/test0/out/p1/A.java | 2 +- .../resources/RenamePackage/test1/in/r/A.java | 2 +- .../RenamePackage/test1/out/p1/A.java | 2 +- .../RenamePackage/test2/in/fred/A.java | 2 +- .../resources/RenamePackage/test2/in/r/A.java | 2 +- .../RenamePackage/test2/out/fred/A.java | 2 +- .../RenamePackage/test2/out/p1/A.java | 2 +- .../RenamePackage/test3/in/fred/A.java | 2 +- .../RenamePackage/test3/in/r/r/B.java | 2 +- .../RenamePackage/test3/out/r/A.java | 2 +- .../RenamePackage/test3/out/r/r/B.java | 2 +- .../resources/RenamePackage/test4/in/r/A.java | 2 +- .../RenamePackage/test4/in/r/p1/A.java | 2 +- .../RenamePackage/test4/out/q/A.java | 2 +- .../RenamePackage/test4/out/r/A.java | 2 +- .../resources/RenamePackage/test5/in/r/A.java | 2 +- .../RenamePackage/test5/out/p1/A.java | 2 +- .../resources/RenamePackage/test6/in/r/A.java | 2 +- .../RenamePackage/test6/out/p1/A.java | 2 +- .../resources/RenamePackage/test7/in/r/A.java | 2 +- .../RenamePackage/test7/in/r/s/B.java | 2 +- .../RenamePackage/test7/out/q/A.java | 2 +- .../RenamePackage/test7/out/r/s/B.java | 2 +- .../RenamePackage/testFail0/in/r/A.java | 2 +- .../RenamePackage/testFail1/in/r/p1/A.java | 2 +- .../RenamePackage/testFail10/in/r/A.java | 2 +- .../RenamePackage/testFail10/in/r/p1/A.java | 2 +- .../RenamePackage/testFail3/in/r/A.java | 2 +- .../RenamePackage/testFail4/in/r/A.java | 2 +- .../RenamePackage/testFail5/in/r/A.java | 2 +- .../RenamePackage/testFail6/in/r/A.java | 2 +- .../RenamePackage/testFail7/in/p1/A.java | 2 +- .../RenamePackage/testFail7/in/r/A.java | 2 +- .../RenamePackage/testFail8/in/p1/A.java | 2 +- .../RenamePackage/testFail8/in/r/A.java | 2 +- .../RenamePackage/testFail9/in/p1/A.java | 2 +- .../RenamePackage/testFail9/in/r/A.java | 2 +- .../testHierarchical02/in/your/Y.java | 2 +- .../testHierarchical03/in/my/pack/C.java | 2 +- .../testHierarchical03/out/your/pack/C.java | 2 +- .../in/my/pack/C.java | 2 +- .../out/your/pack/C.java | 2 +- .../RenamePackage/testReadOnly/in/r/A.java | 2 +- .../RenamePackage/testReadOnly/out/p1/A.java | 2 +- .../RenamePackage/testStatic1/in/s1/B.java | 2 +- .../RenamePackage/testStatic1/out/s1/B.java | 2 +- .../testToEmptyPack/in/r/p1/A.java | 2 +- .../testToEmptyPack/out/fred/A.java | 2 +- .../RenameParameters/canRename/A_in.java | 2 +- .../RenameParameters/canRename/A_out.java | 2 +- .../canRename/A_test0_in.java | 2 +- .../canRename/A_test0_out.java | 2 +- .../canRename/A_test10_in.java | 2 +- .../canRename/A_test10_out.java | 2 +- .../canRename/A_test11_in.java | 2 +- .../canRename/A_test11_out.java | 2 +- .../canRename/A_test12_in.java | 2 +- .../canRename/A_test12_out.java | 2 +- .../canRename/A_test13_in.java | 2 +- .../canRename/A_test13_out.java | 2 +- .../canRename/A_test14_in.java | 2 +- .../canRename/A_test14_out.java | 2 +- .../canRename/A_test15_in.java | 2 +- .../canRename/A_test15_out.java | 2 +- .../canRename/A_test16_in.java | 2 +- .../canRename/A_test16_out.java | 2 +- .../canRename/A_test17_in.java | 2 +- .../canRename/A_test17_out.java | 2 +- .../canRename/A_test18_in.java | 2 +- .../canRename/A_test18_out.java | 2 +- .../canRename/A_test19_in.java | 2 +- .../canRename/A_test19_out.java | 2 +- .../canRename/A_test1_in.java | 2 +- .../canRename/A_test1_out.java | 2 +- .../canRename/A_test20_in.java | 2 +- .../canRename/A_test20_out.java | 2 +- .../canRename/A_test21_in.java | 2 +- .../canRename/A_test21_out.java | 2 +- .../canRename/A_test22_in.java | 2 +- .../canRename/A_test22_out.java | 2 +- .../canRename/A_test23_in.java | 2 +- .../canRename/A_test23_out.java | 2 +- .../canRename/A_test24_in.java | 2 +- .../canRename/A_test24_out.java | 2 +- .../canRename/A_test25_in.java | 2 +- .../canRename/A_test25_out.java | 2 +- .../canRename/A_test26_in.java | 2 +- .../canRename/A_test26_out.java | 2 +- .../canRename/A_test27_in.java | 2 +- .../canRename/A_test27_out.java | 2 +- .../canRename/A_test28_in.java | 2 +- .../canRename/A_test28_out.java | 2 +- .../canRename/A_test29_in.java | 2 +- .../canRename/A_test29_out.java | 2 +- .../canRename/A_test2_in.java | 2 +- .../canRename/A_test2_out.java | 2 +- .../canRename/A_test30_in.java | 2 +- .../canRename/A_test30_out.java | 2 +- .../canRename/A_test31_in.java | 2 +- .../canRename/A_test31_out.java | 2 +- .../canRename/A_test32_in.java | 2 +- .../canRename/A_test32_out.java | 2 +- .../canRename/A_test33_in.java | 2 +- .../canRename/A_test33_out.java | 2 +- .../canRename/A_test34_in.java | 2 +- .../canRename/A_test34_out.java | 2 +- .../canRename/A_test35_in.java | 2 +- .../canRename/A_test35_out.java | 2 +- .../canRename/A_test36_in.java | 2 +- .../canRename/A_test36_out.java | 2 +- .../canRename/A_test3_in.java | 2 +- .../canRename/A_test3_out.java | 2 +- .../canRename/A_test4_in.java | 2 +- .../canRename/A_test4_out.java | 2 +- .../canRename/A_test5_in.java | 2 +- .../canRename/A_test5_out.java | 2 +- .../canRename/A_test6_in.java | 2 +- .../canRename/A_test6_out.java | 2 +- .../canRename/A_test7_in.java | 2 +- .../canRename/A_test7_out.java | 2 +- .../canRename/A_test8_in.java | 2 +- .../canRename/A_test8_out.java | 2 +- .../canRename/A_test9_in.java | 2 +- .../canRename/A_test9_out.java | 2 +- .../cannotRename/A_testFail0.java | 2 +- .../cannotRename/A_testFail1.java | 2 +- .../cannotRename/A_testFail10.java | 2 +- .../cannotRename/A_testFail11.java | 2 +- .../cannotRename/A_testFail12.java | 2 +- .../cannotRename/A_testFail13.java | 2 +- .../cannotRename/A_testFail14.java | 2 +- .../cannotRename/A_testFail15.java | 2 +- .../cannotRename/A_testFail16.java | 2 +- .../cannotRename/A_testFail17.java | 2 +- .../cannotRename/A_testFail18.java | 2 +- .../cannotRename/A_testFail19.java | 2 +- .../cannotRename/A_testFail2.java | 2 +- .../cannotRename/A_testFail20.java | 2 +- .../cannotRename/A_testFail21.java | 2 +- .../cannotRename/A_testFail3.java | 2 +- .../cannotRename/A_testFail4.java | 2 +- .../cannotRename/A_testFail5.java | 2 +- .../cannotRename/A_testFail6.java | 2 +- .../cannotRename/A_testFail7.java | 2 +- .../cannotRename/A_testFail8.java | 2 +- .../cannotRename/A_testFail9.java | 2 +- .../RenamePrivateField/test0/in/A.java | 2 +- .../RenamePrivateField/test0/out/A.java | 2 +- .../RenamePrivateField/test1/in/A.java | 2 +- .../RenamePrivateField/test1/out/A.java | 2 +- .../RenamePrivateField/test2/in/A.java | 2 +- .../RenamePrivateField/test2/out/A.java | 2 +- .../RenamePrivateField/test3/in/A.java | 2 +- .../RenamePrivateField/test3/out/A.java | 2 +- .../RenamePrivateField/test4/in/A.java | 2 +- .../RenamePrivateField/test4/out/A.java | 2 +- .../RenamePrivateField/test5/in/A.java | 2 +- .../RenamePrivateField/test5/out/A.java | 2 +- .../RenamePrivateField/test6/in/A.java | 2 +- .../RenamePrivateField/test6/out/A.java | 2 +- .../RenamePrivateField/test7/in/A.java | 2 +- .../RenamePrivateField/test7/out/A.java | 2 +- .../RenamePrivateField/test8/in/A.java | 2 +- .../RenamePrivateField/test8/out/A.java | 2 +- .../RenamePrivateField/test9/in/A.java | 2 +- .../RenamePrivateField/test9/out/A.java | 2 +- .../RenamePrivateField/testFail0/in/A.java | 2 +- .../RenamePrivateField/testFail1/in/A.java | 2 +- .../RenamePrivateField/testFail10/in/A.java | 2 +- .../RenamePrivateField/testFail2/in/A.java | 2 +- .../RenamePrivateField/testFail3/in/A.java | 2 +- .../RenamePrivateField/testFail4/in/A.java | 2 +- .../RenamePrivateField/testFail5/in/A.java | 2 +- .../RenamePrivateField/testFail6/in/A.java | 2 +- .../RenamePrivateField/testFail7/in/A.java | 2 +- .../testUnicode01/in/A.java | 2 +- .../testUnicode01/out/A.java | 2 +- .../RenamePrivateMethod/test10/in/A.java | 2 +- .../RenamePrivateMethod/test10/out/A.java | 2 +- .../RenamePrivateMethod/test11/in/A.java | 2 +- .../RenamePrivateMethod/test11/out/A.java | 2 +- .../RenamePrivateMethod/test12/in/A.java | 2 +- .../RenamePrivateMethod/test12/out/A.java | 2 +- .../RenamePrivateMethod/test13/in/A.java | 2 +- .../RenamePrivateMethod/test13/out/A.java | 2 +- .../RenamePrivateMethod/test14/in/A.java | 2 +- .../RenamePrivateMethod/test14/out/A.java | 2 +- .../RenamePrivateMethod/test15/in/A.java | 2 +- .../RenamePrivateMethod/test15/out/A.java | 2 +- .../RenamePrivateMethod/test16/in/A.java | 2 +- .../RenamePrivateMethod/test16/out/A.java | 2 +- .../RenamePrivateMethod/test17/in/A.java | 2 +- .../RenamePrivateMethod/test17/out/A.java | 2 +- .../RenamePrivateMethod/test18/in/A.java | 2 +- .../RenamePrivateMethod/test18/in/C.java | 2 +- .../RenamePrivateMethod/test18/out/A.java | 2 +- .../RenamePrivateMethod/test18/out/C.java | 2 +- .../RenamePrivateMethod/test20/in/A.java | 2 +- .../RenamePrivateMethod/test20/out/A.java | 2 +- .../RenamePrivateMethod/test23/in/A.java | 2 +- .../RenamePrivateMethod/test23/out/A.java | 2 +- .../RenamePrivateMethod/test24/in/A.java | 2 +- .../RenamePrivateMethod/test24/out/A.java | 2 +- .../RenamePrivateMethod/test26/in/A.java | 2 +- .../RenamePrivateMethod/test26/out/A.java | 2 +- .../RenamePrivateMethod/test27/in/A.java | 2 +- .../RenamePrivateMethod/test27/out/A.java | 2 +- .../RenamePrivateMethod/testAnon0/in/A.java | 2 +- .../RenamePrivateMethod/testAnon0/out/A.java | 2 +- .../RenamePrivateMethod/testFail0/in/A.java | 2 +- .../RenamePrivateMethod/testFail1/in/A.java | 2 +- .../RenamePrivateMethod/testFail2/in/A.java | 2 +- .../RenamePrivateMethod/testFail5/in/A.java | 2 +- .../RenameStaticMethod/test0/in/A.java | 2 +- .../RenameStaticMethod/test0/out/A.java | 2 +- .../RenameStaticMethod/test1/in/A.java | 2 +- .../RenameStaticMethod/test1/out/A.java | 2 +- .../RenameStaticMethod/test10/in/A.java | 2 +- .../RenameStaticMethod/test10/out/A.java | 2 +- .../RenameStaticMethod/test11/in/A.java | 2 +- .../RenameStaticMethod/test11/out/A.java | 2 +- .../RenameStaticMethod/test2/in/A.java | 2 +- .../RenameStaticMethod/test2/out/A.java | 2 +- .../RenameStaticMethod/test3/in/A.java | 2 +- .../RenameStaticMethod/test3/out/A.java | 2 +- .../RenameStaticMethod/test4/in/A.java | 2 +- .../RenameStaticMethod/test4/out/A.java | 2 +- .../RenameStaticMethod/test6/in/A.java | 2 +- .../RenameStaticMethod/test6/out/A.java | 2 +- .../RenameStaticMethod/test7/in/A.java | 2 +- .../RenameStaticMethod/test7/out/A.java | 2 +- .../RenameStaticMethod/test8/in/A.java | 2 +- .../RenameStaticMethod/test8/out/A.java | 2 +- .../RenameStaticMethod/test9/in/A.java | 2 +- .../RenameStaticMethod/test9/out/A.java | 2 +- .../RenameStaticMethod/testFail0/in/A.java | 2 +- .../RenameStaticMethod/testFail1/in/A.java | 2 +- .../RenameStaticMethod/testFail2/in/A.java | 2 +- .../RenameStaticMethod/testFail4/in/A.java | 2 +- .../RenameStaticMethod/testFail5/in/A.java | 2 +- .../RenameStaticMethod/testFail6/in/A.java | 2 +- .../RenameStaticMethod/testFail7/in/A.java | 2 +- .../RenameStaticMethod/testFail8/in/A.java | 2 +- .../testStaticImport1/in/A.java | 2 +- .../testStaticImport1/out/A.java | 2 +- .../testStaticImport3/in/A.java | 2 +- .../testStaticImport3/out/A.java | 2 +- .../testStaticImport4/in/A.java | 2 +- .../testStaticImport4/out/A.java | 2 +- .../testStaticImport5/in/A.java | 2 +- .../testStaticImport5/out/A.java | 2 +- .../testStaticImportFail0/in/A.java | 2 +- .../RenameTests18/testLambda2/in/A.java | 2 +- .../RenameTests18/testLambda2/out/A.java | 2 +- .../RenameTests18/testMethod2/in/A.java | 2 +- .../RenameTests18/testMethod2/out/A.java | 2 +- .../testMethodReference0/in/A.java | 2 +- .../testMethodReference0/out/A.java | 2 +- .../test/resources/RenameType/test0/in/A.java | 2 +- .../resources/RenameType/test0/out/B.java | 2 +- .../test/resources/RenameType/test1/in/A.java | 2 +- .../resources/RenameType/test1/out/B.java | 2 +- .../resources/RenameType/test10/in/A.java | 2 +- .../resources/RenameType/test10/out/B.java | 2 +- .../resources/RenameType/test11/in/A.java | 2 +- .../resources/RenameType/test11/in/AA.java | 2 +- .../resources/RenameType/test11/out/AA.java | 2 +- .../resources/RenameType/test11/out/B.java | 2 +- .../resources/RenameType/test12/in/A.java | 2 +- .../resources/RenameType/test12/out/B.java | 2 +- .../resources/RenameType/test13/in/A.java | 2 +- .../resources/RenameType/test13/out/B.java | 2 +- .../resources/RenameType/test14/in/A.java | 2 +- .../resources/RenameType/test14/out/B.java | 2 +- .../resources/RenameType/test15/in/A.java | 2 +- .../resources/RenameType/test15/out/B.java | 2 +- .../resources/RenameType/test16/in/A.java | 2 +- .../resources/RenameType/test16/out/B.java | 2 +- .../resources/RenameType/test17/in/A.java | 2 +- .../resources/RenameType/test17/out/B.java | 2 +- .../resources/RenameType/test18/in/A.java | 2 +- .../resources/RenameType/test18/out/B.java | 2 +- .../test/resources/RenameType/test2/in/A.java | 2 +- .../resources/RenameType/test2/out/B.java | 2 +- .../resources/RenameType/test26/in/A.java | 2 +- .../resources/RenameType/test26/out/B.java | 2 +- .../resources/RenameType/test29/in/A.java | 2 +- .../resources/RenameType/test29/in/C.java | 2 +- .../resources/RenameType/test29/out/B.java | 2 +- .../resources/RenameType/test29/out/C.java | 2 +- .../test/resources/RenameType/test3/in/A.java | 2 +- .../resources/RenameType/test3/out/B.java | 2 +- .../resources/RenameType/test30/in/AA.java | 2 +- .../resources/RenameType/test30/out/AA.java | 2 +- .../resources/RenameType/test31/in/A.java | 2 +- .../resources/RenameType/test31/out/B.java | 2 +- .../resources/RenameType/test32/in/A.java | 2 +- .../resources/RenameType/test32/out/B.java | 2 +- .../resources/RenameType/test34/in/A.java | 2 +- .../resources/RenameType/test34/out/B.java | 2 +- .../resources/RenameType/test35/in/A.java | 2 +- .../resources/RenameType/test35/out/B.java | 2 +- .../resources/RenameType/test36/in/A.java | 2 +- .../resources/RenameType/test36/out/B.java | 2 +- .../resources/RenameType/test37/in/A.java | 2 +- .../resources/RenameType/test37/out/B.java | 2 +- .../resources/RenameType/test38/in/A.java | 2 +- .../resources/RenameType/test38/out/B.java | 2 +- .../resources/RenameType/test39/in/A.java | 2 +- .../resources/RenameType/test39/out/B.java | 2 +- .../resources/RenameType/test40/in/A.java | 2 +- .../resources/RenameType/test40/out/B.java | 2 +- .../resources/RenameType/test41/in/A.java | 2 +- .../resources/RenameType/test41/out/B.java | 2 +- .../resources/RenameType/test42/in/A.java | 2 +- .../resources/RenameType/test42/out/B.java | 2 +- .../resources/RenameType/test43/in/A.java | 2 +- .../resources/RenameType/test43/out/B.java | 2 +- .../resources/RenameType/test44/in/A.java | 2 +- .../resources/RenameType/test44/out/B.java | 2 +- .../resources/RenameType/test45/in/A.java | 2 +- .../resources/RenameType/test45/out/B.java | 2 +- .../resources/RenameType/test46/in/A.java | 2 +- .../resources/RenameType/test46/in/C.java | 2 +- .../resources/RenameType/test46/out/B.java | 2 +- .../resources/RenameType/test46/out/C.java | 2 +- .../resources/RenameType/test47/in/A.java | 2 +- .../resources/RenameType/test47/out/B.java | 2 +- .../resources/RenameType/test48/in/A.java | 2 +- .../resources/RenameType/test48/out/B.java | 2 +- .../resources/RenameType/test49/in/A.java | 2 +- .../resources/RenameType/test49/out/B.java | 2 +- .../test/resources/RenameType/test5/in/A.java | 2 +- .../resources/RenameType/test5/out/B.java | 2 +- .../resources/RenameType/test50/in/A.java | 2 +- .../resources/RenameType/test50/out/B.java | 2 +- .../resources/RenameType/test51/in/A.java | 2 +- .../resources/RenameType/test51/in/C.java | 2 +- .../resources/RenameType/test51/out/B.java | 2 +- .../resources/RenameType/test51/out/C.java | 2 +- .../resources/RenameType/test52/in/A.java | 2 +- .../resources/RenameType/test52/out/B.java | 2 +- .../resources/RenameType/test53/in/A.java | 2 +- .../resources/RenameType/test53/out/B.java | 2 +- .../resources/RenameType/test54/in/A.java | 2 +- .../resources/RenameType/test54/out/A.java | 2 +- .../resources/RenameType/test55/in/A.java | 2 +- .../resources/RenameType/test55/out/A.java | 2 +- .../resources/RenameType/test56/in/A.java | 2 +- .../resources/RenameType/test56/in/B.java | 2 +- .../RenameType/test56/in/default/A.java | 2 +- .../resources/RenameType/test56/out/A.java | 2 +- .../resources/RenameType/test56/out/B.java | 2 +- .../RenameType/test56/out/default/B.java | 2 +- .../resources/RenameType/test58/in/A.java | 2 +- .../resources/RenameType/test58/out/B.java | 2 +- .../resources/RenameType/test59/in/A.java | 2 +- .../resources/RenameType/test59/out/B.java | 2 +- .../test/resources/RenameType/test6/in/A.java | 2 +- .../resources/RenameType/test6/out/B.java | 2 +- .../test/resources/RenameType/test7/in/A.java | 2 +- .../resources/RenameType/test7/out/B.java | 2 +- .../test/resources/RenameType/test8/in/A.java | 2 +- .../resources/RenameType/test8/out/B.java | 2 +- .../test/resources/RenameType/test9/in/A.java | 2 +- .../resources/RenameType/test9/out/B.java | 2 +- .../RenameType/testAnnotation1/in/A.java | 2 +- .../RenameType/testAnnotation1/out/B.java | 2 +- .../RenameType/testAnnotation2/in/A.java | 2 +- .../RenameType/testAnnotation2/out/B.java | 2 +- .../RenameType/testEnum1/in/p2/A.java | 2 +- .../RenameType/testEnum1/out/p2/A.java | 2 +- .../resources/RenameType/testFail0/in/A.java | 2 +- .../resources/RenameType/testFail00/in/A.java | 2 +- .../resources/RenameType/testFail01/in/A.java | 2 +- .../resources/RenameType/testFail02/in/A.java | 2 +- .../resources/RenameType/testFail03/in/A.java | 2 +- .../resources/RenameType/testFail04/in/A.java | 2 +- .../resources/RenameType/testFail1/in/A.java | 2 +- .../resources/RenameType/testFail10/in/A.java | 2 +- .../resources/RenameType/testFail11/in/A.java | 2 +- .../resources/RenameType/testFail12/in/A.java | 2 +- .../resources/RenameType/testFail16/in/A.java | 2 +- .../resources/RenameType/testFail17/in/A.java | 2 +- .../resources/RenameType/testFail18/in/A.java | 2 +- .../resources/RenameType/testFail19/in/A.java | 2 +- .../resources/RenameType/testFail2/in/A.java | 2 +- .../resources/RenameType/testFail20/in/A.java | 2 +- .../RenameType/testFail20/in/AA.java | 2 +- .../resources/RenameType/testFail21/in/A.java | 2 +- .../resources/RenameType/testFail21/in/C.java | 2 +- .../resources/RenameType/testFail22/in/A.java | 2 +- .../resources/RenameType/testFail22/in/B.java | 2 +- .../resources/RenameType/testFail23/in/A.java | 2 +- .../resources/RenameType/testFail23/in/B.java | 2 +- .../RenameType/testFail23/in/Bogus.java | 2 +- .../resources/RenameType/testFail24/in/A.java | 2 +- .../resources/RenameType/testFail24/in/B.java | 2 +- .../resources/RenameType/testFail25/in/A.java | 2 +- .../resources/RenameType/testFail25/in/B.java | 2 +- .../resources/RenameType/testFail26/in/A.java | 2 +- .../resources/RenameType/testFail26/in/B.java | 2 +- .../resources/RenameType/testFail27/in/A.java | 2 +- .../resources/RenameType/testFail27/in/B.java | 2 +- .../resources/RenameType/testFail28/in/A.java | 2 +- .../resources/RenameType/testFail29/in/A.java | 2 +- .../resources/RenameType/testFail30/in/A.java | 2 +- .../resources/RenameType/testFail31/in/C.java | 2 +- .../resources/RenameType/testFail32/in/A.java | 2 +- .../resources/RenameType/testFail32/in/B.java | 2 +- .../resources/RenameType/testFail36/in/A.java | 2 +- .../resources/RenameType/testFail37/in/A.java | 2 +- .../resources/RenameType/testFail37/in/B.java | 2 +- .../resources/RenameType/testFail38/in/A.java | 2 +- .../resources/RenameType/testFail39/in/A.java | 2 +- .../resources/RenameType/testFail4/in/A.java | 2 +- .../resources/RenameType/testFail4/in/B.java | 2 +- .../resources/RenameType/testFail40/in/A.java | 2 +- .../resources/RenameType/testFail45/in/A.java | 2 +- .../resources/RenameType/testFail46/in/A.java | 2 +- .../resources/RenameType/testFail47/in/A.java | 2 +- .../resources/RenameType/testFail48/in/A.java | 2 +- .../resources/RenameType/testFail49/in/A.java | 2 +- .../resources/RenameType/testFail5/in/A.java | 2 +- .../resources/RenameType/testFail5/in/B.java | 2 +- .../resources/RenameType/testFail5/in/C.java | 2 +- .../resources/RenameType/testFail50/in/A.java | 2 +- .../resources/RenameType/testFail51/in/A.java | 2 +- .../resources/RenameType/testFail52/in/A.java | 2 +- .../resources/RenameType/testFail53/in/A.java | 2 +- .../resources/RenameType/testFail55/in/A.java | 2 +- .../resources/RenameType/testFail56/in/A.java | 2 +- .../resources/RenameType/testFail57/in/A.java | 2 +- .../resources/RenameType/testFail58/in/A.java | 2 +- .../resources/RenameType/testFail59/in/A.java | 2 +- .../resources/RenameType/testFail6/in/A.java | 2 +- .../resources/RenameType/testFail6/in/B.java | 2 +- .../resources/RenameType/testFail60/in/A.java | 2 +- .../resources/RenameType/testFail64/in/A.java | 2 +- .../resources/RenameType/testFail65/in/A.java | 2 +- .../resources/RenameType/testFail66/in/A.java | 2 +- .../resources/RenameType/testFail67/in/A.java | 2 +- .../resources/RenameType/testFail68/in/A.java | 2 +- .../resources/RenameType/testFail69/in/A.java | 2 +- .../resources/RenameType/testFail7/in/A.java | 2 +- .../resources/RenameType/testFail70/in/A.java | 2 +- .../resources/RenameType/testFail73/in/A.java | 2 +- .../resources/RenameType/testFail74/in/A.java | 2 +- .../resources/RenameType/testFail75/in/A.java | 2 +- .../resources/RenameType/testFail76/in/A.java | 2 +- .../resources/RenameType/testFail77/in/A.java | 2 +- .../resources/RenameType/testFail78/in/A.java | 2 +- .../resources/RenameType/testFail8/in/A.java | 2 +- .../resources/RenameType/testFail8/in/B.java | 2 +- .../resources/RenameType/testFail82/in/A.java | 2 +- .../resources/RenameType/testFail83/in/A.java | 2 +- .../resources/RenameType/testFail85/in/A.java | 2 +- .../resources/RenameType/testFail86/in/A.java | 2 +- .../resources/RenameType/testFail87/in/A.java | 2 +- .../resources/RenameType/testFail88/in/A.java | 2 +- .../resources/RenameType/testFail89/in/A.java | 2 +- .../resources/RenameType/testFail9/in/A.java | 2 +- .../resources/RenameType/testFail91/in/A.java | 2 +- .../resources/RenameType/testFail92/in/A.java | 2 +- .../resources/RenameType/testFail93/in/A.java | 2 +- .../resources/RenameType/testFail94/in/A.java | 2 +- .../resources/RenameType/testFail95/in/A.java | 2 +- .../testFailRegression1GCRKMQ/in/Blinky.java | 2 +- .../testIllegalInnerClass/in/A.java | 2 +- .../RenameType/testIllegalTypeName1/in/A.java | 2 +- .../RenameType/testIllegalTypeName2/in/A.java | 2 +- .../RenameType/testIllegalTypeName3/in/A.java | 2 +- .../RenameType/testIllegalTypeName4/in/A.java | 2 +- .../RenameType/testIllegalTypeName5/in/A.java | 2 +- .../RenameType/testIllegalTypeName6/in/A.java | 2 +- .../RenameType/testIllegalTypeName7/in/A.java | 2 +- .../RenameType/testIllegalTypeName8/in/A.java | 2 +- .../resources/RenameType/testNoOp/in/A.java | 2 +- .../RenameType/testQualifiedName1/in/A.java | 2 +- .../RenameType/testQualifiedName1/out/B.java | 2 +- .../testQualifiedName2/in/Transient.java | 2 +- .../out/TransientEquipment.java | 2 +- .../testSimilarElements34/in/Try.java | 2 +- .../testSimilarElements34/out/Bla.java | 2 +- .../RenameType/testWrongArg1/in/A.java | 2 +- .../RenameType/testWrongArg2/in/A.java | 2 +- .../RenameType/testWrongArg3/in/A.java | 2 +- .../RenameType/testWrongArg4/in/A.java | 2 +- .../RenameTypeParameter/test0/in/A.java | 2 +- .../RenameTypeParameter/test0/out/A.java | 2 +- .../RenameTypeParameter/test1/in/A.java | 2 +- .../RenameTypeParameter/test1/out/A.java | 2 +- .../RenameTypeParameter/test10/in/A.java | 2 +- .../RenameTypeParameter/test10/out/A.java | 2 +- .../RenameTypeParameter/test11/in/A.java | 2 +- .../RenameTypeParameter/test11/out/A.java | 2 +- .../RenameTypeParameter/test12/in/A.java | 2 +- .../RenameTypeParameter/test12/out/A.java | 2 +- .../RenameTypeParameter/test13/in/A.java | 2 +- .../RenameTypeParameter/test13/out/A.java | 2 +- .../RenameTypeParameter/test2/in/A.java | 2 +- .../RenameTypeParameter/test2/out/A.java | 2 +- .../RenameTypeParameter/test3/in/A.java | 2 +- .../RenameTypeParameter/test3/out/A.java | 2 +- .../RenameTypeParameter/test4/in/A.java | 2 +- .../RenameTypeParameter/test4/out/A.java | 2 +- .../RenameTypeParameter/test5/in/A.java | 2 +- .../RenameTypeParameter/test5/out/A.java | 2 +- .../RenameTypeParameter/test6/in/A.java | 2 +- .../RenameTypeParameter/test6/out/A.java | 2 +- .../RenameTypeParameter/test7/in/A.java | 2 +- .../RenameTypeParameter/test7/out/A.java | 2 +- .../RenameTypeParameter/test8/in/A.java | 2 +- .../RenameTypeParameter/test8/out/A.java | 2 +- .../RenameTypeParameter/test9/in/A.java | 2 +- .../RenameTypeParameter/test9/out/A.java | 2 +- .../RenameTypeParameter/testFail0/in/A.java | 2 +- .../RenameTypeParameter/testFail1/in/A.java | 2 +- .../RenameTypeParameter/testFail2/in/A.java | 2 +- .../RenameTypeParameter/testFail3/in/A.java | 2 +- .../RenameTypeParameter/testFail4/in/A.java | 2 +- .../RenameTypeParameter/testFail5/in/A.java | 2 +- .../test1/in/A.java | 2 +- .../test1/out/A.java | 2 +- .../test10/in/A.java | 2 +- .../test10/out/A.java | 2 +- .../test11/in/A.java | 2 +- .../test11/out/A.java | 2 +- .../test12/in/A.java | 2 +- .../test12/out/A.java | 2 +- .../test13/in/A.java | 2 +- .../test13/out/A.java | 2 +- .../test14/in/A.java | 2 +- .../test14/out/A.java | 2 +- .../test15/in/A.java | 2 +- .../test15/out/A.java | 2 +- .../test16/in/A.java | 2 +- .../test16/out/A.java | 2 +- .../test17/in/A.java | 2 +- .../test17/out/A.java | 2 +- .../test18/in/A.java | 2 +- .../test18/in/C.java | 2 +- .../test18/out/A.java | 2 +- .../test18/out/C.java | 2 +- .../test19/in/A.java | 2 +- .../test19/out/A.java | 2 +- .../test2/in/A.java | 2 +- .../test2/out/A.java | 2 +- .../test20/in/A.java | 2 +- .../test20/out/A.java | 2 +- .../test21/in/A.java | 2 +- .../test21/out/A.java | 2 +- .../test22/in/A.java | 2 +- .../test22/out/A.java | 2 +- .../test23/in/A.java | 2 +- .../test23/out/A.java | 2 +- .../test24/in/A.java | 2 +- .../test24/out/A.java | 2 +- .../test25/in/A.java | 2 +- .../test25/out/A.java | 2 +- .../test26/in/A.java | 2 +- .../test26/out/A.java | 2 +- .../test27/in/A.java | 2 +- .../test27/out/A.java | 2 +- .../test28/in/A.java | 2 +- .../test28/out/A.java | 2 +- .../test29/in/A.java | 2 +- .../test29/out/A.java | 2 +- .../test30/in/A.java | 2 +- .../test30/out/A.java | 2 +- .../test31/in/A.java | 2 +- .../test31/out/A.java | 2 +- .../test32/in/A.java | 2 +- .../test32/out/A.java | 2 +- .../test33/in/A.java | 2 +- .../test33/out/A.java | 2 +- .../test34/in/A.java | 2 +- .../test34/out/A.java | 2 +- .../test35/in/A.java | 2 +- .../test35/out/A.java | 2 +- .../test36/in/A.java | 2 +- .../test36/out/A.java | 2 +- .../test37/in/A.java | 2 +- .../test37/out/A.java | 2 +- .../test39/in/A.java | 2 +- .../test39/out/A.java | 2 +- .../testAnon0/in/A.java | 2 +- .../testAnon0/out/A.java | 2 +- .../testFail0/in/A.java | 2 +- .../testFail10/in/A.java | 2 +- .../testFail11/in/A.java | 2 +- .../testFail12/in/A.java | 2 +- .../testFail13/in/A.java | 2 +- .../testFail14/in/A.java | 2 +- .../testFail15/in/A.java | 2 +- .../testFail17/in/A.java | 2 +- .../testFail18/in/A.java | 2 +- .../testFail19/in/A.java | 2 +- .../testFail2/in/A.java | 2 +- .../testFail20/in/A.java | 2 +- .../testFail22/in/A.java | 2 +- .../testFail23/in/A.java | 2 +- .../testFail24/in/A.java | 2 +- .../testFail25/in/A.java | 2 +- .../testFail26/in/A.java | 2 +- .../testFail27/in/A.java | 2 +- .../testFail28/in/A.java | 2 +- .../testFail29/in/A.java | 2 +- .../testFail3/in/A.java | 2 +- .../testFail31/in/A.java | 2 +- .../testFail32/in/A.java | 2 +- .../testFail33/in/A.java | 2 +- .../testFail34/in/A.java | 2 +- .../testFail36/in/A.java | 2 +- .../testFail37/in/A.java | 2 +- .../testFail4/in/A.java | 2 +- .../testFail40/in/A.java | 2 +- .../testFail41/in/A.java | 2 +- .../testFail5/in/A.java | 2 +- .../testFail6/in/A.java | 2 +- .../testFail7/in/A.java | 2 +- .../testFail8/in/A.java | 2 +- .../testFail9/in/A.java | 2 +- .../testGenerics2/in/A.java | 2 +- .../testGenerics2/out/A.java | 2 +- .../testGenerics3/in/A.java | 2 +- .../testGenerics3/out/A.java | 2 +- .../testGenerics4/in/A.java | 2 +- .../testGenerics4/out/A.java | 2 +- .../testVarargs2/in/A.java | 2 +- .../testVarargs2/out/A.java | 2 +- .../com/codenvy/sub/ClassInSubModule.java | 2 +- .../main/java/com/codenvy/test/MyClass.java | 2 +- .../org/eclipse/che/test/GenerateLink.java | 2 +- .../java/org/eclipse/che/test/MyClass.java | 2 +- .../java/org/eclipse/che/test/TestClass.java | 2 +- .../projects/test/src/main/java/p1/X.java | 2 +- .../projects/test/src/main/java/zzz/Z.java | 2 +- .../wizard/PlainJavaPagePresenterTest.java | 2 +- .../projecttype/ClasspathBuilderTest.java | 4 +- .../PlainJavaValueProviderFactoryTest.java | 2 +- ...letionItemBasedCompletionProposalTest.java | 8 +-- .../server/ssh/WorkspaceSshKeysTest.java | 2 +- .../command/MavenPagePresenterTest.java | 4 +- .../MavenMessagesHandlerTest.java | 6 +- .../ResolveDependencyPresenterTest.java | 2 +- .../client/wizard/MavenPagePresenterTest.java | 16 ++--- .../projecttype/MavenValueProviderTest.java | 2 +- .../server/rmi/MavenProjectManagerTest.java | 2 +- ...ebuggerConfigurationPagePresenterTest.java | 4 +- .../command/GwtChePagePresenterTest.java | 4 +- .../testng/server/TestNGRunnerTest.java | 2 +- .../testing/ide/ExecutorPromiseMocker.java | 5 +- .../che/plugin/testing/ide/PromiseMocker.java | 7 +-- ...TraefikCreateContainerInterceptorTest.java | 2 +- .../urlfactory/URLFactoryBuilderTest.java | 2 +- ...ZendDbgConfigurationPagePresenterTest.java | 4 +- .../server/AbstractZendDbgSessionTest.java | 2 +- .../methods/private/testFail5/out/B.java | 2 +- .../eclipse/qa/examples/AppController.java | 2 +- .../che/api/git/LocalGitUserResolverTest.java | 4 +- .../org/eclipse/che/git/impl/CloneTest.java | 2 +- .../LanguageServerRegistryImplTest.java | 6 +- .../registry/ServerInitializerImplTest.java | 6 +- .../oauth/RemoteOAuthTokenProviderTest.java | 2 +- .../project/server/ProjectServiceTest.java | 2 +- .../CreateBaseProjectTypeHandlerTest.java | 2 +- ...ctImportOutputJsonRpcLineConsumerTest.java | 6 +- .../che/api/vfs/HashSumsCounterTest.java | 2 +- .../che/api/vfs/LockedFileFinderTest.java | 2 +- .../eclipse/che/api/vfs/TarArchiverTest.java | 2 +- .../eclipse/che/api/vfs/ZipArchiverTest.java | 2 +- ...ultFileWatcherNotificationHandlerTest.java | 2 +- .../impl/file/LocalVirtualFileSystemTest.java | 4 +- .../vfs/impl/file/LocalVirtualFileTest.java | 4 +- .../memory/MemoryVirtualFileSystemTest.java | 4 +- .../impl/memory/MemoryVirtualFileTest.java | 4 +- .../vfs/search/impl/FSLuceneSearcherTest.java | 4 +- .../search/impl/MemoryLuceneSearcherTest.java | 4 +- .../api/vfs/watcher/FileTreeWalkerTest.java | 2 +- .../watcher/FileWatcherByPathValueTest.java | 4 +- .../watcher/FileWatcherEventHandlerTest.java | 2 +- .../vfs/watcher/FileWatcherManagerTest.java | 2 +- .../vfs/watcher/FileWatcherOperationTest.java | 2 +- .../vfs/watcher/FileWatcherServiceTest.java | 2 +- .../che/git/impl/jgit/JGitConnectionTest.java | 6 +- .../manage/SshKeyManagerPresenterTest.java | 58 ++++++++----------- .../ssh/key/HttpSshServiceClientTest.java | 4 +- .../che/account/spi/AccountValidatorTest.java | 2 +- .../oauth/OAuthAuthenticationServiceTest.java | 4 +- .../factory/server/FactoryServiceTest.java | 10 ++-- .../server/builder/FactoryBuilderTest.java | 4 +- .../SystemEventsWebsocketBroadcasterTest.java | 2 +- .../user/server/PreferenceManagerTest.java | 4 +- .../api/user/server/ProfileServiceTest.java | 2 +- .../che/api/user/server/UserManagerTest.java | 6 +- .../che/api/user/server/UserServiceTest.java | 4 +- .../api/user/server/UserValidatorTest.java | 4 +- .../api/user/server/jpa/JpaUserDaoTest.java | 8 +-- .../api/user/server/spi/tck/UserDaoTest.java | 2 +- .../server/TemporaryWorkspaceRemoverTest.java | 8 +-- .../server/WorkspaceManagerTest.java | 8 +-- .../server/WorkspaceRuntimesTest.java | 6 +- .../WorkspaceServiceTerminationTest.java | 2 +- .../server/WorkspaceServiceTest.java | 10 ++-- .../hc/HttpConnectionServerCheckerTest.java | 2 +- .../server/hc/ServersCheckerTest.java | 8 +-- .../server/spi/InternalRuntimeTest.java | 6 +- .../server/spi/tck/StackDaoTest.java | 2 +- .../server/spi/tck/WorkspaceDaoTest.java | 2 +- .../server/stack/StackLoaderTest.java | 2 +- .../server/stack/StackServiceTest.java | 8 +-- .../server/stack/StackValidatorTest.java | 2 +- .../che/core/db/jpa/CascadeRemovalTest.java | 2 +- 1167 files changed, 1662 insertions(+), 1645 deletions(-) diff --git a/assembly/assembly-ide-war/src/test/java/org/eclipse/che/DashboardRedirectionFilterTest.java b/assembly/assembly-ide-war/src/test/java/org/eclipse/che/DashboardRedirectionFilterTest.java index 2d5b7dfd73..70de51ba46 100644 --- a/assembly/assembly-ide-war/src/test/java/org/eclipse/che/DashboardRedirectionFilterTest.java +++ b/assembly/assembly-ide-war/src/test/java/org/eclipse/che/DashboardRedirectionFilterTest.java @@ -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; diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/PagesTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/PagesTest.java index cf620f7634..99e931477a 100644 --- a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/PagesTest.java +++ b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/PagesTest.java @@ -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; diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/jsonrpc/commons/JsonRpcMessageReceiverTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/jsonrpc/commons/JsonRpcMessageReceiverTest.java index b487b33dc7..786858968e 100644 --- a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/jsonrpc/commons/JsonRpcMessageReceiverTest.java +++ b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/jsonrpc/commons/JsonRpcMessageReceiverTest.java @@ -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; diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/rest/DefaultHttpJsonRequestTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/rest/DefaultHttpJsonRequestTest.java index a0ad05a8bc..ca877bfd54 100644 --- a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/rest/DefaultHttpJsonRequestTest.java +++ b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/rest/DefaultHttpJsonRequestTest.java @@ -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; diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/rest/RemoteServiceDescriptorTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/rest/RemoteServiceDescriptorTest.java index 51f0deccfa..a48aba1d56 100644 --- a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/rest/RemoteServiceDescriptorTest.java +++ b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/rest/RemoteServiceDescriptorTest.java @@ -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; diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/CompositeLineConsumerTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/CompositeLineConsumerTest.java index 4c7ff5b6c5..ed7dcf265d 100644 --- a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/CompositeLineConsumerTest.java +++ b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/CompositeLineConsumerTest.java @@ -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; diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/FileLineConsumerTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/FileLineConsumerTest.java index b310be0cc5..9078ab3b44 100644 --- a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/FileLineConsumerTest.java +++ b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/FileLineConsumerTest.java @@ -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; diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/lineconsumer/ConcurrentCompositeLineConsumerTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/lineconsumer/ConcurrentCompositeLineConsumerTest.java index 08933697d1..8b49740248 100644 --- a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/lineconsumer/ConcurrentCompositeLineConsumerTest.java +++ b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/lineconsumer/ConcurrentCompositeLineConsumerTest.java @@ -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; diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/lineconsumer/ConcurrentFileLineConsumerTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/lineconsumer/ConcurrentFileLineConsumerTest.java index 3dc7407df8..f0bf3c6934 100644 --- a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/lineconsumer/ConcurrentFileLineConsumerTest.java +++ b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/util/lineconsumer/ConcurrentFileLineConsumerTest.java @@ -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; diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/websocket/impl/BasicWebSocketMessageTransmitterTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/websocket/impl/BasicWebSocketMessageTransmitterTest.java index 27f9769fa9..6f660a7e9a 100644 --- a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/websocket/impl/BasicWebSocketMessageTransmitterTest.java +++ b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/websocket/impl/BasicWebSocketMessageTransmitterTest.java @@ -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; diff --git a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/websocket/impl/MessagesReSenderTest.java b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/websocket/impl/MessagesReSenderTest.java index 9d5a21f229..1d638aed2a 100644 --- a/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/websocket/impl/MessagesReSenderTest.java +++ b/core/che-core-api-core/src/test/java/org/eclipse/che/api/core/websocket/impl/MessagesReSenderTest.java @@ -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; diff --git a/core/commons/che-core-commons-inject/src/test/java/org/eclipse/che/inject/CheBootstrapTest.java b/core/commons/che-core-commons-inject/src/test/java/org/eclipse/che/inject/CheBootstrapTest.java index 780c525803..c8872d8222 100644 --- a/core/commons/che-core-commons-inject/src/test/java/org/eclipse/che/inject/CheBootstrapTest.java +++ b/core/commons/che-core-commons-inject/src/test/java/org/eclipse/che/inject/CheBootstrapTest.java @@ -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; diff --git a/core/commons/che-core-commons-j2ee/src/test/java/org/eclipse/che/filter/CheCacheDisablingFilterTest.java b/core/commons/che-core-commons-j2ee/src/test/java/org/eclipse/che/filter/CheCacheDisablingFilterTest.java index b2a91f7dd7..531ce30671 100644 --- a/core/commons/che-core-commons-j2ee/src/test/java/org/eclipse/che/filter/CheCacheDisablingFilterTest.java +++ b/core/commons/che-core-commons-j2ee/src/test/java/org/eclipse/che/filter/CheCacheDisablingFilterTest.java @@ -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; diff --git a/core/commons/che-core-commons-j2ee/src/test/java/org/eclipse/che/filter/CheCacheForcingFilterTest.java b/core/commons/che-core-commons-j2ee/src/test/java/org/eclipse/che/filter/CheCacheForcingFilterTest.java index 7a59b8d292..d85225d6a8 100644 --- a/core/commons/che-core-commons-j2ee/src/test/java/org/eclipse/che/filter/CheCacheForcingFilterTest.java +++ b/core/commons/che-core-commons-j2ee/src/test/java/org/eclipse/che/filter/CheCacheForcingFilterTest.java @@ -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; diff --git a/core/commons/che-core-commons-lang/src/test/java/org/eclipse/che/commons/lang/ZipUtilsTest.java b/core/commons/che-core-commons-lang/src/test/java/org/eclipse/che/commons/lang/ZipUtilsTest.java index 7ec99ad019..47514fbf34 100644 --- a/core/commons/che-core-commons-lang/src/test/java/org/eclipse/che/commons/lang/ZipUtilsTest.java +++ b/core/commons/che-core-commons-lang/src/test/java/org/eclipse/che/commons/lang/ZipUtilsTest.java @@ -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; diff --git a/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/action/DefaultActionGroupTest.java b/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/action/DefaultActionGroupTest.java index 8cd5af6beb..362037a0a4 100644 --- a/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/action/DefaultActionGroupTest.java +++ b/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/action/DefaultActionGroupTest.java @@ -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; diff --git a/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/editor/changeintercept/changeintercept/CloseCStyleCommentChangeInterceptorTest.java b/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/editor/changeintercept/changeintercept/CloseCStyleCommentChangeInterceptorTest.java index 4901d1465f..81cbfae045 100644 --- a/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/editor/changeintercept/changeintercept/CloseCStyleCommentChangeInterceptorTest.java +++ b/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/editor/changeintercept/changeintercept/CloseCStyleCommentChangeInterceptorTest.java @@ -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) diff --git a/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/wizard/AbstractWizardPageTest.java b/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/wizard/AbstractWizardPageTest.java index b97cc47792..b1ab98953e 100644 --- a/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/wizard/AbstractWizardPageTest.java +++ b/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/wizard/AbstractWizardPageTest.java @@ -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}. diff --git a/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/wizard/AbstractWizardTest.java b/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/wizard/AbstractWizardTest.java index d72fc2d20a..38ae6577e5 100644 --- a/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/wizard/AbstractWizardTest.java +++ b/ide/che-core-ide-api/src/test/java/org/eclipse/che/ide/api/wizard/AbstractWizardTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/ActionManagerTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/ActionManagerTest.java index 416d6afb77..85f02dffe8 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/ActionManagerTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/ActionManagerTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/ConvertFolderToProjectActionTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/ConvertFolderToProjectActionTest.java index d1fb51d8dc..3115620c51 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/ConvertFolderToProjectActionTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/ConvertFolderToProjectActionTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/DownloadWsActionTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/DownloadWsActionTest.java index 207b8cfd32..a35f19fd83 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/DownloadWsActionTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/DownloadWsActionTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/FullTextSearchActionTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/FullTextSearchActionTest.java index f74206450a..62dec2b9a2 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/FullTextSearchActionTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/FullTextSearchActionTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/LinkWithEditorActionTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/LinkWithEditorActionTest.java index 82437bada8..ebe6f43a56 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/LinkWithEditorActionTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/LinkWithEditorActionTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/RenameItemActionTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/RenameItemActionTest.java index feb6970ba7..487e5d46bd 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/RenameItemActionTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/RenameItemActionTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/RunCommandActionTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/RunCommandActionTest.java index 522ce12f2d..f1398bcd1b 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/RunCommandActionTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/RunCommandActionTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/common/CollapseTreeActionTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/common/CollapseTreeActionTest.java index 9f14d4da26..988cf94d85 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/common/CollapseTreeActionTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/common/CollapseTreeActionTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/common/ExpandTreeActionTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/common/ExpandTreeActionTest.java index 07d964805e..197524ea6f 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/common/ExpandTreeActionTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/actions/common/ExpandTreeActionTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/CommandEditorProviderTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/CommandEditorProviderTest.java index 5851eb1e68..1f8d1f594a 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/CommandEditorProviderTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/CommandEditorProviderTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/CommandEditorTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/CommandEditorTest.java index 9ad32af9b3..80d5b76d45 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/CommandEditorTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/CommandEditorTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/goal/GoalPageTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/goal/GoalPageTest.java index 60af36dc51..b8cc30a17c 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/goal/GoalPageTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/goal/GoalPageTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/goal/GoalPageViewImplTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/goal/GoalPageViewImplTest.java index cb9808865d..f3695bdf52 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/goal/GoalPageViewImplTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/goal/GoalPageViewImplTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/name/NamePageTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/name/NamePageTest.java index c6a7b30934..8ee6c481ed 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/name/NamePageTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/name/NamePageTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/name/NamePageViewImplTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/name/NamePageViewImplTest.java index 01db653045..3379ee5efc 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/name/NamePageViewImplTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/name/NamePageViewImplTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/project/ProjectsPageTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/project/ProjectsPageTest.java index b33ca74d3d..49a1a6cdff 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/project/ProjectsPageTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/project/ProjectsPageTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/project/ProjectsPageViewImplTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/project/ProjectsPageViewImplTest.java index 0271d1dccb..2ff8a2999c 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/project/ProjectsPageViewImplTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/editor/page/project/ProjectsPageViewImplTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/explorer/CommandsExplorerPresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/explorer/CommandsExplorerPresenterTest.java index 75c684c94c..5e783003c4 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/explorer/CommandsExplorerPresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/explorer/CommandsExplorerPresenterTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/palette/CommandsPalettePresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/palette/CommandsPalettePresenterTest.java index 2fa5e7611f..626b882f82 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/palette/CommandsPalettePresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/palette/CommandsPalettePresenterTest.java @@ -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 diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/palette/ShowCommandsPaletteActionTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/palette/ShowCommandsPaletteActionTest.java index 2f52a903e6..8ad58b43d1 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/palette/ShowCommandsPaletteActionTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/palette/ShowCommandsPaletteActionTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/ExecuteCommandPresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/ExecuteCommandPresenterTest.java index 514c5a31bc..2b99e6e94e 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/ExecuteCommandPresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/ExecuteCommandPresenterTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/button/AbstractMenuItemTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/button/AbstractMenuItemTest.java index cd7b96d822..99801f1763 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/button/AbstractMenuItemTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/button/AbstractMenuItemTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/button/CommandItemTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/button/CommandItemTest.java index df0e8994e7..14f988d500 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/button/CommandItemTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/button/CommandItemTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/button/ExecuteCommandButtonItemsProviderTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/button/ExecuteCommandButtonItemsProviderTest.java index 3a79348051..24bb5ae958 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/button/ExecuteCommandButtonItemsProviderTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/button/ExecuteCommandButtonItemsProviderTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/button/MachineItemTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/button/MachineItemTest.java index b67f6e6323..3db4663d7a 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/button/MachineItemTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/commands/button/MachineItemTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/previews/PreviewUrlTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/previews/PreviewUrlTest.java index a51e86953d..6e9930455f 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/previews/PreviewUrlTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/toolbar/previews/PreviewUrlTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/type/custom/CustomCommandTypeTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/type/custom/CustomCommandTypeTest.java index d7261deb24..5527d60bf9 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/type/custom/CustomCommandTypeTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/type/custom/CustomCommandTypeTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/type/custom/CustomPagePresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/type/custom/CustomPagePresenterTest.java index 25655d8e28..d8052dce91 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/type/custom/CustomPagePresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/command/type/custom/CustomPagePresenterTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentFileBaseNameMacroTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentFileBaseNameMacroTest.java index e762394924..b1bbefec3c 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentFileBaseNameMacroTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentFileBaseNameMacroTest.java @@ -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} diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentFileNameMacroTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentFileNameMacroTest.java index 90025b27a5..4cd4886327 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentFileNameMacroTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentFileNameMacroTest.java @@ -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} diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentFilePathMacroTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentFilePathMacroTest.java index e783031460..75e5b9f8a8 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentFilePathMacroTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentFilePathMacroTest.java @@ -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} diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentFileRelativePathMacroTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentFileRelativePathMacroTest.java index 8841bdf0f0..f57ce51223 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentFileRelativePathMacroTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentFileRelativePathMacroTest.java @@ -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} diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentProjectNameMacroTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentProjectNameMacroTest.java index 53e00a0405..8d7375d0f5 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentProjectNameMacroTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentProjectNameMacroTest.java @@ -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} diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentProjectTypeMacroTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentProjectTypeMacroTest.java index c177f45009..b45602e4e7 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentProjectTypeMacroTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/macro/EditorCurrentProjectTypeMacroTest.java @@ -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} diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/synchronization/EditorContentSynchronizerImplTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/synchronization/EditorContentSynchronizerImplTest.java index c0625097f1..bc09b71850 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/synchronization/EditorContentSynchronizerImplTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/synchronization/EditorContentSynchronizerImplTest.java @@ -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.>anyObject(), anyObject()); + verify(eventBus, times(3)) + .addHandler(ArgumentMatchers.>anyObject(), anyObject()); } @Test diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/synchronization/EditorGroupSynchronizationImplTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/synchronization/EditorGroupSynchronizationImplTest.java index 9dfe773aac..555b74fe77 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/synchronization/EditorGroupSynchronizationImplTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/editor/synchronization/EditorGroupSynchronizationImplTest.java @@ -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.anyObject(), eq(editorGroupSynchronization)); + org.mockito.ArgumentMatchers.anyObject(), + eq(editorGroupSynchronization)); } @Test @@ -246,7 +246,8 @@ public class EditorGroupSynchronizationImplTest { verify(document).replace(anyInt(), anyInt(), anyString()); verify(documentEventBus) .addHandler( - Matchers.anyObject(), eq(editorGroupSynchronization)); + org.mockito.ArgumentMatchers.anyObject(), + eq(editorGroupSynchronization)); } @Test diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/macro/WorkspaceNameMacroTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/macro/WorkspaceNameMacroTest.java index d225e9730d..2f0d5c55aa 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/macro/WorkspaceNameMacroTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/macro/WorkspaceNameMacroTest.java @@ -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}. diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/navigation/NavigateToFilePresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/navigation/NavigateToFilePresenterTest.java index 3e40266bc7..db03de018e 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/navigation/NavigateToFilePresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/navigation/NavigateToFilePresenterTest.java @@ -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}. diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/newresource/AbstractNewResourceActionTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/newresource/AbstractNewResourceActionTest.java index d5e8db3f88..468ee2fa43 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/newresource/AbstractNewResourceActionTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/newresource/AbstractNewResourceActionTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/newresource/NewFolderActionTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/newresource/NewFolderActionTest.java index 7b2a977251..be89d5bffd 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/newresource/NewFolderActionTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/newresource/NewFolderActionTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/notification/NotificationManagerImplTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/notification/NotificationManagerImplTest.java index 1497123316..903673f91d 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/notification/NotificationManagerImplTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/notification/NotificationManagerImplTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/PartStackPresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/PartStackPresenterTest.java index 7864054a20..a0229b7f23 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/PartStackPresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/PartStackPresenterTest.java @@ -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.anyObject()); + verify(eventBus) + .fireEvent(org.mockito.ArgumentMatchers.anyObject()); } @Test @@ -141,7 +141,7 @@ public class PartStackPresenterTest { verify(partButton).setDelegate(presenter); verify(view).addTab(partButton, basePresenter); - verify(view).setTabPositions(Matchers.>anyObject()); + verify(view).setTabPositions(org.mockito.ArgumentMatchers.>anyObject()); verify(partStackHandler).onRequestFocus(presenter); } diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/PartStackViewImplTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/PartStackViewImplTest.java index e8bc9e3236..0507742f66 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/PartStackViewImplTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/PartStackViewImplTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/TestFocusManager.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/TestFocusManager.java index ab913d48fa..fd089ad8bc 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/TestFocusManager.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/TestFocusManager.java @@ -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. diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/editor/EditorPartStackPresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/editor/EditorPartStackPresenterTest.java index 169bb81d9b..6cd67ea8e8 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/editor/EditorPartStackPresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/editor/EditorPartStackPresenterTest.java @@ -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.anyObject()); - verify(editorPaneMenu).addItem(Matchers.anyObject(), eq(true)); - verify(editorPaneMenu, times(3)).addItem(Matchers.anyObject()); + verify(editorPaneMenuItemFactory, times(4)) + .createMenuItem(org.mockito.ArgumentMatchers.anyObject()); + verify(editorPaneMenu) + .addItem(org.mockito.ArgumentMatchers.anyObject(), eq(true)); + verify(editorPaneMenu, times(3)) + .addItem(org.mockito.ArgumentMatchers.anyObject()); } @Test @@ -214,7 +216,8 @@ public class EditorPartStackPresenterTest { public void partShouldBeAdded() { presenter.addPart(partPresenter1); - verify(partPresenter1, times(2)).addPropertyListener(Matchers.anyObject()); + verify(partPresenter1, times(2)) + .addPropertyListener(org.mockito.ArgumentMatchers.anyObject()); verify(tabItemFactory).createEditorPartButton(partPresenter1, presenter); diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/editor/multipart/EditorMultiPartStackPresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/editor/multipart/EditorMultiPartStackPresenterTest.java index 46d695ec09..46bb527fd6 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/editor/multipart/EditorMultiPartStackPresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/editor/multipart/EditorMultiPartStackPresenterTest.java @@ -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.anyObject(), eq(presenter)); + verify(eventBus) + .addHandler( + org.mockito.ArgumentMatchers.anyObject(), eq(presenter)); } @Test diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFileBaseNameMacroTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFileBaseNameMacroTest.java index 3ec98260ac..33738bc725 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFileBaseNameMacroTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFileBaseNameMacroTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFileNameMacroTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFileNameMacroTest.java index cec57a4a42..6895ae5621 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFileNameMacroTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFileNameMacroTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFileParentPathMacroTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFileParentPathMacroTest.java index 9c5fc50513..fa0bce3a49 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFileParentPathMacroTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFileParentPathMacroTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFilePathMacroTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFilePathMacroTest.java index f7bcb6e15c..83940ac2fd 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFilePathMacroTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFilePathMacroTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFileRelativePathMacroTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFileRelativePathMacroTest.java index 6d39315ace..a98ff1aee5 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFileRelativePathMacroTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentFileRelativePathMacroTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentProjectNameMacroTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentProjectNameMacroTest.java index 5b827e464a..8495eb101b 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentProjectNameMacroTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentProjectNameMacroTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentProjectTypeMacroTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentProjectTypeMacroTest.java index 3259d7af8e..3fbb557298 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentProjectTypeMacroTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/macro/ExplorerCurrentProjectTypeMacroTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizedTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizedTest.java index 9f8292f794..0d944a6e5a 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizedTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/explorer/project/synchronize/ProjectConfigSynchronizedTest.java @@ -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.>any())) + when(deleteProjectPromise.then(org.mockito.ArgumentMatchers.>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.any(), anyObject(), anyObject())) + anyString(), org.mockito.ArgumentMatchers.any(), anyObject(), anyObject())) .thenReturn(changeConfirmDialog); subscribeToOnBeforeLoadNodeEvent(); diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/perspectives/general/AbstractPerspectivePersistenceTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/perspectives/general/AbstractPerspectivePersistenceTest.java index 9852a19aed..910c1aa7fa 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/perspectives/general/AbstractPerspectivePersistenceTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/perspectives/general/AbstractPerspectivePersistenceTest.java @@ -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.anyObject(), Matchers.anyObject())) + org.mockito.ArgumentMatchers.anyObject(), + org.mockito.ArgumentMatchers.anyObject())) .thenReturn(workBenchController); - when(partStackViewFactory.create(Matchers.anyObject())).thenReturn(partStackView); + when(partStackViewFactory.create(org.mockito.ArgumentMatchers.anyObject())) + .thenReturn(partStackView); when(stackPresenterFactory.create( - Matchers.anyObject(), Matchers.anyObject())) + org.mockito.ArgumentMatchers.anyObject(), + org.mockito.ArgumentMatchers.anyObject())) .thenReturn(partStackPresenter); perspective = diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/perspectives/general/AbstractPerspectiveTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/perspectives/general/AbstractPerspectiveTest.java index 9cc5016d82..caba10c981 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/perspectives/general/AbstractPerspectiveTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/perspectives/general/AbstractPerspectiveTest.java @@ -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.anyObject(), Matchers.anyObject())) + org.mockito.ArgumentMatchers.anyObject(), + org.mockito.ArgumentMatchers.anyObject())) .thenReturn(workBenchController); - when(partStackViewFactory.create(Matchers.anyObject())).thenReturn(partStackView); + when(partStackViewFactory.create(org.mockito.ArgumentMatchers.anyObject())) + .thenReturn(partStackView); when(stackPresenterFactory.create( - Matchers.anyObject(), Matchers.anyObject())) + org.mockito.ArgumentMatchers.anyObject(), + org.mockito.ArgumentMatchers.anyObject())) .thenReturn(partStackPresenter); perspective = diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/perspectives/general/PerspectiveManagerTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/perspectives/general/PerspectiveManagerTest.java index aa0d127f84..f9ecfbecee 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/perspectives/general/PerspectiveManagerTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/perspectives/general/PerspectiveManagerTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/perspectives/project/ProjectPerspectiveTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/perspectives/project/ProjectPerspectiveTest.java index bde3301e5f..5b59c5227b 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/perspectives/project/ProjectPerspectiveTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/perspectives/project/ProjectPerspectiveTest.java @@ -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.anyObject(), Matchers.anyObject())) + org.mockito.ArgumentMatchers.anyObject(), + org.mockito.ArgumentMatchers.anyObject())) .thenReturn(workBenchController); - when(partViewFactory.create(Matchers.anyObject())).thenReturn(partStackView); + when(partViewFactory.create(org.mockito.ArgumentMatchers.anyObject())) + .thenReturn(partStackView); when(stackPresenterFactory.create( - Matchers.anyObject(), Matchers.anyObject())) + org.mockito.ArgumentMatchers.anyObject(), + org.mockito.ArgumentMatchers.anyObject())) .thenReturn(partStackPresenter); perspective = diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/widgets/editortab/EditorTabWidgetTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/widgets/editortab/EditorTabWidgetTest.java index 2b38c14356..627a658a81 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/widgets/editortab/EditorTabWidgetTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/part/widgets/editortab/EditorTabWidgetTest.java @@ -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.anyObject()); + verify(tab.iconPanel).setWidget(org.mockito.ArgumentMatchers.anyObject()); } @Test diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/processes/NewTerminalActionTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/processes/NewTerminalActionTest.java index bb74905250..1c651f86de 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/processes/NewTerminalActionTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/processes/NewTerminalActionTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/processes/runtime/ContextBasedRuntimeInfoProviderTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/processes/runtime/ContextBasedRuntimeInfoProviderTest.java index 3708e568a4..3284d25cd8 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/processes/runtime/ContextBasedRuntimeInfoProviderTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/processes/runtime/ContextBasedRuntimeInfoProviderTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/project/ProjectServiceClientTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/project/ProjectServiceClientTest.java index 1395cac57b..0c900ad44e 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/project/ProjectServiceClientTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/project/ProjectServiceClientTest.java @@ -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.>any())) + any(String.class), org.mockito.ArgumentMatchers.>any())) .thenReturn(asyncRequest); when(requestFactory.createPostRequest(any(String.class), nullable(MimeType.class))) .thenReturn(asyncRequest); diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ImportWizardTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ImportWizardTest.java index 5664160dbc..f785ffa387 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ImportWizardTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ImportWizardTest.java @@ -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 diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImportOutputJsonRpcNotifierTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImportOutputJsonRpcNotifierTest.java index ed55c8bdc3..55e383ca4e 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImportOutputJsonRpcNotifierTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImportOutputJsonRpcNotifierTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporterTest.java index aa85f96c1b..4c0b98fd43 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/wizard/ProjectImporterTest.java @@ -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 diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/zip/ZipImporterPagePresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/zip/ZipImporterPagePresenterTest.java index 13cd4d828e..2f48dc50fd 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/zip/ZipImporterPagePresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projectimport/zip/ZipImporterPagePresenterTest.java @@ -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. diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projecttype/BlankProjectWizardRegistrarTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projecttype/BlankProjectWizardRegistrarTest.java index 01248569e0..3bea0568f3 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projecttype/BlankProjectWizardRegistrarTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projecttype/BlankProjectWizardRegistrarTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizardTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizardTest.java index 966f733627..f5d848fa61 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizardTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/projecttype/wizard/ProjectWizardTest.java @@ -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}. diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/reference/ShowReferencePresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/reference/ShowReferencePresenterTest.java index 626590428b..7b92ff214a 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/reference/ShowReferencePresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/reference/ShowReferencePresenterTest.java @@ -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) diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/FullTextSearchPresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/FullTextSearchPresenterTest.java index 44cf32107c..079e3a3538 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/FullTextSearchPresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/FullTextSearchPresenterTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/presentation/FindResultPresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/presentation/FindResultPresenterTest.java index 87939a19a0..c7e39ef91f 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/presentation/FindResultPresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/presentation/FindResultPresenterTest.java @@ -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.>any())) + when(searchResultPromise.then(org.mockito.ArgumentMatchers.>any())) .thenReturn(searchResultPromise); when(result.getItemReferences()).thenReturn(items); } diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/selectpath/SelectPathPresenterTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/selectpath/SelectPathPresenterTest.java index d4c339ae74..62b647bd15 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/selectpath/SelectPathPresenterTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/search/selectpath/SelectPathPresenterTest.java @@ -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.>any()); + verify(view).setStructure(org.mockito.ArgumentMatchers.>any()); verify(view).show(); } diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/selection/TestSelectionAgent.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/selection/TestSelectionAgent.java index 73c48d1d33..97a1c60c6b 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/selection/TestSelectionAgent.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/selection/TestSelectionAgent.java @@ -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; /** diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/statepersistance/AppStateManagerTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/statepersistance/AppStateManagerTest.java index 265261fca0..4a44a64eaa 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/statepersistance/AppStateManagerTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/statepersistance/AppStateManagerTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/upload/file/UploadFileViewImplTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/upload/file/UploadFileViewImplTest.java index 121f573741..493b9ba577 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/upload/file/UploadFileViewImplTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/upload/file/UploadFileViewImplTest.java @@ -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; diff --git a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/workspace/WorkspacePresenterPersistenceTest.java b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/workspace/WorkspacePresenterPersistenceTest.java index 687b8fa38c..fc959a6f4e 100644 --- a/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/workspace/WorkspacePresenterPersistenceTest.java +++ b/ide/che-core-ide-app/src/test/java/org/eclipse/che/ide/workspace/WorkspacePresenterPersistenceTest.java @@ -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}. diff --git a/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/confirm/ConfirmDialogViewTest.java b/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/confirm/ConfirmDialogViewTest.java index adad859a77..1e6bb1f855 100644 --- a/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/confirm/ConfirmDialogViewTest.java +++ b/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/confirm/ConfirmDialogViewTest.java @@ -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; diff --git a/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogPresenterTest.java b/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogPresenterTest.java index 1276dd53d8..5a4e28b47b 100644 --- a/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogPresenterTest.java +++ b/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogPresenterTest.java @@ -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; diff --git a/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogViewTest.java b/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogViewTest.java index 650f7ecd96..7918adbf0b 100644 --- a/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogViewTest.java +++ b/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/input/InputDialogViewTest.java @@ -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; diff --git a/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/message/MessageDialogViewTest.java b/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/message/MessageDialogViewTest.java index d937a154b4..a741a83afa 100644 --- a/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/message/MessageDialogViewTest.java +++ b/ide/che-core-ide-ui/src/test/java/org/eclipse/che/ide/ui/dialogs/message/MessageDialogViewTest.java @@ -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; diff --git a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/jsonrpc/JsonRpcErrorTransmitterTest.java b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/jsonrpc/JsonRpcErrorTransmitterTest.java index eb107b2428..ea82eea877 100644 --- a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/jsonrpc/JsonRpcErrorTransmitterTest.java +++ b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/jsonrpc/JsonRpcErrorTransmitterTest.java @@ -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) diff --git a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/jsonrpc/WebSocketJsonRpcInitializerTest.java b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/jsonrpc/WebSocketJsonRpcInitializerTest.java index 1bd695ec92..cdaa6f0f2d 100644 --- a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/jsonrpc/WebSocketJsonRpcInitializerTest.java +++ b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/jsonrpc/WebSocketJsonRpcInitializerTest.java @@ -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 WebSocketJsonRpcInitializer} diff --git a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/BasicWebSocketEndpointTest.java b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/BasicWebSocketEndpointTest.java index 24b57c2350..23f0f1db4c 100644 --- a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/BasicWebSocketEndpointTest.java +++ b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/BasicWebSocketEndpointTest.java @@ -16,7 +16,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 BasicWebSocketEndpoint} diff --git a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/BasicWebSocketMessageTransmitterTest.java b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/BasicWebSocketMessageTransmitterTest.java index 91d1476c7c..523ebb81e3 100644 --- a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/BasicWebSocketMessageTransmitterTest.java +++ b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/BasicWebSocketMessageTransmitterTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.ide.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.verify; import static org.mockito.Mockito.when; @@ -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; /** * Tests for {@link BasicWebSocketMessageTransmitter} diff --git a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/MessagesReSenderTest.java b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/MessagesReSenderTest.java index 00355e1cbf..89adb20ac2 100644 --- a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/MessagesReSenderTest.java +++ b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/MessagesReSenderTest.java @@ -10,8 +10,8 @@ */ package org.eclipse.che.ide.websocket.impl; -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.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -21,7 +21,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 MessagesReSender} diff --git a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketConnectionManagerTest.java b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketConnectionManagerTest.java index dc4eec8541..dd0f85544e 100644 --- a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketConnectionManagerTest.java +++ b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketConnectionManagerTest.java @@ -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; /** * Tests for {@link WebSocketConnectionManager} diff --git a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketConnectionSustainerTest.java b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketConnectionSustainerTest.java index 763f7dd7f8..cfa672553e 100644 --- a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketConnectionSustainerTest.java +++ b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketConnectionSustainerTest.java @@ -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; /** * Tests for {@link WebSocketConnectionSustainer} diff --git a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketDispatcherTest.java b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketDispatcherTest.java index d27bfb8c08..6f450a5404 100644 --- a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketDispatcherTest.java +++ b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketDispatcherTest.java @@ -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; /** * Tests for {@link WebSocketDispatcher} diff --git a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketInitializerTest.java b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketInitializerTest.java index a0aed484dc..3a7cb2b900 100644 --- a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketInitializerTest.java +++ b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketInitializerTest.java @@ -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 WebSocketInitializer} diff --git a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketPropertyManagerTest.java b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketPropertyManagerTest.java index e1b088dd00..48ba61a2d0 100644 --- a/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketPropertyManagerTest.java +++ b/ide/commons-gwt/src/test/java/org/eclipse/che/ide/websocket/impl/WebSocketPropertyManagerTest.java @@ -18,7 +18,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * Test for {@link WebSocketPropertyManager} diff --git a/infrastructures/docker/docker-client/src/test/java/org/eclipse/che/infrastructure/docker/client/DockerConnectorConfigurationTest.java b/infrastructures/docker/docker-client/src/test/java/org/eclipse/che/infrastructure/docker/client/DockerConnectorConfigurationTest.java index 4fe6390624..e446754061 100644 --- a/infrastructures/docker/docker-client/src/test/java/org/eclipse/che/infrastructure/docker/client/DockerConnectorConfigurationTest.java +++ b/infrastructures/docker/docker-client/src/test/java/org/eclipse/che/infrastructure/docker/client/DockerConnectorConfigurationTest.java @@ -15,7 +15,7 @@ import static org.eclipse.che.infrastructure.docker.client.DockerConnectorConfig import static org.eclipse.che.infrastructure.docker.client.DockerConnectorConfiguration.DEFAULT_DOCKER_MACHINE_DOCKER_HOST_IP; import static org.eclipse.che.infrastructure.docker.client.DockerConnectorConfiguration.DEFAULT_LINUX_DOCKER_HOST_IP; import static org.eclipse.che.infrastructure.docker.client.DockerConnectorConfiguration.DEFAULT_LINUX_INTERFACE_NAME; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; diff --git a/infrastructures/docker/docker-client/src/test/java/org/eclipse/che/infrastructure/docker/client/DockerConnectorTest.java b/infrastructures/docker/docker-client/src/test/java/org/eclipse/che/infrastructure/docker/client/DockerConnectorTest.java index 2e0d05cfcf..c3f5964f33 100644 --- a/infrastructures/docker/docker-client/src/test/java/org/eclipse/che/infrastructure/docker/client/DockerConnectorTest.java +++ b/infrastructures/docker/docker-client/src/test/java/org/eclipse/che/infrastructure/docker/client/DockerConnectorTest.java @@ -13,13 +13,13 @@ package org.eclipse.che.infrastructure.docker.client; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; +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.any; -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.Mockito.atLeastOnce; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -121,7 +121,6 @@ import org.eclipse.che.infrastructure.docker.client.params.network.InspectNetwor import org.eclipse.che.infrastructure.docker.client.params.network.RemoveNetworkParams; import org.mockito.ArgumentCaptor; import org.mockito.Captor; -import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.testng.MockitoTestNGListener; import org.testng.annotations.BeforeMethod; @@ -308,7 +307,8 @@ public class DockerConnectorTest { doReturn(images) .when(dockerConnector) - .parseResponseStreamAndClose(eq(inputStream), Matchers.>>any()); + .parseResponseStreamAndClose( + eq(inputStream), org.mockito.ArgumentMatchers.>>any()); List returnedImages = dockerConnector.listImages(listImagesParams); @@ -330,7 +330,8 @@ public class DockerConnectorTest { doReturn(images) .when(dockerConnector) - .parseResponseStreamAndClose(eq(inputStream), Matchers.>>any()); + .parseResponseStreamAndClose( + eq(inputStream), org.mockito.ArgumentMatchers.>>any()); List returnedImages = dockerConnector.listImages(); @@ -364,7 +365,8 @@ public class DockerConnectorTest { doReturn(expectedListContainers) .when(dockerConnector) .parseResponseStreamAndClose( - eq(inputStream), Matchers.>>any()); + eq(inputStream), + org.mockito.ArgumentMatchers.>>any()); List containers = dockerConnector.listContainers(listContainersParams); @@ -378,7 +380,8 @@ public class DockerConnectorTest { verify(dockerResponse).getInputStream(); verify(dockerConnector) .parseResponseStreamAndClose( - eq(inputStream), Matchers.>>any()); + eq(inputStream), + org.mockito.ArgumentMatchers.>>any()); assertEquals(containers, expectedListContainers); } @@ -394,7 +397,8 @@ public class DockerConnectorTest { doReturn(expectedListContainers) .when(dockerConnector) .parseResponseStreamAndClose( - eq(inputStream), Matchers.>>any()); + eq(inputStream), + org.mockito.ArgumentMatchers.>>any()); List containers = dockerConnector.listContainers(listContainersParams); diff --git a/infrastructures/docker/docker-client/src/test/java/org/eclipse/che/infrastructure/docker/client/UserSpecificDockerRegistryCredentialsProviderTest.java b/infrastructures/docker/docker-client/src/test/java/org/eclipse/che/infrastructure/docker/client/UserSpecificDockerRegistryCredentialsProviderTest.java index 2227f8eee1..c3767fab77 100644 --- a/infrastructures/docker/docker-client/src/test/java/org/eclipse/che/infrastructure/docker/client/UserSpecificDockerRegistryCredentialsProviderTest.java +++ b/infrastructures/docker/docker-client/src/test/java/org/eclipse/che/infrastructure/docker/client/UserSpecificDockerRegistryCredentialsProviderTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.infrastructure.docker.client; -import static org.mockito.Matchers.anyObject; +import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; diff --git a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/DockerInternalRuntimeTest.java b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/DockerInternalRuntimeTest.java index 91ef43e0a1..54a781c5c1 100644 --- a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/DockerInternalRuntimeTest.java +++ b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/DockerInternalRuntimeTest.java @@ -16,9 +16,9 @@ import static org.eclipse.che.api.core.model.workspace.runtime.MachineStatus.FAI import static org.eclipse.che.api.core.model.workspace.runtime.MachineStatus.RUNNING; import static org.eclipse.che.api.core.model.workspace.runtime.MachineStatus.STARTING; import static org.eclipse.che.api.core.model.workspace.runtime.MachineStatus.STOPPED; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; diff --git a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/container/DockerContainersTest.java b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/container/DockerContainersTest.java index 06279f2a24..59a93bf15b 100644 --- a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/container/DockerContainersTest.java +++ b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/container/DockerContainersTest.java @@ -12,7 +12,7 @@ package org.eclipse.che.workspace.infrastructure.docker.container; import static com.google.common.collect.Sets.newHashSet; import static java.util.Arrays.asList; -import static org.mockito.Matchers.anyObject; +import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/LocalCheInfrastructureProvisionerTest.java b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/LocalCheInfrastructureProvisionerTest.java index dcbaaf0c97..7e0cf3a696 100644 --- a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/LocalCheInfrastructureProvisionerTest.java +++ b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/LocalCheInfrastructureProvisionerTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.workspace.infrastructure.docker.local; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity; import org.eclipse.che.api.workspace.server.spi.InternalEnvironment; diff --git a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/ProjectsVolumeProvisionerTest.java b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/ProjectsVolumeProvisionerTest.java index 81aad61391..6ceb184bd0 100644 --- a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/ProjectsVolumeProvisionerTest.java +++ b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/ProjectsVolumeProvisionerTest.java @@ -11,7 +11,7 @@ package org.eclipse.che.workspace.infrastructure.docker.local.projects; import static java.util.Collections.singletonMap; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/RemoveLocalProjectsFolderOnWorkspaceRemoveTest.java b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/RemoveLocalProjectsFolderOnWorkspaceRemoveTest.java index 89bc2a6b13..44a573bf94 100644 --- a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/RemoveLocalProjectsFolderOnWorkspaceRemoveTest.java +++ b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/local/projects/RemoveLocalProjectsFolderOnWorkspaceRemoveTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.workspace.infrastructure.docker.local.projects; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; diff --git a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/provisioner/server/ToolingServersEnvVarsProvisionerTest.java b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/provisioner/server/ToolingServersEnvVarsProvisionerTest.java index 9de6b47db0..ec2c107cd2 100644 --- a/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/provisioner/server/ToolingServersEnvVarsProvisionerTest.java +++ b/infrastructures/docker/infrastructure/src/test/java/org/eclipse/che/workspace/infrastructure/docker/provisioner/server/ToolingServersEnvVarsProvisionerTest.java @@ -12,8 +12,8 @@ package org.eclipse.che.workspace.infrastructure.docker.provisioner.server; import static java.util.Collections.singleton; import static java.util.Collections.singletonMap; -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; import static org.testng.Assert.assertEquals; diff --git a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftInfrastructureProvisionerTest.java b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftInfrastructureProvisionerTest.java index fed0aa8da1..ce25520ac9 100644 --- a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftInfrastructureProvisionerTest.java +++ b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftInfrastructureProvisionerTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.workspace.infrastructure.openshift; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.inOrder; import org.eclipse.che.api.core.model.workspace.runtime.RuntimeIdentity; diff --git a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftInternalRuntimeTest.java b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftInternalRuntimeTest.java index 223dd12e2c..be5102fdc4 100644 --- a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftInternalRuntimeTest.java +++ b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/OpenShiftInternalRuntimeTest.java @@ -16,9 +16,9 @@ import static org.eclipse.che.api.core.model.workspace.runtime.MachineStatus.FAI import static org.eclipse.che.api.core.model.workspace.runtime.MachineStatus.RUNNING; import static org.eclipse.che.api.core.model.workspace.runtime.MachineStatus.STARTING; import static org.eclipse.che.workspace.infrastructure.openshift.provision.UniqueNamesProvisioner.CHE_ORIGINAL_NAME_LABEL; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyListOf; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyListOf; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; diff --git a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/environment/OpenShiftEnvironmentParserTest.java b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/environment/OpenShiftEnvironmentParserTest.java index 499c99251c..a0a6ac7558 100644 --- a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/environment/OpenShiftEnvironmentParserTest.java +++ b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/environment/OpenShiftEnvironmentParserTest.java @@ -18,7 +18,7 @@ import static org.eclipse.che.workspace.infrastructure.openshift.environment.Ope import static org.eclipse.che.workspace.infrastructure.openshift.environment.OpenShiftEnvironmentParser.PVC_IGNORED_WARNING_MESSAGE; import static org.eclipse.che.workspace.infrastructure.openshift.environment.OpenShiftEnvironmentParser.ROUTES_IGNORED_WARNING_MESSAGE; import static org.eclipse.che.workspace.infrastructure.openshift.environment.OpenShiftEnvironmentParser.ROUTE_IGNORED_WARNING_CODE; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/project/RemoveProjectOnWorkspaceRemoveTest.java b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/project/RemoveProjectOnWorkspaceRemoveTest.java index bd0aceeac2..3d8f9ebac4 100644 --- a/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/project/RemoveProjectOnWorkspaceRemoveTest.java +++ b/infrastructures/openshift/src/test/java/org/eclipse/che/workspace/infrastructure/openshift/project/RemoveProjectOnWorkspaceRemoveTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.workspace.infrastructure.openshift.project; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/multiuser/api/che-multiuser-api-authorization-impl/src/test/java/org/eclipse/che/multiuser/api/permission/server/HttpPermissionCheckerImplTest.java b/multiuser/api/che-multiuser-api-authorization-impl/src/test/java/org/eclipse/che/multiuser/api/permission/server/HttpPermissionCheckerImplTest.java index 1487d8d19c..75123b38dc 100644 --- a/multiuser/api/che-multiuser-api-authorization-impl/src/test/java/org/eclipse/che/multiuser/api/permission/server/HttpPermissionCheckerImplTest.java +++ b/multiuser/api/che-multiuser-api-authorization-impl/src/test/java/org/eclipse/che/multiuser/api/permission/server/HttpPermissionCheckerImplTest.java @@ -11,9 +11,9 @@ package org.eclipse.che.multiuser.api.permission.server; import static java.util.Arrays.asList; -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.RETURNS_DEFAULTS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/multiuser/api/che-multiuser-api-authorization-impl/src/test/java/org/eclipse/che/multiuser/api/permission/server/PermissionCheckerImplTest.java b/multiuser/api/che-multiuser-api-authorization-impl/src/test/java/org/eclipse/che/multiuser/api/permission/server/PermissionCheckerImplTest.java index 64148fbb3c..9a0062decd 100644 --- a/multiuser/api/che-multiuser-api-authorization-impl/src/test/java/org/eclipse/che/multiuser/api/permission/server/PermissionCheckerImplTest.java +++ b/multiuser/api/che-multiuser-api-authorization-impl/src/test/java/org/eclipse/che/multiuser/api/permission/server/PermissionCheckerImplTest.java @@ -10,8 +10,8 @@ */ package org.eclipse.che.multiuser.api.permission.server; -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.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/multiuser/api/che-multiuser-api-authorization/src/test/java/org/eclipse/che/multiuser/api/permission/server/HttpPermissionCheckerImplTest.java b/multiuser/api/che-multiuser-api-authorization/src/test/java/org/eclipse/che/multiuser/api/permission/server/HttpPermissionCheckerImplTest.java index 1487d8d19c..75123b38dc 100644 --- a/multiuser/api/che-multiuser-api-authorization/src/test/java/org/eclipse/che/multiuser/api/permission/server/HttpPermissionCheckerImplTest.java +++ b/multiuser/api/che-multiuser-api-authorization/src/test/java/org/eclipse/che/multiuser/api/permission/server/HttpPermissionCheckerImplTest.java @@ -11,9 +11,9 @@ package org.eclipse.che.multiuser.api.permission.server; import static java.util.Arrays.asList; -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.RETURNS_DEFAULTS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/OrganizationManagerTest.java b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/OrganizationManagerTest.java index 109421d18e..1b84240cc6 100644 --- a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/OrganizationManagerTest.java +++ b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/OrganizationManagerTest.java @@ -11,12 +11,12 @@ package org.eclipse.che.multiuser.organization.api; import static java.util.Collections.singletonList; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyObject; -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.anyLong; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/OrganizationServiceTest.java b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/OrganizationServiceTest.java index 6f66c65503..cb883b6cdc 100644 --- a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/OrganizationServiceTest.java +++ b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/OrganizationServiceTest.java @@ -16,11 +16,11 @@ import static java.util.stream.Collectors.toList; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; -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.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; diff --git a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/notification/OrganizationEmailNotificationsTest.java b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/notification/OrganizationEmailNotificationsTest.java index 92256f1923..7b076b0bcc 100644 --- a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/notification/OrganizationEmailNotificationsTest.java +++ b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/notification/OrganizationEmailNotificationsTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.multiuser.organization.api.notification; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; import static org.testng.Assert.assertEquals; diff --git a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/notification/OrganizationNotificationEmailSenderTest.java b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/notification/OrganizationNotificationEmailSenderTest.java index 83b1cd5ea4..3c518f3565 100644 --- a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/notification/OrganizationNotificationEmailSenderTest.java +++ b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/notification/OrganizationNotificationEmailSenderTest.java @@ -12,9 +12,9 @@ package org.eclipse.che.multiuser.organization.api.notification; import static java.util.Arrays.*; import static java.util.Collections.emptyList; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Matchers.anyInt; -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.verify; diff --git a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/permissions/OrganizationPermissionsFilterTest.java b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/permissions/OrganizationPermissionsFilterTest.java index 3addef3979..39deee487c 100644 --- a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/permissions/OrganizationPermissionsFilterTest.java +++ b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/permissions/OrganizationPermissionsFilterTest.java @@ -18,10 +18,10 @@ import static org.eclipse.che.multiuser.organization.api.permissions.Organizatio import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -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 static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/permissions/OrganizationResourceDistributionServicePermissionsFilterTest.java b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/permissions/OrganizationResourceDistributionServicePermissionsFilterTest.java index 2119d4563c..cde454172d 100644 --- a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/permissions/OrganizationResourceDistributionServicePermissionsFilterTest.java +++ b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/permissions/OrganizationResourceDistributionServicePermissionsFilterTest.java @@ -16,10 +16,10 @@ import static java.util.stream.Collectors.toList; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +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.verify; diff --git a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/permissions/OrganizationalAccountPermissionsCheckerTest.java b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/permissions/OrganizationalAccountPermissionsCheckerTest.java index 33da3bbaab..0c497e936e 100644 --- a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/permissions/OrganizationalAccountPermissionsCheckerTest.java +++ b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/permissions/OrganizationalAccountPermissionsCheckerTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.multiuser.organization.api.permissions; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationResourcesDistributionServiceTest.java b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationResourcesDistributionServiceTest.java index 432adea374..469ea76f76 100644 --- a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationResourcesDistributionServiceTest.java +++ b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationResourcesDistributionServiceTest.java @@ -15,9 +15,9 @@ import static java.util.Collections.singletonList; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.testng.Assert.assertEquals; diff --git a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationResourcesDistributorTest.java b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationResourcesDistributorTest.java index 488ec2ec33..d910fcaf90 100644 --- a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationResourcesDistributorTest.java +++ b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationResourcesDistributorTest.java @@ -13,10 +13,10 @@ package org.eclipse.che.multiuser.organization.api.resource; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; diff --git a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationalAccountAvailableResourcesProviderTest.java b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationalAccountAvailableResourcesProviderTest.java index 1ad70c7042..9c7fcdcaca 100644 --- a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationalAccountAvailableResourcesProviderTest.java +++ b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/OrganizationalAccountAvailableResourcesProviderTest.java @@ -13,13 +13,13 @@ package org.eclipse.che.multiuser.organization.api.resource; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyList; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.times; diff --git a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/SuborganizationResourcesProviderTest.java b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/SuborganizationResourcesProviderTest.java index 07ffd1af9f..fad0ec450d 100644 --- a/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/SuborganizationResourcesProviderTest.java +++ b/multiuser/api/che-multiuser-api-organization/src/test/java/org/eclipse/che/multiuser/organization/api/resource/SuborganizationResourcesProviderTest.java @@ -12,8 +12,8 @@ package org.eclipse.che.multiuser.organization.api.resource; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; -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.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/AdminPermissionInitializerTest.java b/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/AdminPermissionInitializerTest.java index 907b413441..48572485b7 100644 --- a/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/AdminPermissionInitializerTest.java +++ b/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/AdminPermissionInitializerTest.java @@ -11,10 +11,10 @@ package org.eclipse.che.multiuser.api.permission.server; import static java.util.Collections.emptyList; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; diff --git a/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/PermissionsManagerTest.java b/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/PermissionsManagerTest.java index 624a8139dc..d6aa935718 100644 --- a/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/PermissionsManagerTest.java +++ b/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/PermissionsManagerTest.java @@ -13,11 +13,11 @@ package org.eclipse.che.multiuser.api.permission.server; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static org.eclipse.che.multiuser.api.permission.server.AbstractPermissionsDomain.SET_PERMISSIONS; +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.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.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/filter/GetPermissionsFilterTest.java b/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/filter/GetPermissionsFilterTest.java index e3696d49db..e960960a04 100644 --- a/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/filter/GetPermissionsFilterTest.java +++ b/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/filter/GetPermissionsFilterTest.java @@ -16,10 +16,10 @@ import static org.eclipse.che.multiuser.api.permission.server.AbstractPermission import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -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 static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; diff --git a/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/filter/RemovePermissionsFilterTest.java b/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/filter/RemovePermissionsFilterTest.java index 3d5eb93edc..c7d36042e6 100644 --- a/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/filter/RemovePermissionsFilterTest.java +++ b/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/filter/RemovePermissionsFilterTest.java @@ -15,9 +15,9 @@ import static org.eclipse.che.multiuser.api.permission.server.AbstractPermission import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -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.doNothing; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; diff --git a/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/filter/SetPermissionsFilterTest.java b/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/filter/SetPermissionsFilterTest.java index 630ca6f4c7..96788112b8 100644 --- a/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/filter/SetPermissionsFilterTest.java +++ b/multiuser/api/che-multiuser-api-permission/src/test/java/org/eclipse/che/multiuser/api/permission/server/filter/SetPermissionsFilterTest.java @@ -15,8 +15,8 @@ import static org.eclipse.che.multiuser.api.permission.server.AbstractPermission import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -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.Mockito.doNothing; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; diff --git a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/ResourceAggregatorTest.java b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/ResourceAggregatorTest.java index 02b1d5c47d..65ef8d856a 100644 --- a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/ResourceAggregatorTest.java +++ b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/ResourceAggregatorTest.java @@ -13,8 +13,8 @@ package org.eclipse.che.multiuser.resource.api; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; 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.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/free/FreeResourceManagerTest.java b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/free/FreeResourceManagerTest.java index 08af184224..985ff7bfaf 100644 --- a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/free/FreeResourceManagerTest.java +++ b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/free/FreeResourceManagerTest.java @@ -11,8 +11,8 @@ package org.eclipse.che.multiuser.resource.api.free; import static java.util.Collections.singletonList; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/free/FreeResourcesLimitServiceTest.java b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/free/FreeResourcesLimitServiceTest.java index f850676255..53c28e6bff 100644 --- a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/free/FreeResourcesLimitServiceTest.java +++ b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/free/FreeResourcesLimitServiceTest.java @@ -16,8 +16,8 @@ import static java.util.stream.Collectors.toList; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/free/FreeResourcesLimitValidatorTest.java b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/free/FreeResourcesLimitValidatorTest.java index f5f72ffd9e..4381591bc1 100644 --- a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/free/FreeResourcesLimitValidatorTest.java +++ b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/free/FreeResourcesLimitValidatorTest.java @@ -11,7 +11,7 @@ package org.eclipse.che.multiuser.resource.api.free; import static java.util.Collections.singletonList; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import java.util.Arrays; import org.eclipse.che.api.core.BadRequestException; diff --git a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/license/AccountLicenseManagerTest.java b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/license/AccountLicenseManagerTest.java index ff010190ac..b01d6094be 100644 --- a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/license/AccountLicenseManagerTest.java +++ b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/license/AccountLicenseManagerTest.java @@ -12,8 +12,8 @@ package org.eclipse.che.multiuser.resource.api.license; import static java.util.Collections.singleton; 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.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/license/AccountLicenseServicePermissionsFilterTest.java b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/license/AccountLicenseServicePermissionsFilterTest.java index e2defdf67e..cefb6b06ce 100644 --- a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/license/AccountLicenseServicePermissionsFilterTest.java +++ b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/license/AccountLicenseServicePermissionsFilterTest.java @@ -14,8 +14,8 @@ import static com.jayway.restassured.RestAssured.given; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -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.Mockito.doThrow; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/license/AccountLicenseServiceTest.java b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/license/AccountLicenseServiceTest.java index 3d9be98958..167aa0ede4 100644 --- a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/license/AccountLicenseServiceTest.java +++ b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/license/AccountLicenseServiceTest.java @@ -15,7 +15,7 @@ import static java.util.Collections.singletonList; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/DefaultAvailableResourcesProviderTest.java b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/DefaultAvailableResourcesProviderTest.java index 5b51ac1560..a070d62a2d 100644 --- a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/DefaultAvailableResourcesProviderTest.java +++ b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/DefaultAvailableResourcesProviderTest.java @@ -12,8 +12,8 @@ package org.eclipse.che.multiuser.resource.api.usage; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; -import static org.mockito.Matchers.anyList; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; diff --git a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/ResourceUsageServiceTest.java b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/ResourceUsageServiceTest.java index 678aa015c8..e09c53b74a 100644 --- a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/ResourceUsageServiceTest.java +++ b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/ResourceUsageServiceTest.java @@ -16,8 +16,8 @@ import static java.util.stream.Collectors.toList; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -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.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/EnvironmentRamCalculatorTest.java b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/EnvironmentRamCalculatorTest.java index 5df52f784b..514c63e15b 100644 --- a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/EnvironmentRamCalculatorTest.java +++ b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/EnvironmentRamCalculatorTest.java @@ -11,7 +11,7 @@ package org.eclipse.che.multiuser.resource.api.usage.tracker; /* -import static org.mockito.Matchers.anyObject; +import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/RamResourceUsageTrackerTest.java b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/RamResourceUsageTrackerTest.java index a48cb42fb2..aa214ed7f1 100644 --- a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/RamResourceUsageTrackerTest.java +++ b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/RamResourceUsageTrackerTest.java @@ -12,10 +12,10 @@ package org.eclipse.che.multiuser.resource.api.usage.tracker; /* import static java.util.Collections.singletonList; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/RuntimeResourceUsageTrackerTest.java b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/RuntimeResourceUsageTrackerTest.java index 7c9f364f49..ab169a7006 100644 --- a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/RuntimeResourceUsageTrackerTest.java +++ b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/RuntimeResourceUsageTrackerTest.java @@ -11,10 +11,10 @@ package org.eclipse.che.multiuser.resource.api.usage.tracker; import static java.util.Collections.singletonList; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/WorkspaceResourceUsageTrackerTest.java b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/WorkspaceResourceUsageTrackerTest.java index e426cb2b28..c0e3db91fa 100644 --- a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/WorkspaceResourceUsageTrackerTest.java +++ b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/WorkspaceResourceUsageTrackerTest.java @@ -10,10 +10,10 @@ */ package org.eclipse.che.multiuser.resource.api.usage.tracker; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/workspace/LimitsCheckingWorkspaceManagerTest.java b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/workspace/LimitsCheckingWorkspaceManagerTest.java index ab53562072..00cdf9825b 100644 --- a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/workspace/LimitsCheckingWorkspaceManagerTest.java +++ b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/workspace/LimitsCheckingWorkspaceManagerTest.java @@ -13,9 +13,9 @@ package org.eclipse.che.multiuser.resource.api.workspace; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; //import static org.eclipse.che.multiuser.resource.api.workspace.TestObjects.createConfig; -import static org.mockito.Matchers.any; -//import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +//import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; //import static org.mockito.Mockito.never; diff --git a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/spi/jpa/RemoveFreeResourcesLimitSubscriberTest.java b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/spi/jpa/RemoveFreeResourcesLimitSubscriberTest.java index d0b2a698da..604c0add68 100644 --- a/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/spi/jpa/RemoveFreeResourcesLimitSubscriberTest.java +++ b/multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/spi/jpa/RemoveFreeResourcesLimitSubscriberTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.multiuser.resource.spi.jpa; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import org.eclipse.che.account.event.BeforeAccountRemovedEvent; diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication-agent/src/test/java/org/eclipse/che/multiuser/machine/authentication/agent/MachineLoginFilterTest.java b/multiuser/machine-auth/che-multiuser-machine-authentication-agent/src/test/java/org/eclipse/che/multiuser/machine/authentication/agent/MachineLoginFilterTest.java index 3645c7cfde..06ed44c814 100644 --- a/multiuser/machine-auth/che-multiuser-machine-authentication-agent/src/test/java/org/eclipse/che/multiuser/machine/authentication/agent/MachineLoginFilterTest.java +++ b/multiuser/machine-auth/che-multiuser-machine-authentication-agent/src/test/java/org/eclipse/che/multiuser/machine/authentication/agent/MachineLoginFilterTest.java @@ -10,8 +10,8 @@ */ package org.eclipse.che.multiuser.machine.authentication.agent; -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.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication/src/test/java/org/eclipse/che/multiuser/machine/authentication/server/MachineTokenInterceptorTest.java b/multiuser/machine-auth/che-multiuser-machine-authentication/src/test/java/org/eclipse/che/multiuser/machine/authentication/server/MachineTokenInterceptorTest.java index 0b641b3ac5..3e9480c000 100644 --- a/multiuser/machine-auth/che-multiuser-machine-authentication/src/test/java/org/eclipse/che/multiuser/machine/authentication/server/MachineTokenInterceptorTest.java +++ b/multiuser/machine-auth/che-multiuser-machine-authentication/src/test/java/org/eclipse/che/multiuser/machine/authentication/server/MachineTokenInterceptorTest.java @@ -12,7 +12,7 @@ package org.eclipse.che.multiuser.machine.authentication.server; import static com.google.inject.matcher.Matchers.subclassesOf; import static org.eclipse.che.inject.Matchers.names; -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; diff --git a/multiuser/machine-auth/che-multiuser-machine-authentication/src/test/java/org/eclipse/che/multiuser/machine/authentication/server/MachineTokenPermissionsFilterTest.java b/multiuser/machine-auth/che-multiuser-machine-authentication/src/test/java/org/eclipse/che/multiuser/machine/authentication/server/MachineTokenPermissionsFilterTest.java index 3910a785ac..b15aa7e438 100644 --- a/multiuser/machine-auth/che-multiuser-machine-authentication/src/test/java/org/eclipse/che/multiuser/machine/authentication/server/MachineTokenPermissionsFilterTest.java +++ b/multiuser/machine-auth/che-multiuser-machine-authentication/src/test/java/org/eclipse/che/multiuser/machine/authentication/server/MachineTokenPermissionsFilterTest.java @@ -16,8 +16,8 @@ import static org.eclipse.che.multiuser.permission.workspace.server.WorkspaceDom import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -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.never; import static org.mockito.Mockito.verify; diff --git a/multiuser/permission/che-multiuser-permission-factory/src/test/java/org/eclipse/che/multiuser/permission/factory/FactoryPermissionsFilterTest.java b/multiuser/permission/che-multiuser-permission-factory/src/test/java/org/eclipse/che/multiuser/permission/factory/FactoryPermissionsFilterTest.java index 9a397f47ae..f35586f6e2 100644 --- a/multiuser/permission/che-multiuser-permission-factory/src/test/java/org/eclipse/che/multiuser/permission/factory/FactoryPermissionsFilterTest.java +++ b/multiuser/permission/che-multiuser-permission-factory/src/test/java/org/eclipse/che/multiuser/permission/factory/FactoryPermissionsFilterTest.java @@ -16,9 +16,9 @@ import static org.eclipse.che.multiuser.permission.workspace.server.WorkspaceDom import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; +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.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/multiuser/permission/che-multiuser-permission-resource/src/test/java/org/eclipse/che/multiuser/permission/resource/filters/FreeResourcesLimitServicePermissionsFilterTest.java b/multiuser/permission/che-multiuser-permission-resource/src/test/java/org/eclipse/che/multiuser/permission/resource/filters/FreeResourcesLimitServicePermissionsFilterTest.java index 8727a84416..0047d7e2f2 100644 --- a/multiuser/permission/che-multiuser-permission-resource/src/test/java/org/eclipse/che/multiuser/permission/resource/filters/FreeResourcesLimitServicePermissionsFilterTest.java +++ b/multiuser/permission/che-multiuser-permission-resource/src/test/java/org/eclipse/che/multiuser/permission/resource/filters/FreeResourcesLimitServicePermissionsFilterTest.java @@ -14,9 +14,9 @@ import static com.jayway.restassured.RestAssured.given; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; diff --git a/multiuser/permission/che-multiuser-permission-resource/src/test/java/org/eclipse/che/multiuser/permission/resource/filters/ResourceUsageServicePermissionsFilterTest.java b/multiuser/permission/che-multiuser-permission-resource/src/test/java/org/eclipse/che/multiuser/permission/resource/filters/ResourceUsageServicePermissionsFilterTest.java index e8824fcd25..ff16235815 100644 --- a/multiuser/permission/che-multiuser-permission-resource/src/test/java/org/eclipse/che/multiuser/permission/resource/filters/ResourceUsageServicePermissionsFilterTest.java +++ b/multiuser/permission/che-multiuser-permission-resource/src/test/java/org/eclipse/che/multiuser/permission/resource/filters/ResourceUsageServicePermissionsFilterTest.java @@ -14,8 +14,8 @@ import static com.jayway.restassured.RestAssured.given; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/multiuser/permission/che-multiuser-permission-system/src/test/java/org/eclipse/che/multiuser/permission/system/SystemServicePermissionsFilterTest.java b/multiuser/permission/che-multiuser-permission-system/src/test/java/org/eclipse/che/multiuser/permission/system/SystemServicePermissionsFilterTest.java index 5f75c73e91..a2b4e928ca 100644 --- a/multiuser/permission/che-multiuser-permission-system/src/test/java/org/eclipse/che/multiuser/permission/system/SystemServicePermissionsFilterTest.java +++ b/multiuser/permission/che-multiuser-permission-system/src/test/java/org/eclipse/che/multiuser/permission/system/SystemServicePermissionsFilterTest.java @@ -16,7 +16,7 @@ import static java.util.Arrays.asList; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -import static org.mockito.Matchers.anyObject; +import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/multiuser/permission/che-multiuser-permission-user/src/test/java/org/eclipse/che/multiuser/permission/user/UserServicePermissionsFilterTest.java b/multiuser/permission/che-multiuser-permission-user/src/test/java/org/eclipse/che/multiuser/permission/user/UserServicePermissionsFilterTest.java index 7c8c2905a3..3238f45f1c 100644 --- a/multiuser/permission/che-multiuser-permission-user/src/test/java/org/eclipse/che/multiuser/permission/user/UserServicePermissionsFilterTest.java +++ b/multiuser/permission/che-multiuser-permission-user/src/test/java/org/eclipse/che/multiuser/permission/user/UserServicePermissionsFilterTest.java @@ -14,9 +14,9 @@ import static com.jayway.restassured.RestAssured.given; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/StackPermissionsFilterTest.java b/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/StackPermissionsFilterTest.java index 00cc0fcca7..f456fded29 100644 --- a/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/StackPermissionsFilterTest.java +++ b/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/StackPermissionsFilterTest.java @@ -19,11 +19,11 @@ import static org.eclipse.che.multiuser.permission.workspace.server.stack.StackD import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -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.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -58,7 +58,6 @@ import org.everrest.core.GenericContainerRequest; import org.everrest.core.RequestFilter; import org.everrest.core.resource.GenericResourceMethod; import org.mockito.InjectMocks; -import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.testng.MockitoTestNGListener; import org.testng.Assert; @@ -124,7 +123,7 @@ public class StackPermissionsFilterTest { assertEquals(response.getStatusCode(), 204); verify(service).getStack("stack123"); - verify(subject).hasPermission(eq("stack"), eq("stack123"), Matchers.eq(READ)); + verify(subject).hasPermission(eq("stack"), eq("stack123"), eq(READ)); } @Test @@ -141,7 +140,7 @@ public class StackPermissionsFilterTest { assertEquals(response.getStatusCode(), 204); verify(service).updateStack(any(), eq("stack123")); - verify(subject).hasPermission(eq("stack"), eq("stack123"), Matchers.eq(UPDATE)); + verify(subject).hasPermission(eq("stack"), eq("stack123"), eq(UPDATE)); } @Test @@ -158,7 +157,7 @@ public class StackPermissionsFilterTest { assertEquals(response.getStatusCode(), 204); verify(service).removeStack(eq("stack123")); - verify(subject).hasPermission(eq("stack"), eq("stack123"), Matchers.eq(DELETE)); + verify(subject).hasPermission(eq("stack"), eq("stack123"), eq(DELETE)); } @Test @@ -190,7 +189,7 @@ public class StackPermissionsFilterTest { assertEquals(response.getStatusCode(), 204); verify(service).getIcon(eq("stack123")); - verify(subject).hasPermission(eq("stack"), eq("stack123"), Matchers.eq(READ)); + verify(subject).hasPermission(eq("stack"), eq("stack123"), eq(READ)); } @Test @@ -208,7 +207,7 @@ public class StackPermissionsFilterTest { assertEquals(response.getStatusCode(), 204); verify(service).uploadIcon(any(), eq("stack123")); - verify(subject).hasPermission(eq("stack"), eq("stack123"), Matchers.eq(UPDATE)); + verify(subject).hasPermission(eq("stack"), eq("stack123"), eq(UPDATE)); } @Test @@ -245,7 +244,7 @@ public class StackPermissionsFilterTest { assertEquals(response.getStatusCode(), 204); verify(service).removeIcon(eq("stack123")); - verify(subject).hasPermission(eq("stack"), eq("stack123"), Matchers.eq(UPDATE)); + verify(subject).hasPermission(eq("stack"), eq("stack123"), eq(UPDATE)); } @Test( @@ -298,8 +297,7 @@ public class StackPermissionsFilterTest { assertEquals(response.getStatusCode() / 100, 2); verify(subject) - .hasPermission( - eq(SystemDomain.DOMAIN_ID), eq(null), Matchers.eq(SystemDomain.MANAGE_SYSTEM_ACTION)); + .hasPermission(eq(SystemDomain.DOMAIN_ID), eq(null), eq(SystemDomain.MANAGE_SYSTEM_ACTION)); } @Test(dataProvider = "coveredPaths") @@ -320,8 +318,7 @@ public class StackPermissionsFilterTest { assertEquals(response.getStatusCode(), 403); verify(subject) - .hasPermission( - eq(SystemDomain.DOMAIN_ID), eq(null), Matchers.eq(SystemDomain.MANAGE_SYSTEM_ACTION)); + .hasPermission(eq(SystemDomain.DOMAIN_ID), eq(null), eq(SystemDomain.MANAGE_SYSTEM_ACTION)); } @DataProvider(name = "coveredPaths") diff --git a/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilterTest.java b/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilterTest.java index b74547270a..4b95b3722b 100644 --- a/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilterTest.java +++ b/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilterTest.java @@ -14,11 +14,11 @@ import static com.jayway.restassured.RestAssured.given; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; +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.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.Mockito.doCallRealMethod; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doThrow; diff --git a/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/stack/StackCreatorPermissionsProviderTest.java b/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/stack/StackCreatorPermissionsProviderTest.java index be6e11f5eb..0ae331a452 100644 --- a/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/stack/StackCreatorPermissionsProviderTest.java +++ b/multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/stack/StackCreatorPermissionsProviderTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.multiuser.permission.workspace.server.stack; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.testng.Assert.assertEquals; diff --git a/plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/ActivityPermissionsFilterTest.java b/plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/ActivityPermissionsFilterTest.java index 843d0f79c7..7be6dde520 100644 --- a/plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/ActivityPermissionsFilterTest.java +++ b/plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/ActivityPermissionsFilterTest.java @@ -16,8 +16,8 @@ import static org.eclipse.che.multiuser.permission.workspace.server.WorkspaceDom import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -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.verify; import static org.mockito.Mockito.when; diff --git a/plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/WorkspaceActivityManagerTest.java b/plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/WorkspaceActivityManagerTest.java index 69932b6eb9..6d2ace3da6 100644 --- a/plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/WorkspaceActivityManagerTest.java +++ b/plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/WorkspaceActivityManagerTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.plugin.activity; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/WorkspaceActivityServiceTest.java b/plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/WorkspaceActivityServiceTest.java index e174cd962a..d8950d08d7 100644 --- a/plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/WorkspaceActivityServiceTest.java +++ b/plugins/plugin-activity/che-plugin-activity-wsmaster/src/test/java/org/eclipse/che/plugin/activity/WorkspaceActivityServiceTest.java @@ -11,8 +11,8 @@ package org.eclipse.che.plugin.activity; import static com.jayway.restassured.RestAssured.given; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/ChangeVariableValueTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/ChangeVariableValueTest.java index febf2f9119..28316c7948 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/ChangeVariableValueTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/ChangeVariableValueTest.java @@ -10,10 +10,10 @@ */ package org.eclipse.che.plugin.debugger.ide; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +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; diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/EvaluateExpressionTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/EvaluateExpressionTest.java index 261a4454a5..df48cc9b5e 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/EvaluateExpressionTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/EvaluateExpressionTest.java @@ -10,10 +10,10 @@ */ package org.eclipse.che.plugin.debugger.ide; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -31,7 +31,6 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.InjectMocks; -import org.mockito.Matchers; import org.mockito.Mock; /** @@ -124,7 +123,8 @@ public class EvaluateExpressionTest extends BaseTest { when(view.getExpression()).thenReturn(EXPRESSION); when(debugger.evaluate(view.getExpression(), THREAD_ID, FRAME_INDEX)).thenReturn(promise); when(promise.then((Operation) anyObject())).thenReturn(promise); - when(promise.catchError(Matchers.>anyObject())).thenReturn(promise); + when(promise.catchError(org.mockito.ArgumentMatchers.>anyObject())) + .thenReturn(promise); when(debuggerManager.getActiveDebugger()).thenReturn(debugger); when(promiseError.getMessage()).thenReturn(FAIL_REASON); diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/actions/DebugActionTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/actions/DebugActionTest.java index cc73ebeea1..19cf4a6d78 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/actions/DebugActionTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/actions/DebugActionTest.java @@ -27,7 +27,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) diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/configuration/DebugConfigurationActionTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/configuration/DebugConfigurationActionTest.java index f52af1f3ca..38cc61ed71 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/configuration/DebugConfigurationActionTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/configuration/DebugConfigurationActionTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.plugin.debugger.ide.configuration; -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; diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/configuration/DebugConfigurationsGroupTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/configuration/DebugConfigurationsGroupTest.java index aa347e08b2..1d5be95baa 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/configuration/DebugConfigurationsGroupTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/configuration/DebugConfigurationsGroupTest.java @@ -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; /** @author Artem Zatsarynnyi */ @RunWith(MockitoJUnitRunner.class) diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/configuration/DebugConfigurationsManagerImplTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/configuration/DebugConfigurationsManagerImplTest.java index 9c584a22cc..5cc32ccefa 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/configuration/DebugConfigurationsManagerImplTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/configuration/DebugConfigurationsManagerImplTest.java @@ -10,10 +10,10 @@ */ package org.eclipse.che.plugin.debugger.ide.configuration; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyMap; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyMap; -import static org.mockito.Matchers.isNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -40,7 +40,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; /** @author Anatoliy Bazko */ @RunWith(MockitoJUnitRunner.class) diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/debug/DebuggerPresenterTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/debug/DebuggerPresenterTest.java index bc2b31e888..8d1a105aaf 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/debug/DebuggerPresenterTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/debug/DebuggerPresenterTest.java @@ -12,10 +12,10 @@ package org.eclipse.che.plugin.debugger.ide.debug; 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.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; +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.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/debug/DebuggerTest.java b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/debug/DebuggerTest.java index 231228ad68..fcd8fc94a0 100644 --- a/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/debug/DebuggerTest.java +++ b/plugins/plugin-debugger/che-plugin-debugger-ide/src/test/java/org/eclipse/che/plugin/debugger/ide/debug/DebuggerTest.java @@ -16,11 +16,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Answers.RETURNS_DEEP_STUBS; +import static org.mockito.ArgumentMatchers.any; +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.any; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.RETURNS_SMART_NULLS; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/plugins/plugin-gdb/che-plugin-gdb-ide/src/test/java/org/eclipse/che/plugin/gdb/ide/configuration/GdbConfigurationPagePresenterTest.java b/plugins/plugin-gdb/che-plugin-gdb-ide/src/test/java/org/eclipse/che/plugin/gdb/ide/configuration/GdbConfigurationPagePresenterTest.java index d5264dc4b4..5c220dad9b 100644 --- a/plugins/plugin-gdb/che-plugin-gdb-ide/src/test/java/org/eclipse/che/plugin/gdb/ide/configuration/GdbConfigurationPagePresenterTest.java +++ b/plugins/plugin-gdb/che-plugin-gdb-ide/src/test/java/org/eclipse/che/plugin/gdb/ide/configuration/GdbConfigurationPagePresenterTest.java @@ -11,8 +11,8 @@ package org.eclipse.che.plugin.gdb.ide.configuration; import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -31,7 +31,7 @@ import org.mockito.ArgumentCaptor; 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) diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/BaseTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/BaseTest.java index 93f4e7e3ac..d5e71af5d8 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/BaseTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/BaseTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.ide.ext.git.client; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import com.google.web.bindery.event.shared.EventBus; @@ -44,7 +44,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; /** * Base test for git extension. diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/BranchFilterByRemoteTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/BranchFilterByRemoteTest.java index 64179d8236..725fb05e58 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/BranchFilterByRemoteTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/BranchFilterByRemoteTest.java @@ -21,7 +21,7 @@ import org.eclipse.che.api.git.shared.Branch; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** @author Sergii Leschenko */ @RunWith(MockitoJUnitRunner.class) diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/add/AddToIndexPresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/add/AddToIndexPresenterTest.java index 4b6e0f1aba..d6b071a12b 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/add/AddToIndexPresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/add/AddToIndexPresenterTest.java @@ -12,10 +12,10 @@ package org.eclipse.che.ide.ext.git.client.add; import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.FLOAT_MODE; import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +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; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenterTest.java index 092dd29a58..d3caf9b74f 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/branch/BranchPresenterTest.java @@ -12,12 +12,12 @@ package org.eclipse.che.ide.ext.git.client.branch; import static org.eclipse.che.api.git.shared.BranchListMode.LIST_ALL; import static org.eclipse.che.ide.ext.git.client.patcher.WindowPatcher.RETURNED_MESSAGE; -import static org.mockito.Matchers.any; -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.any; +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; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/checkout/CheckoutReferenceTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/checkout/CheckoutReferenceTest.java index 50a6ada99c..d2ed7252df 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/checkout/CheckoutReferenceTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/checkout/CheckoutReferenceTest.java @@ -10,10 +10,10 @@ */ package org.eclipse.che.ide.ext.git.client.checkout; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/commit/CommitPresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/commit/CommitPresenterTest.java index 4066dbbe7d..b706504f96 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/commit/CommitPresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/commit/CommitPresenterTest.java @@ -15,13 +15,13 @@ import static java.util.Collections.singletonList; import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.FLOAT_MODE; 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.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyList; -import static org.mockito.Matchers.anySet; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anySet; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/fetch/FetchPresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/fetch/FetchPresenterTest.java index b5332bd7a4..5b29613143 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/fetch/FetchPresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/fetch/FetchPresenterTest.java @@ -10,11 +10,11 @@ */ package org.eclipse.che.ide.ext.git.client.fetch; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +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.times; import static org.mockito.Mockito.verify; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/history/HistoryPresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/history/HistoryPresenterTest.java index b669a6552e..cf666d5a59 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/history/HistoryPresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/history/HistoryPresenterTest.java @@ -14,12 +14,12 @@ import static java.util.Collections.singletonList; 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.eclipse.che.ide.resource.Path.EMPTY; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyList; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyList; +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; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/importer/page/GitImporterPagePresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/importer/page/GitImporterPagePresenterTest.java index c40464500a..7d65245f08 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/importer/page/GitImporterPagePresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/importer/page/GitImporterPagePresenterTest.java @@ -12,8 +12,8 @@ package org.eclipse.che.ide.ext.git.client.importer.page; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -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.never; import static org.mockito.Mockito.verify; @@ -30,7 +30,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 GitImporterPagePresenter} functionality. diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/init/InitRepositoryPresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/init/InitRepositoryPresenterTest.java index 1392fde6f7..4b85595cab 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/init/InitRepositoryPresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/init/InitRepositoryPresenterTest.java @@ -11,11 +11,11 @@ package org.eclipse.che.ide.ext.git.client.init; import static org.eclipse.che.ide.ext.git.client.init.InitRepositoryPresenter.INIT_COMMAND_NAME; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenterTest.java index ed4192bd98..827d83814b 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/merge/MergePresenterTest.java @@ -13,10 +13,10 @@ package org.eclipse.che.ide.ext.git.client.merge; import static org.eclipse.che.api.git.shared.BranchListMode.LIST_LOCAL; import static org.eclipse.che.api.git.shared.BranchListMode.LIST_REMOTE; import static org.eclipse.che.api.git.shared.MergeResult.MergeStatus.ALREADY_UP_TO_DATE; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +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.verify; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/preference/CommitterPreferencePresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/preference/CommitterPreferencePresenterTest.java index 0cb4494c5d..5d9ba7a454 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/preference/CommitterPreferencePresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/preference/CommitterPreferencePresenterTest.java @@ -11,7 +11,7 @@ package org.eclipse.che.ide.ext.git.client.preference; import static org.junit.Assert.assertFalse; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -23,7 +23,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 Valeriy Svydenko */ @RunWith(MockitoJUnitRunner.class) diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/remote/add/AddRemoteRepositoryPresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/remote/add/AddRemoteRepositoryPresenterTest.java index 06752a7a67..6dac333ff3 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/remote/add/AddRemoteRepositoryPresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/remote/add/AddRemoteRepositoryPresenterTest.java @@ -10,10 +10,10 @@ */ package org.eclipse.che.ide.ext.git.client.remote.add; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +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.verify; import static org.mockito.Mockito.when; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenterTest.java index d9dad309a9..64f49a6335 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/reset/files/ResetFilesPresenterTest.java @@ -11,11 +11,11 @@ package org.eclipse.che.ide.ext.git.client.reset.files; import static java.util.Collections.emptyList; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +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.times; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/revert/commit/RevertCommitPresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/revert/commit/RevertCommitPresenterTest.java index 7591b7ace2..370cfb70c1 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/revert/commit/RevertCommitPresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/revert/commit/RevertCommitPresenterTest.java @@ -13,11 +13,11 @@ package org.eclipse.che.ide.ext.git.client.revert.commit; import static java.util.Collections.singletonList; import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.FLOAT_MODE; import static org.eclipse.che.ide.api.notification.StatusNotification.Status.FAIL; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -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.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +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; diff --git a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/status/StatusCommandPresenterTest.java b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/status/StatusCommandPresenterTest.java index d28c048797..91528bcac3 100644 --- a/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/status/StatusCommandPresenterTest.java +++ b/plugins/plugin-git/che-plugin-git-ext-git/src/test/java/org/eclipse/che/ide/ext/git/client/status/StatusCommandPresenterTest.java @@ -10,9 +10,9 @@ */ package org.eclipse.che.ide.ext.git.client.status; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/plugins/plugin-github/che-plugin-github-factory-resolver/src/test/java/org/eclipse/che/plugin/github/factory/resolver/GithubFactoryParametersResolverTest.java b/plugins/plugin-github/che-plugin-github-factory-resolver/src/test/java/org/eclipse/che/plugin/github/factory/resolver/GithubFactoryParametersResolverTest.java index f74a1a3b00..738d9a75fa 100644 --- a/plugins/plugin-github/che-plugin-github-factory-resolver/src/test/java/org/eclipse/che/plugin/github/factory/resolver/GithubFactoryParametersResolverTest.java +++ b/plugins/plugin-github/che-plugin-github-factory-resolver/src/test/java/org/eclipse/che/plugin/github/factory/resolver/GithubFactoryParametersResolverTest.java @@ -13,9 +13,9 @@ package org.eclipse.che.plugin.github.factory.resolver; import static java.util.Collections.singletonMap; import static org.eclipse.che.dto.server.DtoFactory.newDto; import static org.eclipse.che.plugin.github.factory.resolver.GithubFactoryParametersResolver.URL_PARAMETER_NAME; -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; import static org.testng.Assert.assertEquals; diff --git a/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImplTest.java b/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImplTest.java index 4b94d9cdb6..809ea09e18 100644 --- a/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImplTest.java +++ b/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/authenticator/GitHubAuthenticatorImplTest.java @@ -14,8 +14,8 @@ import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMod import static org.eclipse.che.ide.api.notification.StatusNotification.Status.SUCCESS; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.RETURNS_DEFAULTS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -48,7 +48,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; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -141,7 +140,8 @@ public class GitHubAuthenticatorImplTest { verify(view).isGenerateKeysSelected(); verify(registry).getUploader(eq(GITHUB_HOST)); verify(appContext).getCurrentUser(); - verify(sshKeyUploader).uploadKey(eq(userId), Matchers.>anyObject()); + verify(sshKeyUploader) + .uploadKey(eq(userId), org.mockito.ArgumentMatchers.>anyObject()); } @Test @@ -202,7 +202,9 @@ public class GitHubAuthenticatorImplTest { when(appContext.getCurrentUser()).thenReturn(user); when(user.getId()).thenReturn(userId); when(dialogFactory.createMessageDialog( - nullable(String.class), nullable(String.class), Matchers.anyObject())) + nullable(String.class), + nullable(String.class), + org.mockito.ArgumentMatchers.anyObject())) .thenReturn(messageDialog); gitHubAuthenticator.authenticate(null, getCallBack()); @@ -217,7 +219,9 @@ public class GitHubAuthenticatorImplTest { verify(appContext).getCurrentUser(); verify(dialogFactory) .createMessageDialog( - nullable(String.class), nullable(String.class), Matchers.anyObject()); + nullable(String.class), + nullable(String.class), + org.mockito.ArgumentMatchers.anyObject()); verify(messageDialog).show(); verify(sshServiceClient).getPairs(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); } @@ -239,7 +243,9 @@ public class GitHubAuthenticatorImplTest { when(appContext.getCurrentUser()).thenReturn(user); when(user.getId()).thenReturn(userId); when(dialogFactory.createMessageDialog( - nullable(String.class), nullable(String.class), Matchers.anyObject())) + nullable(String.class), + nullable(String.class), + org.mockito.ArgumentMatchers.anyObject())) .thenReturn(messageDialog); when(pair.getName()).thenReturn(GITHUB_HOST); when(pair.getService()).thenReturn(SshKeyManagerPresenter.VCS_SSH_SERVICE); @@ -259,7 +265,9 @@ public class GitHubAuthenticatorImplTest { verify(appContext).getCurrentUser(); verify(dialogFactory) .createMessageDialog( - nullable(String.class), nullable(String.class), Matchers.anyObject()); + nullable(String.class), + nullable(String.class), + org.mockito.ArgumentMatchers.anyObject()); verify(messageDialog).show(); verify(sshServiceClient).getPairs(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); verify(sshServiceClient) diff --git a/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/importer/page/GithubImporterPagePresenterTest.java b/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/importer/page/GithubImporterPagePresenterTest.java index a122d1d0e2..76be63dc04 100644 --- a/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/importer/page/GithubImporterPagePresenterTest.java +++ b/plugins/plugin-github/che-plugin-github-ide/src/test/java/org/eclipse/che/plugin/github/ide/importer/page/GithubImporterPagePresenterTest.java @@ -12,11 +12,11 @@ package org.eclipse.che.plugin.github.ide.importer.page; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +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.any; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -62,7 +62,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.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; @@ -174,9 +173,9 @@ public class GithubImporterPagePresenterTest { verify(view).setInputsEnableState(eq(false)); verify(view).setLoaderVisibility(eq(false)); verify(view).setInputsEnableState(eq(true)); - verify(view).setAccountNames(Matchers.anyObject()); + verify(view).setAccountNames(org.mockito.ArgumentMatchers.anyObject()); verify(view, times(2)).showGithubPanel(); - verify(view).setRepositories(Matchers.>anyObject()); + verify(view).setRepositories(org.mockito.ArgumentMatchers.>anyObject()); verify(view).reset(); } @@ -205,7 +204,8 @@ public class GithubImporterPagePresenterTest { verify(view).setInputsEnableState(eq(true)); verify(view, never()).setAccountNames((Set) anyObject()); verify(view, never()).showGithubPanel(); - verify(view, never()).setRepositories(Matchers.>anyObject()); + verify(view, never()) + .setRepositories(org.mockito.ArgumentMatchers.>anyObject()); } @Test @@ -524,7 +524,8 @@ public class GithubImporterPagePresenterTest { verify(view, times(2)).setInputsEnableState(eq(true)); verify(view, never()).setAccountNames((Set) anyObject()); verify(view, never()).showGithubPanel(); - verify(view, never()).setRepositories(Matchers.>anyObject()); + verify(view, never()) + .setRepositories(org.mockito.ArgumentMatchers.>anyObject()); } @Test diff --git a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/test/java/org/eclipse/che/ide/ext/gwt/client/command/GwtCommandTypeTest.java b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/test/java/org/eclipse/che/ide/ext/gwt/client/command/GwtCommandTypeTest.java index 3149acfe6e..27794b4f2f 100644 --- a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/test/java/org/eclipse/che/ide/ext/gwt/client/command/GwtCommandTypeTest.java +++ b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/test/java/org/eclipse/che/ide/ext/gwt/client/command/GwtCommandTypeTest.java @@ -23,7 +23,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) diff --git a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/test/java/org/eclipse/che/ide/ext/gwt/client/command/GwtPagePresenterTest.java b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/test/java/org/eclipse/che/ide/ext/gwt/client/command/GwtPagePresenterTest.java index 9861fc6493..7bb4a83ec6 100644 --- a/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/test/java/org/eclipse/che/ide/ext/gwt/client/command/GwtPagePresenterTest.java +++ b/plugins/plugin-gwt/che-plugin-gwt-ext-gwt/src/test/java/org/eclipse/che/ide/ext/gwt/client/command/GwtPagePresenterTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.ide.ext.gwt.client.command; -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; @@ -24,7 +24,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) diff --git a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/test/java/org/eclipse/che/plugin/jdb/ide/configuration/JavaDebugConfigurationPagePresenterTest.java b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/test/java/org/eclipse/che/plugin/jdb/ide/configuration/JavaDebugConfigurationPagePresenterTest.java index 64065baddb..30b082e763 100644 --- a/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/test/java/org/eclipse/che/plugin/jdb/ide/configuration/JavaDebugConfigurationPagePresenterTest.java +++ b/plugins/plugin-java-debugger/che-plugin-java-debugger-ide/src/test/java/org/eclipse/che/plugin/jdb/ide/configuration/JavaDebugConfigurationPagePresenterTest.java @@ -11,7 +11,7 @@ package org.eclipse.che.plugin.jdb.ide.configuration; import static java.lang.Boolean.TRUE; -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; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/ClasspathContainerTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/ClasspathContainerTest.java index b1c2dfdf07..b56d230d02 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/ClasspathContainerTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/ClasspathContainerTest.java @@ -11,7 +11,7 @@ package org.eclipse.che.ide.ext.java.client.command; 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.reset; 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; /** @author Valeriy Svydenko */ @RunWith(MockitoJUnitRunner.class) diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/JavaCommandPagePresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/JavaCommandPagePresenterTest.java index 25fc452549..c66df20c9f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/JavaCommandPagePresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/JavaCommandPagePresenterTest.java @@ -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; /** @author Valeriy Svydenko */ @RunWith(MockitoJUnitRunner.class) diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/valueproviders/ClasspathMacroTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/valueproviders/ClasspathMacroTest.java index 8948442b6a..5eea58d60f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/valueproviders/ClasspathMacroTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/valueproviders/ClasspathMacroTest.java @@ -14,7 +14,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static org.eclipse.che.ide.ext.java.shared.ClasspathEntryKind.LIBRARY; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -44,7 +44,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; /** @author Valeriy Svydenko */ @RunWith(MockitoJUnitRunner.class) diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/valueproviders/OutputDirMacroTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/valueproviders/OutputDirMacroTest.java index 6cc1f3f06d..6ab932be6c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/valueproviders/OutputDirMacroTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/valueproviders/OutputDirMacroTest.java @@ -14,7 +14,7 @@ import static java.util.Collections.singletonList; import static org.eclipse.che.ide.ext.java.shared.Constants.LANGUAGE; import static org.eclipse.che.ide.ext.java.shared.Constants.OUTPUT_FOLDER; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/valueproviders/SourcepathMacroTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/valueproviders/SourcepathMacroTest.java index e916668830..de3df5ba62 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/valueproviders/SourcepathMacroTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/command/valueproviders/SourcepathMacroTest.java @@ -12,7 +12,7 @@ package org.eclipse.che.ide.ext.java.client.command.valueproviders; import static java.util.Collections.singletonList; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -41,7 +41,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; /** @author Valeriy Svydenko */ @RunWith(MockitoJUnitRunner.class) diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcilerStrategyTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcilerStrategyTest.java index 4ccb45e88a..2bb315e563 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcilerStrategyTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/editor/JavaReconcilerStrategyTest.java @@ -12,9 +12,9 @@ package org.eclipse.che.ide.ext.java.client.editor; import static org.eclipse.che.ide.project.ResolvingProjectStateHolder.ResolvingProjectState.IN_PROGRESS; import static org.eclipse.che.ide.project.ResolvingProjectStateHolder.ResolvingProjectState.RESOLVED; +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; @@ -50,9 +50,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; /** @author Roman Nikitenko */ @RunWith(MockitoJUnitRunner.class) @@ -103,7 +102,8 @@ public class JavaReconcilerStrategyTest { when(localizationConstant.codeAssistErrorMessageResolvingProject()).thenReturn("error"); when(client.reconcile(anyString(), anyString())).thenReturn(reconcileResultPromise); - when(reconcileResultPromise.onSuccess(Matchers.>any())) + when(reconcileResultPromise.onSuccess( + org.mockito.ArgumentMatchers.>any())) .thenReturn(reconcileResultPromise); javaReconcilerStrategy.setDocument(mock(Document.class)); diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/formatter/preferences/FormatterPreferencePagePresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/formatter/preferences/FormatterPreferencePagePresenterTest.java index 0bf74fbcc4..a7650636ed 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/formatter/preferences/FormatterPreferencePagePresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/formatter/preferences/FormatterPreferencePagePresenterTest.java @@ -11,8 +11,8 @@ package org.eclipse.che.ide.ext.java.client.formatter.preferences; import static org.junit.Assert.assertFalse; -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.verify; @@ -31,7 +31,6 @@ import org.eclipse.che.ide.ext.java.client.formatter.JavaFormatterServiceClient; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Matchers; import org.mockito.Mock; @RunWith(GwtMockitoTestRunner.class) @@ -55,7 +54,8 @@ public class FormatterPreferencePagePresenterTest { when(javaFormatterServiceClient.updateProjectFormatter(anyString(), anyString())) .thenReturn(updatingResponce); when(javaFormatterServiceClient.updateRootFormatter(anyString())).thenReturn(updatingResponce); - when(updatingResponce.then(Matchers.>anyObject())).thenReturn(updatingResponce); + when(updatingResponce.then(org.mockito.ArgumentMatchers.>anyObject())) + .thenReturn(updatingResponce); presenter = new FormatterPreferencePagePresenter( diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/navigation/filestructure/FileStructurePresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/navigation/filestructure/FileStructurePresenterTest.java index e4a5f2a735..213fe5e1fa 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/navigation/filestructure/FileStructurePresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/navigation/filestructure/FileStructurePresenterTest.java @@ -10,10 +10,10 @@ */ package org.eclipse.che.ide.ext.java.client.navigation.filestructure; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +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,10 +47,9 @@ 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.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class FileStructurePresenterTest { @@ -99,8 +98,10 @@ public class FileStructurePresenterTest { when(relatedProject.getLocation()).thenReturn(Path.valueOf("/project")); when(javaNavigationService.getCompilationUnit(any(Path.class), anyString(), anyBoolean())) .thenReturn(promise); - when(promise.then(Matchers.>anyObject())).thenReturn(promise); - when(promise.catchError(Matchers.>anyObject())).thenReturn(promise); + when(promise.then(org.mockito.ArgumentMatchers.>anyObject())) + .thenReturn(promise); + when(promise.catchError(org.mockito.ArgumentMatchers.>anyObject())) + .thenReturn(promise); when(loaderFactory.newLoader()).thenReturn(loader); presenter = @@ -143,6 +144,7 @@ public class FileStructurePresenterTest { verify(editor).setFocus(); verify(editor).getDocument(); - verify(document).setSelectedRange(Matchers.anyObject(), eq(true)); + verify(document) + .setSelectedRange(org.mockito.ArgumentMatchers.anyObject(), eq(true)); } } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/navigation/openimplementation/OpenImplementationPresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/navigation/openimplementation/OpenImplementationPresenterTest.java index f0c350f711..357e6eab1b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/navigation/openimplementation/OpenImplementationPresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/navigation/openimplementation/OpenImplementationPresenterTest.java @@ -11,10 +11,10 @@ package org.eclipse.che.ide.ext.java.client.navigation.openimplementation; import static org.mockito.Answers.RETURNS_DEEP_STUBS; -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 static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenterTest.java index 0f35bd4a66..0c807c4fdf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/organizeimports/OrganizeImportsPresenterTest.java @@ -10,9 +10,9 @@ */ package org.eclipse.che.ide.ext.java.client.organizeimports; -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.reset; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -46,7 +46,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.mockito.Mockito; @@ -103,11 +102,13 @@ public class OrganizeImportsPresenterTest { when(clientServerEventService.sendFileTrackingSuspendEvent()) .thenReturn(fileTrackingSuspendEventPromise); - when(fileTrackingSuspendEventPromise.then(Matchers.>anyObject())) + when(fileTrackingSuspendEventPromise.then( + org.mockito.ArgumentMatchers.>anyObject())) .thenReturn(fileTrackingSuspendEventPromise); when(javaCodeAssistClient.organizeImports(anyString(), anyString())).thenReturn(importsPromise); - when(importsPromise.then(Matchers.>anyObject())) + when(importsPromise.then( + org.mockito.ArgumentMatchers.>anyObject())) .thenReturn(importsPromise); presenter = @@ -231,10 +232,12 @@ public class OrganizeImportsPresenterTest { public void focusShouldBeSetAfterApplyingConflicts() throws Exception { when(view.getSelectedImport()).thenReturn("import1"); when(dtoFactory.createDto(ConflictImportDTO.class)).thenReturn(conflict1); - when(conflict1.withTypeMatches(Matchers.>anyObject())).thenReturn(conflict1); + when(conflict1.withTypeMatches(org.mockito.ArgumentMatchers.>anyObject())) + .thenReturn(conflict1); when(javaCodeAssistClient.applyChosenImports(anyString(), anyString(), any())) .thenReturn(resolveConflictsPromise); - when(resolveConflictsPromise.then(Matchers.>>anyObject())) + when(resolveConflictsPromise.then( + org.mockito.ArgumentMatchers.>>anyObject())) .thenReturn(resolveConflictsPromise); showOrganizeImportsWindow(); diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/move/CutJavaSourceActionTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/move/CutJavaSourceActionTest.java index 63ec94398b..7d25dfc428 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/move/CutJavaSourceActionTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/move/CutJavaSourceActionTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.ide.ext.java.client.refactoring.move; -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; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/move/wizard/MovePresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/move/wizard/MovePresenterTest.java index f5ba8e9459..339be256dd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/move/wizard/MovePresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/move/wizard/MovePresenterTest.java @@ -17,11 +17,11 @@ import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringSta import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatus.INFO; import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatus.OK; import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatus.WARNING; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyList; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -67,7 +67,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.mockito.Mockito; @@ -160,9 +159,11 @@ public class MovePresenterTest { when(refactorService.setMoveSettings(moveSettings)).thenReturn(moveSettingsPromise); when(moveSettingsPromise.thenPromise( - Matchers.>>anyObject())) + org.mockito.ArgumentMatchers + .>>anyObject())) .thenReturn(changeCreationResultPromise); - when(changeCreationResultPromise.then(Matchers.>anyObject())) + when(changeCreationResultPromise.then( + org.mockito.ArgumentMatchers.>anyObject())) .thenReturn(changeCreationResultPromise); presenter = diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/preview/PreviewPresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/preview/PreviewPresenterTest.java index ca41046b46..1dbb0623b6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/preview/PreviewPresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/preview/PreviewPresenterTest.java @@ -11,9 +11,9 @@ package org.eclipse.che.ide.ext.java.client.refactoring.preview; import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatus.OK; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyList; -import static org.mockito.Matchers.anyObject; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/JavaRefactoringRenameTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/JavaRefactoringRenameTest.java index a6b5330913..3f3eb35b4e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/JavaRefactoringRenameTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/JavaRefactoringRenameTest.java @@ -18,13 +18,13 @@ import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringSta import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatus.OK; import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.RefactoringStatus.WARNING; import static org.junit.Assert.assertFalse; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyList; +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.any; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyList; -import static org.mockito.Matchers.anyObject; -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.times; @@ -81,10 +81,9 @@ 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.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** * @author Alexander Andrinko @@ -198,7 +197,8 @@ public class JavaRefactoringRenameTest { mainCheckRenameRefactoring(); - verify(refactoringUpdater).updateAfterRefactoring(Matchers.>any()); + verify(refactoringUpdater) + .updateAfterRefactoring(org.mockito.ArgumentMatchers.>any()); verify(eventBus).addHandler(FileEvent.TYPE, refactoringRename); verify(updateAfterRefactoringPromise).then(updateAfterRefactoringOperation.capture()); @@ -302,8 +302,8 @@ public class JavaRefactoringRenameTest { nullable(String.class), nullable(String.class), nullable(String.class), - Matchers.anyObject(), - Matchers.anyObject()); + org.mockito.ArgumentMatchers.anyObject(), + org.mockito.ArgumentMatchers.anyObject()); verify(confirmDialog).show(); } @@ -348,8 +348,8 @@ public class JavaRefactoringRenameTest { nullable(String.class), nullable(String.class), nullable(String.class), - Matchers.anyObject(), - Matchers.anyObject()); + org.mockito.ArgumentMatchers.anyObject(), + org.mockito.ArgumentMatchers.anyObject()); verify(confirmDialog).show(); } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/wizard/RenamePresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/wizard/RenamePresenterTest.java index bba24b7d6d..bec7e5315c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/wizard/RenamePresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/refactoring/rename/wizard/RenamePresenterTest.java @@ -13,11 +13,11 @@ package org.eclipse.che.ide.ext.java.client.refactoring.rename.wizard; import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.CreateRenameRefactoring.RenameType.COMPILATION_UNIT; import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.CreateRenameRefactoring.RenameType.JAVA_ELEMENT; import static org.eclipse.che.ide.ext.java.shared.dto.refactoring.CreateRenameRefactoring.RenameType.PACKAGE; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyList; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -76,7 +76,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) @@ -164,7 +163,7 @@ public class RenamePresenterTest { .thenReturn(renameRefactoringSessionPromise); when(session.getWizardType()).thenReturn(RenameRefactoringSession.RenameWizard.LOCAL_VARIABLE); when(renameRefactoringSessionPromise.then( - Matchers.>anyObject())) + org.mockito.ArgumentMatchers.>anyObject())) .thenReturn(renameRefactoringSessionPromise); when(view.isUpdateDelegateUpdating()).thenReturn(true); when(view.isUpdateQualifiedNames()).thenReturn(true); @@ -173,11 +172,13 @@ public class RenamePresenterTest { .thenReturn(RenameSettings.MachStrategy.SUFFIX); when(refactorService.setRenameSettings(renameSettings)).thenReturn(renameSettingsPromise); when(renameSettingsPromise.thenPromise( - Matchers.>>any())) + org.mockito.ArgumentMatchers.>>any())) .thenReturn(changeCreationResultPromise); - when(changeCreationResultPromise.then(Matchers.>any())) + when(changeCreationResultPromise.then( + org.mockito.ArgumentMatchers.>any())) .thenReturn(changeCreationResultPromise); - when(changeCreationResultPromise.catchError(Matchers.>anyObject())) + when(changeCreationResultPromise.catchError( + org.mockito.ArgumentMatchers.>anyObject())) .thenReturn(changeCreationResultPromise); when(refactorService.applyRefactoring(refactoringSession)).thenReturn(refactoringStatusPromise); @@ -188,7 +189,8 @@ public class RenamePresenterTest { when(refactoringUpdater.handleMovingFiles(anyList())).thenReturn(handleMovingFilesPromise); when(refactoringUpdater.updateAfterRefactoring(anyList())) .thenReturn(updateAfterRefactoringPromise); - when(updateAfterRefactoringPromise.then(Matchers.>anyObject())) + when(updateAfterRefactoringPromise.then( + org.mockito.ArgumentMatchers.>anyObject())) .thenReturn(updateAfterRefactoringPromise); renamePresenter = @@ -594,7 +596,8 @@ public class RenamePresenterTest { verify(updateAfterRefactoringPromise).then(updateAfterRefactoringOperation.capture()); updateAfterRefactoringOperation.getValue().apply(null); - verify(refactoringUpdater).updateAfterRefactoring(Matchers.>anyObject()); + verify(refactoringUpdater) + .updateAfterRefactoring(org.mockito.ArgumentMatchers.>anyObject()); verify(refactoringUpdater).handleMovingFiles(anyList()); verify(clientServerEventService).sendFileTrackingResumeEvent(); } @@ -634,7 +637,8 @@ public class RenamePresenterTest { verify(view).hide(); verify(updateAfterRefactoringPromise).then(updateAfterRefactoringOperation.capture()); updateAfterRefactoringOperation.getValue().apply(null); - verify(refactoringUpdater).updateAfterRefactoring(Matchers.>anyObject()); + verify(refactoringUpdater) + .updateAfterRefactoring(org.mockito.ArgumentMatchers.>anyObject()); verify(refactoringUpdater).handleMovingFiles(anyList()); verify(clientServerEventService).sendFileTrackingResumeEvent(); } @@ -731,8 +735,8 @@ public class RenamePresenterTest { nullable(String.class), nullable(String.class), nullable(String.class), - Matchers.anyObject(), - Matchers.anyObject())) + org.mockito.ArgumentMatchers.anyObject(), + org.mockito.ArgumentMatchers.anyObject())) .thenReturn(dialog); renamePresenter.onAcceptButtonClicked(); @@ -745,8 +749,8 @@ public class RenamePresenterTest { nullable(String.class), nullable(String.class), nullable(String.class), - Matchers.anyObject(), - Matchers.anyObject()); + org.mockito.ArgumentMatchers.anyObject(), + org.mockito.ArgumentMatchers.anyObject()); verify(dialog).show(); } diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenterTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenterTest.java index c9df37c29c..195d5c1b4b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/compiler/JavaCompilerPreferencePresenterTest.java @@ -32,9 +32,9 @@ import static org.eclipse.che.ide.ext.java.client.settings.compiler.ErrorWarning import static org.eclipse.che.ide.ext.java.client.settings.compiler.ErrorWarningsOptions.USAGE_OF_RAW_TYPE; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; +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.times; import static org.mockito.Mockito.verify; @@ -62,9 +62,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; /** @author Dmitry Shnurenko */ @RunWith(MockitoJUnitRunner.class) @@ -99,9 +98,10 @@ public class JavaCompilerPreferencePresenterTest { @Before public void setUp() { when(preferencesManager.loadPreferences()).thenReturn(mapPromise); - when(mapPromise.then(Matchers.>>anyObject())) + when(mapPromise.then(org.mockito.ArgumentMatchers.>>anyObject())) .thenReturn(mapPromise); - when(propertyFactory.create(Matchers.anyObject())).thenReturn(widget); + when(propertyFactory.create(org.mockito.ArgumentMatchers.anyObject())) + .thenReturn(widget); presenter.setUpdateDelegate(dirtyStateListener); } @@ -224,7 +224,8 @@ public class JavaCompilerPreferencePresenterTest { verify(mapPromise).then(operationCaptor.capture()); operationCaptor.getValue().apply(getAllProperties()); - verify(propertyFactory, times(18)).create(Matchers.anyObject()); + verify(propertyFactory, times(18)) + .create(org.mockito.ArgumentMatchers.anyObject()); verify(widget, times(18)).selectPropertyValue(nullable(String.class)); verify(widget, times(18)).setDelegate(presenter); verify(view, times(18)).addProperty(widget); diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/property/PropertyNameManagerTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/property/PropertyNameManagerTest.java index 9234fb301f..8db1883a62 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/property/PropertyNameManagerTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/property/PropertyNameManagerTest.java @@ -21,7 +21,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 Dmitry Shnurenko */ @RunWith(MockitoJUnitRunner.class) diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/property/PropertyWidgetImplTest.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/property/PropertyWidgetImplTest.java index 232b113b24..826910e235 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/property/PropertyWidgetImplTest.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/java/org/eclipse/che/ide/ext/java/client/settings/property/PropertyWidgetImplTest.java @@ -25,7 +25,6 @@ import org.eclipse.che.ide.ext.java.client.settings.property.PropertyWidget.Acti import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Matchers; import org.mockito.Mock; /** @author Dmitry Shnurenko */ @@ -42,7 +41,8 @@ public class PropertyWidgetImplTest { @Before public void setUp() { - when(nameManager.getName(Matchers.anyObject())).thenReturn(SOME_TEXT); + when(nameManager.getName(org.mockito.ArgumentMatchers.anyObject())) + .thenReturn(SOME_TEXT); widget = new PropertyWidgetImpl(nameManager, DEAD_CODE); widget.setDelegate(delegate); diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/projects/testproject/src/main/java/com/codenvy/test/MyClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/projects/testproject/src/main/java/com/codenvy/test/MyClass.java index 67e0fd2420..6a2f6442d2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/projects/testproject/src/main/java/com/codenvy/test/MyClass.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/projects/testproject/src/main/java/com/codenvy/test/MyClass.java @@ -29,4 +29,4 @@ public class MyClass extends ArrayList implements Closeable{ public int aadad(String parameterName){ return 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/projects/testproject/src/test/java/com/codenvy/testtest/Test.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/projects/testproject/src/test/java/com/codenvy/testtest/Test.java index 737ec5afb6..1bd444bbe0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/projects/testproject/src/test/java/com/codenvy/testtest/Test.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/projects/testproject/src/test/java/com/codenvy/testtest/Test.java @@ -12,4 +12,4 @@ package org.eclipse.che.testtest; public class Test{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveArrayLength.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveArrayLength.java index 9ed313ba38..42c08eda66 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveArrayLength.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveArrayLength.java @@ -3,4 +3,4 @@ public class ResolveArrayLength { Object[] array = new Object[0]; return array.length; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass1.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass1.java index 142bd1531c..e93ff25eb2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass1.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass1.java @@ -2,4 +2,4 @@ import java.util.concurrent.atomic.*; public class ResolveClass1{ private AtomicBoolean[] x; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass2.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass2.java index 194b5143a3..49e057350d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass2.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass2.java @@ -3,4 +3,4 @@ public class ResolveClass2{ public void foo() { AtomicBoolean x = null; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass3.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass3.java index 4fe4cfcc7e..a7050d6a58 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass3.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass3.java @@ -1,4 +1,4 @@ import java.util.concurrent.atomic.*; public class ResolveClass3{ AtomicBoolean[] x = new AtomicBoolean[]{}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass4.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass4.java index 67dab21565..103067ddf4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass4.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass4.java @@ -3,4 +3,4 @@ public class ResolveClass4{ public AtomicBoolean foo() { return null; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass5.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass5.java index 16ea210aad..2c8e58f0ba 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass5.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass5.java @@ -2,4 +2,4 @@ import java.util.concurrent.atomic.*; public class ResolveClass5{ public void foo(AtomicBoolean x) { } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass6.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass6.java index 503ab83053..224f6f5eeb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass6.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveClass6.java @@ -1,4 +1,4 @@ public class ResolveClass6 extends java.util.concurrent.atomic.AtomicBoolean { -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveConstructor.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveConstructor.java index ea12fa5922..69a892eb4e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveConstructor.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveConstructor.java @@ -6,4 +6,4 @@ public class ResolveConstructor { public void foo() { ResolveConstructor c = new ResolveConstructor(""); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveExplicitSuperConstructorCall.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveExplicitSuperConstructorCall.java index a0b3f46ddb..b37539f13f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveExplicitSuperConstructorCall.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveExplicitSuperConstructorCall.java @@ -3,4 +3,4 @@ public class ResolveExplicitSuperConstructorCall extends BigDecimal { public ResolveExplicitSuperConstructorCall(int x){ super(x); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveExplicitThisConstructorCall.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveExplicitThisConstructorCall.java index 68d82fda57..eed438777e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveExplicitThisConstructorCall.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveExplicitThisConstructorCall.java @@ -6,4 +6,4 @@ public class ResolveExplicitThisConstructorCall { public ResolveExplicitThisConstructorCall(int x){ this(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveField.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveField.java index 4672288c3e..2fda85734a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveField.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveField.java @@ -3,4 +3,4 @@ public class ResolveField { public void bar() { this.foo = 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveInnerClassAsParamater.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveInnerClassAsParamater.java index e3baec5d50..c783f3661a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveInnerClassAsParamater.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveInnerClassAsParamater.java @@ -8,4 +8,4 @@ public class ResolveInnerClassAsParamater { void bar(Inner i) { foo(i); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveInterface.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveInterface.java index de032f0dd8..b699b9184d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveInterface.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveInterface.java @@ -1,3 +1,3 @@ public class ResolveInterface implements java.util.RandomAccess { -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass1.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass1.java index 701c76b7be..3ff89fcd8e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass1.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass1.java @@ -6,4 +6,4 @@ public class ResolveLocalClass1{ private Y[] y; } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass2.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass2.java index ad0c608f2d..0a69778b74 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass2.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass2.java @@ -4,4 +4,4 @@ public class ResolveLocalClass2{ } Y y = null; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass3.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass3.java index 9a7657c982..b0254600e4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass3.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass3.java @@ -4,4 +4,4 @@ public class ResolveLocalClass3{ } Y[] y = new Y[]{}; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass4.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass4.java index 38e0da77f1..f4a7cef6c4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass4.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass4.java @@ -8,4 +8,4 @@ public class ResolveLocalClass4{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass5.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass5.java index bfef3a81af..c121b7025a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass5.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass5.java @@ -7,4 +7,4 @@ public class ResolveLocalClass5{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass6.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass6.java index da97a677f0..601976d4c3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass6.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass6.java @@ -5,4 +5,4 @@ public class ResolveLocalClass6 { class Z extends Y { // superclass } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass7.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass7.java index 011d30cf80..02e6f0c3fd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass7.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalClass7.java @@ -15,4 +15,4 @@ public class ResolveLocalClass7 { } }; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalConstructor.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalConstructor.java index e0781e8dcb..435279605c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalConstructor.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalConstructor.java @@ -10,4 +10,4 @@ public class ResolveLocalConstructor { } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalField.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalField.java index 71df8727c9..d277551c41 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalField.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalField.java @@ -7,4 +7,4 @@ public class ResolveLocalField { } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalField2.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalField2.java index 383a788a79..7b4dde9cf1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalField2.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalField2.java @@ -13,4 +13,4 @@ public class ResolveLocalField2 { } }; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalFieldDeclaration.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalFieldDeclaration.java index c147fd9544..a32007fa6d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalFieldDeclaration.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalFieldDeclaration.java @@ -4,4 +4,4 @@ public class ResolveLocalFieldDeclaration { public int fred; } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalMethod.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalMethod.java index 1ad0474471..f81e571488 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalMethod.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalMethod.java @@ -10,4 +10,4 @@ public class ResolveLocalMethod { } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalMethod2.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalMethod2.java index 1da700765b..03cd75b0a8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalMethod2.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalMethod2.java @@ -14,4 +14,4 @@ public class ResolveLocalMethod2 { } }; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalName.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalName.java index b649b5aa99..04d67840a5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalName.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveLocalName.java @@ -18,4 +18,4 @@ public class ResolveLocalName { } }; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveMessageSendOnBaseType.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveMessageSendOnBaseType.java index 32e51ee2fa..365a7a2355 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveMessageSendOnBaseType.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveMessageSendOnBaseType.java @@ -3,4 +3,4 @@ public class ResolveMessageSendOnBaseType { public int boo() { foo.hello(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveTypeEmptySelection.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveTypeEmptySelection.java index f66046da5d..628f02d866 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveTypeEmptySelection.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveTypeEmptySelection.java @@ -1,3 +1,3 @@ public class ResolveTypeEmptySelection { Object o; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveTypeEmptySelection2.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveTypeEmptySelection2.java index e2732ff930..583e3c6cc2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveTypeEmptySelection2.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveTypeEmptySelection2.java @@ -1,3 +1,3 @@ public class ResolveTypeEmptySelection2 { Object o; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveTypeInComment.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveTypeInComment.java index b94a7e941f..a4c691ec03 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveTypeInComment.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src/ResolveTypeInComment.java @@ -1,4 +1,4 @@ import java.util.concurrent.atomic.AtomicBoolean; public class ResolveTypeInComment{ /* return AtomicBoolean */ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src2/test0001/Test.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src2/test0001/Test.java index 093ad72343..d8b511ba9d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src2/test0001/Test.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src2/test0001/Test.java @@ -5,4 +5,4 @@ public class Test { } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src2/test0002/Test.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src2/test0002/Test.java index 5f5924d30c..c58b18519e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src2/test0002/Test.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src2/test0002/Test.java @@ -6,4 +6,4 @@ public class Test { } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src2/test0003/Test.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src2/test0003/Test.java index 29b96100f0..e7b4362955 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src2/test0003/Test.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src2/test0003/Test.java @@ -6,4 +6,4 @@ public class Test { } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src2/test0005/Test.java b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src2/test0005/Test.java index a18cfe7139..994d90857b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src2/test0005/Test.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-client/src/test/resources/workspace/resolve/src2/test0005/Test.java @@ -6,4 +6,4 @@ public class Test { } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test0/in/A.java index b35040953c..11e7bb4b92 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test0/in/A.java @@ -5,4 +5,4 @@ class A{ } interface I { void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test0/out/A.java index fcfc86fccc..8470e78b8f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test0/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test0/out/A.java @@ -5,4 +5,4 @@ class A{ } interface I { void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test1/in/A.java index 1ef6f4dcab..789e37b9c3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test1/in/A.java @@ -5,4 +5,4 @@ class A implements I{ } interface I { void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test1/out/A.java index e34858d09d..ac9bbd537f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test1/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test1/out/A.java @@ -5,4 +5,4 @@ class A implements I{ } interface I { void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test10/in/A.java index 4880ef7c5a..f11dfb3ec3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test10/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test10/in/A.java @@ -6,4 +6,4 @@ interface I2 extends I{ } interface I3 extends I2{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test10/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test10/out/A.java index bdfa91eaa2..ec6104f1d3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test10/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test10/out/A.java @@ -6,4 +6,4 @@ interface I2 extends I{ } interface I3 extends I2{ void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test11/in/A.java index 275bd816ef..4550276244 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test11/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test11/in/A.java @@ -7,4 +7,4 @@ interface I2{ void m(); } interface I3 extends I, I2{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test11/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test11/out/A.java index 9c5c52b103..359bc57c07 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test11/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test11/out/A.java @@ -7,4 +7,4 @@ interface I2{ void k(); } interface I3 extends I, I2{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test12/in/A.java index fb2dbbfca7..15bd189738 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test12/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test12/in/A.java @@ -8,4 +8,4 @@ void m(); } interface I3 extends I, I2{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test12/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test12/out/A.java index 70a291f1a2..51de2853cc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test12/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test12/out/A.java @@ -8,4 +8,4 @@ void k(); } interface I3 extends I, I2{ void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test15/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test15/in/A.java index a32d28588d..609094a7f2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test15/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test15/in/A.java @@ -12,4 +12,4 @@ interface J1 extends J{ } interface I2 extends I1, J1{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test15/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test15/out/A.java index 25c1a19241..5d7ec5430e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test15/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test15/out/A.java @@ -12,4 +12,4 @@ interface J1 extends J{ } interface I2 extends I1, J1{ void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test16/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test16/in/A.java index 32d0d0d203..ee8cf070d5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test16/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test16/in/A.java @@ -8,4 +8,4 @@ interface J{ } class C implements I, J{ public void m(){}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test16/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test16/out/A.java index a98d2fe33f..74189519be 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test16/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test16/out/A.java @@ -8,4 +8,4 @@ interface J{ } class C implements I, J{ public void k(){}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test17/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test17/in/A.java index d8b4757ce0..c6efc50402 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test17/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test17/in/A.java @@ -11,4 +11,4 @@ class A{ } class C extends A implements I, J{ public void m(){}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test17/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test17/out/A.java index dc8dc48bc0..8fee089afc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test17/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test17/out/A.java @@ -11,4 +11,4 @@ class A{ } class C extends A implements I, J{ public void k(){}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test18/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test18/in/A.java index 75b5aa0cdf..6efd64b85e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test18/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test18/in/A.java @@ -15,4 +15,4 @@ class A{ } class C extends A implements I, J{ public void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test18/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test18/out/A.java index 7f42185323..2551031b05 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test18/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test18/out/A.java @@ -15,4 +15,4 @@ class A{ } class C extends A implements I, J{ public void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test2/in/A.java index 0211b7ea57..d1de7fc4b9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test2/in/A.java @@ -6,4 +6,4 @@ class A implements I{ } interface I { void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test2/out/A.java index 806e8b1316..0658e1d130 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test2/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test2/out/A.java @@ -6,4 +6,4 @@ class A implements I{ } interface I { void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test20/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test20/in/A.java index 4606b91aaf..166ce6ac9f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test20/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test20/in/A.java @@ -14,4 +14,4 @@ class A{ public void m(){} } class C extends A implements I, J{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test20/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test20/out/A.java index 0179740411..c77c433f4c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test20/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test20/out/A.java @@ -14,4 +14,4 @@ class A{ public void k(){} } class C extends A implements I, J{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test21/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test21/in/A.java index 6637d92a3e..1838e1efb9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test21/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test21/in/A.java @@ -36,4 +36,4 @@ class Test{ ((C)a).m(); a.m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test21/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test21/out/A.java index d8ecabedc6..3283ca1e9a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test21/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test21/out/A.java @@ -36,4 +36,4 @@ class Test{ ((C)a).k(); a.k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test22/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test22/in/A.java index bb8601f191..16dc545a96 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test22/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test22/in/A.java @@ -4,4 +4,4 @@ void m(); } interface I2{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test22/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test22/out/A.java index 9da5d69150..9084f5819a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test22/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test22/out/A.java @@ -4,4 +4,4 @@ void k(); } interface I2{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test24/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test24/in/A.java index 27496f9230..6af719f591 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test24/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test24/in/A.java @@ -8,4 +8,4 @@ interface I1 extends J{ void m(); } interface K extends I, I1{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test24/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test24/out/A.java index 0a0a4651ea..c77322f641 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test24/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test24/out/A.java @@ -8,4 +8,4 @@ interface I1 extends J{ void k(); } interface K extends I, I1{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test25/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test25/in/A.java index ccef3b0c86..5a80828bab 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test25/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test25/in/A.java @@ -10,4 +10,4 @@ void m(); class C implements I, I1{ public void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test25/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test25/out/A.java index a27964f9ca..78ccddeb69 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test25/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test25/out/A.java @@ -10,4 +10,4 @@ void k(); class C implements I, I1{ public void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test26/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test26/in/A.java index 6b63346c65..b472f205b0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test26/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test26/in/A.java @@ -1,4 +1,4 @@ package p; interface I{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test26/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test26/out/A.java index d3b34769b5..ef57d344ba 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test26/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test26/out/A.java @@ -1,4 +1,4 @@ package p; interface I{ void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test28/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test28/in/A.java index 82ab659994..160a9a3f2e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test28/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test28/in/A.java @@ -11,4 +11,4 @@ class B2 extends A implements I{ } interface J{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test28/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test28/out/A.java index 9104fdc034..2eb2af34e1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test28/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test28/out/A.java @@ -11,4 +11,4 @@ class B2 extends A implements I{ } interface J{ void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test29/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test29/in/A.java index e1fd82535d..20628d20b4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test29/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test29/in/A.java @@ -14,4 +14,4 @@ void m(); } class C implements J{ public void m(){}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test29/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test29/out/A.java index c9b5575659..3099751d25 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test29/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test29/out/A.java @@ -14,4 +14,4 @@ void k(); } class C implements J{ public void k(){}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test3/in/A.java index 4dcd03a031..e3b182eddf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test3/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test3/in/A.java @@ -7,4 +7,4 @@ class A extends B implements I{ } interface I { void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test3/out/A.java index 240933e573..5c1bc4234c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test3/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test3/out/A.java @@ -7,4 +7,4 @@ class A extends B implements I{ } interface I { void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test30/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test30/in/A.java index bfa4f7fc18..926aef15bd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test30/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test30/in/A.java @@ -13,4 +13,4 @@ public void m(){}; } interface K{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test30/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test30/out/A.java index 5f224c0a97..9b5fdbb741 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test30/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test30/out/A.java @@ -13,4 +13,4 @@ public void k(){}; } interface K{ void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test31/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test31/in/A.java index 0786e6f693..b9eb715afd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test31/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test31/in/A.java @@ -10,4 +10,4 @@ class T{ X x= new X(); x.m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test31/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test31/out/A.java index 6730892bf6..ccafa61e16 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test31/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test31/out/A.java @@ -10,4 +10,4 @@ class T{ X x= new X(); x.k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test32/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test32/in/A.java index 4f67f9bedb..9a607354ee 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test32/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test32/in/A.java @@ -11,4 +11,4 @@ class T implements I{ x.m(); m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test32/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test32/out/A.java index c1f58edbdb..0db48a980a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test32/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test32/out/A.java @@ -11,4 +11,4 @@ class T implements I{ x.k(); k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test33/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test33/in/A.java index 2aedcc361a..41138d37ac 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test33/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test33/in/A.java @@ -20,4 +20,4 @@ public void m(){} } interface I3{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test33/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test33/out/A.java index 1facb634a9..90d2c03e63 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test33/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test33/out/A.java @@ -20,4 +20,4 @@ public void k(){} } interface I3{ void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test34/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test34/in/A.java index 255c6b9cbd..8f09746d2a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test34/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test34/in/A.java @@ -9,4 +9,4 @@ public void m(){} } interface I1{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test34/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test34/out/A.java index 4b8563e496..5392d8b40f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test34/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test34/out/A.java @@ -9,4 +9,4 @@ public void k(){} } interface I1{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test35/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test35/in/A.java index 0b18234639..e0891fd854 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test35/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test35/in/A.java @@ -11,4 +11,4 @@ interface I3 extends I, I2{ class A implements I3{ public void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test35/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test35/out/A.java index fcbe37b715..405d5373d2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test35/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test35/out/A.java @@ -11,4 +11,4 @@ interface I3 extends I, I2{ class A implements I3{ public void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test36/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test36/in/A.java index 70cb32cacb..a44dbfd1e4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test36/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test36/in/A.java @@ -5,4 +5,4 @@ void m(); } interface I2{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test36/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test36/out/A.java index d8a8fe0d95..2e09e7260c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test36/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test36/out/A.java @@ -5,4 +5,4 @@ void k(); } interface I2{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test37/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test37/in/A.java index 51f4eb79f4..9ac606cd28 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test37/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test37/in/A.java @@ -9,4 +9,4 @@ void m(); interface I3 extends I{ } interface I4 extends I3, I2{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test37/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test37/out/A.java index 1feeb67bd4..372aca0a74 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test37/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test37/out/A.java @@ -9,4 +9,4 @@ void k(); interface I3 extends I{ } interface I4 extends I3, I2{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test38/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test38/in/A.java index 5f67be9ed7..29932d51f7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test38/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test38/in/A.java @@ -10,4 +10,4 @@ class B1 extends A implements I{ } class B2 extends A { public void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test38/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test38/out/A.java index 7ab2e0d202..694e58b122 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test38/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test38/out/A.java @@ -10,4 +10,4 @@ class B1 extends A implements I{ } class B2 extends A { public void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test39/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test39/in/A.java index 51f4eb79f4..9ac606cd28 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test39/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test39/in/A.java @@ -9,4 +9,4 @@ void m(); interface I3 extends I{ } interface I4 extends I3, I2{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test39/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test39/out/A.java index 1feeb67bd4..372aca0a74 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test39/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test39/out/A.java @@ -9,4 +9,4 @@ void k(); interface I3 extends I{ } interface I4 extends I3, I2{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test4/in/A.java index 70d4d12640..d3b194d682 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test4/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test4/in/A.java @@ -8,4 +8,4 @@ class A extends B implements I{ } interface I { void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test4/out/A.java index e6bd3c00ea..5350b82627 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test4/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test4/out/A.java @@ -8,4 +8,4 @@ class A extends B implements I{ } interface I { void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test40/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test40/in/A.java index 6ac8b0ebb4..52a9faab01 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test40/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test40/in/A.java @@ -13,4 +13,4 @@ public void m(){} } class C extends A implements I2{ public void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test40/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test40/out/A.java index 546a461678..8c30643f07 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test40/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test40/out/A.java @@ -13,4 +13,4 @@ public void k(){} } class C extends A implements I2{ public void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test41/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test41/in/A.java index 941088d4b3..b7e2159c8f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test41/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test41/in/A.java @@ -17,4 +17,4 @@ class C extends A implements I2{ public void m(){} public void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test41/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test41/out/A.java index 83eaff01bf..5bf7054186 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test41/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test41/out/A.java @@ -17,4 +17,4 @@ class C extends A implements I2{ public void m(){} public void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test42/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test42/in/A.java index 1215395e60..48afe2d61a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test42/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test42/in/A.java @@ -14,4 +14,4 @@ public void m(){} } class C extends A implements I2{ public void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test42/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test42/out/A.java index c0a9e5b16c..d64a7877e4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test42/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test42/out/A.java @@ -14,4 +14,4 @@ public void k(){} } class C extends A implements I2{ public void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test43/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test43/in/A.java index c210562d69..d012cba0ec 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test43/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test43/in/A.java @@ -9,4 +9,4 @@ class Test{ } class C implements I{ public void m(){}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test43/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test43/out/A.java index 3945ff48e9..87fc29e789 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test43/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test43/out/A.java @@ -9,4 +9,4 @@ class Test{ } class C implements I{ public void k(){}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test44/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test44/in/A.java index df5f328243..91b05b7aa3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test44/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test44/in/A.java @@ -20,4 +20,4 @@ class Test{ void k(){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test44/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test44/out/A.java index 303221114a..753ef2f9c4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test44/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test44/out/A.java @@ -20,4 +20,4 @@ class Test{ void k(){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test45/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test45/in/A.java index 27ca176d6a..fcd4276753 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test45/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test45/in/A.java @@ -17,4 +17,4 @@ class NotRel{ void f(){ m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test45/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test45/out/A.java index af2fc07848..2b5bb6e2c4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test45/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test45/out/A.java @@ -17,4 +17,4 @@ class NotRel{ void f(){ m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test46/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test46/in/A.java index c21e729835..a9d23e5749 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test46/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test46/in/A.java @@ -18,4 +18,4 @@ class NotRel{ void f(){ m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test46/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test46/out/A.java index d98d57e9a6..826bf7b5ba 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test46/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test46/out/A.java @@ -18,4 +18,4 @@ class NotRel{ void f(){ m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test5/in/A.java index b85dfa1e0e..95c0368dfa 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test5/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test5/in/A.java @@ -8,4 +8,4 @@ class A extends B{ } interface I { void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test5/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test5/out/A.java index 360aac9d41..5b7bf5742e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test5/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test5/out/A.java @@ -8,4 +8,4 @@ class A extends B{ } interface I { void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test6/in/A.java index 67da87aa4b..70d9c9cf84 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test6/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test6/in/A.java @@ -8,4 +8,4 @@ class A extends B implements I{ } interface I { void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test6/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test6/out/A.java index a75f6bd54e..fa41029dcb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test6/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test6/out/A.java @@ -8,4 +8,4 @@ class A extends B implements I{ } interface I { void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test7/in/A.java index 116b6bf768..c14a58dc6a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test7/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test7/in/A.java @@ -5,4 +5,4 @@ interface I { } interface I2 extends I{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test7/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test7/out/A.java index fb57224265..40a573bbd2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test7/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/test7/out/A.java @@ -5,4 +5,4 @@ interface I { } interface I2 extends I{ void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation2/in/A.java index 72cc8e0ef4..45e6ad62cd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation2/in/A.java @@ -3,4 +3,4 @@ package p; @I(thing="Description") @interface I { String thing(); // rename to "value" -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation2/out/A.java index 88d49c9426..11b24f1512 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation2/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation2/out/A.java @@ -3,4 +3,4 @@ package p; @I(value="Description") @interface I { String value(); // rename to "value" -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation4/in/A.java index 4b25d1a208..3a83458ab7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation4/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation4/in/A.java @@ -16,4 +16,4 @@ class A { return i.value(); } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation4/out/A.java index 81863bd542..58ad14cfff 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation4/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testAnnotation4/out/A.java @@ -16,4 +16,4 @@ class A { return i.num(); } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail0/in/A.java index c3d2d6bbf9..215d334170 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail0/in/A.java @@ -6,4 +6,4 @@ interface I{ class C implements I{ public void m(){} public void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail1/in/A.java index 7d763a1c57..0d845a7c4c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail1/in/A.java @@ -3,4 +3,4 @@ package p; interface I{ void m(); void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail10/in/A.java index 9c9d766975..4400fd74e5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail10/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail10/in/A.java @@ -8,4 +8,4 @@ class B extends A{ } interface I{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail11/in/A.java index ae2f6357bc..9bc833e04d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail11/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail11/in/A.java @@ -8,4 +8,4 @@ class B extends A{ } interface I{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail12/in/A.java index 824918aa92..502213fd17 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail12/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail12/in/A.java @@ -8,4 +8,4 @@ class B extends A{ } interface I{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail13/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail13/in/A.java index 0ee357b15f..c7ae1979e0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail13/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail13/in/A.java @@ -10,4 +10,4 @@ class B extends A{ } interface I{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail14/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail14/in/A.java index 3e0eeedba1..ee00333ed7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail14/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail14/in/A.java @@ -10,4 +10,4 @@ class B extends A{ } interface I{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail15/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail15/in/A.java index b921f193b0..da428543fe 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail15/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail15/in/A.java @@ -10,4 +10,4 @@ class A extends B implements I{ } interface I{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail16/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail16/in/A.java index 2ad70f1f46..c9b1d4b1f2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail16/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail16/in/A.java @@ -10,4 +10,4 @@ class A extends B implements I{ } interface I{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail17/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail17/in/A.java index c4a3e842a8..22e1032af6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail17/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail17/in/A.java @@ -10,4 +10,4 @@ class A extends B implements I{ } interface I{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail18/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail18/in/A.java index 1eddcad960..508c79dd79 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail18/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail18/in/A.java @@ -6,4 +6,4 @@ interface I { class B implements I{ public void m(){} private int k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail19/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail19/in/A.java index 3b7102c1a8..10225744b3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail19/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail19/in/A.java @@ -7,4 +7,4 @@ class A implements I{ } interface I{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail21/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail21/in/A.java index 3d78d9c177..fdeb57df76 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail21/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail21/in/A.java @@ -12,4 +12,4 @@ class B extends A{ } interface I{ void m(String k); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail22/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail22/in/A.java index f295f57757..4ace877bcf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail22/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail22/in/A.java @@ -12,4 +12,4 @@ class B extends A{ } interface I{ void m(Object s); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail23/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail23/in/A.java index 32b8728de6..09559aa531 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail23/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail23/in/A.java @@ -1,4 +1,4 @@ package p; interface I{ String toString(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail24/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail24/in/A.java index 694796b782..482cd3369a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail24/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail24/in/A.java @@ -8,4 +8,4 @@ class A extends B implements I{ } interface I{ abstract void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail25/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail25/in/A.java index 05bcab42cb..5d0703a277 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail25/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail25/in/A.java @@ -15,4 +15,4 @@ class B2 extends A implements I{ interface J{ void m(); void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail26/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail26/in/A.java index 0e4124e956..76207287ee 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail26/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail26/in/A.java @@ -16,4 +16,4 @@ void m(); class C implements J{ public void m(){}; public void k(){}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail27/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail27/in/A.java index 7d8be816c2..bd9757eac6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail27/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail27/in/A.java @@ -16,4 +16,4 @@ public void k(){}; interface K{ void m(); void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail28/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail28/in/A.java index 4975fe7382..a52a3a447c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail28/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail28/in/A.java @@ -22,4 +22,4 @@ public void k(){} interface I3{ void m(); void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail29/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail29/in/A.java index 0832d75c9c..e82768ddd1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail29/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail29/in/A.java @@ -11,4 +11,4 @@ class B1 extends A implements I{ class B2 extends A { public void m(){} public void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail30/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail30/in/A.java index 9be82b8451..e23283351f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail30/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail30/in/A.java @@ -4,4 +4,4 @@ interface I{ public java.lang.String toString(); } class A implements I{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail31/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail31/in/A.java index f77d7bdba8..ba2e3187d3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail31/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail31/in/A.java @@ -5,4 +5,4 @@ interface I{ } class A implements I{ public java.lang.String toString(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail32/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail32/in/A.java index 266de81a95..2ae7767abc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail32/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail32/in/A.java @@ -3,4 +3,4 @@ package p; interface I{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail33/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail33/in/A.java index 7f62c76c79..830dbd49bd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail33/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail33/in/A.java @@ -3,4 +3,4 @@ package p; interface I{ String m() throws Exception; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail34/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail34/in/A.java index acdbe6ab8d..0d178bc613 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail34/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail34/in/A.java @@ -3,4 +3,4 @@ package p; interface I{ void m(Object o); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail35/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail35/in/A.java index 49acc1a3f9..91eca918c2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail35/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail35/in/A.java @@ -3,4 +3,4 @@ package p; interface I{ void m(java.lang.Object o); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail36/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail36/in/A.java index 66c4eb3e8a..eaf90369da 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail36/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail36/in/A.java @@ -3,4 +3,4 @@ package p; interface I{ int m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail37/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail37/in/A.java index 85bfa66476..50639cc75e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail37/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail37/in/A.java @@ -3,4 +3,4 @@ package p; interface I{ String m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail38/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail38/in/A.java index 95dfb375c1..f0a4a5e4d5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail38/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail38/in/A.java @@ -3,4 +3,4 @@ package p; interface I{ String m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail39/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail39/in/A.java index 41a77fa41b..873acb9ddc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail39/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail39/in/A.java @@ -3,4 +3,4 @@ package p; interface I{ String m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail40/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail40/in/A.java index 4a86f82c0b..49b906cab1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail40/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail40/in/A.java @@ -3,4 +3,4 @@ package p; interface I{ String m(long timeout, int nanos); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail41/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail41/in/A.java index 4a022beaba..5e2b2ce7d9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail41/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail41/in/A.java @@ -3,4 +3,4 @@ package p; interface I{ String m(long timeout) throws InterruptedException; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail42/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail42/in/A.java index d9c9ece7a9..afd3a5b7ec 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail42/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail42/in/A.java @@ -3,4 +3,4 @@ package p; interface I{ String m() throws InterruptedException; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail43/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail43/in/A.java index 0b159e6ad2..f2ce56ad26 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail43/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail43/in/A.java @@ -3,4 +3,4 @@ package p; interface I{ String m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail44/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail44/in/A.java index 0a21f10387..4ffb52a2d6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail44/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail44/in/A.java @@ -5,4 +5,4 @@ void m(); } interface I2{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail45/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail45/in/A.java index 57d503fd9c..b84b271b01 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail45/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail45/in/A.java @@ -7,4 +7,4 @@ void m(); } interface I1 extends J{ void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail7/in/A.java index 623d3162c6..9bf6e8ddbe 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail7/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail7/in/A.java @@ -8,4 +8,4 @@ class A extends B implements I{ } interface I{ public void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail8/in/A.java index b0e229103d..a900f62bf7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail8/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameMethodInInterface/testFail8/in/A.java @@ -8,4 +8,4 @@ class A extends B implements I{ } interface I{ public void m(int y); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test0/in/A.java index 6ee5fccff1..573c3ebdbd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test0/in/A.java @@ -16,4 +16,4 @@ class B{ * @see A#f */ int f; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test0/out/A.java index e8c6ae98fa..e65f95d5fc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test0/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test0/out/A.java @@ -16,4 +16,4 @@ class B{ * @see A#g */ int f; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test1/in/A.java index f31ed2239d..9163ff5472 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test1/in/A.java @@ -4,4 +4,4 @@ class A{ void m(){ f++; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test1/out/A.java index b31f55ff82..2f9587ee5e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test1/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test1/out/A.java @@ -4,4 +4,4 @@ class A{ void m(){ g++; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test10/in/A.java index 47d015c8d4..2fc7f71969 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test10/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test10/in/A.java @@ -8,4 +8,4 @@ class A{ } f.k=0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test10/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test10/out/A.java index 9701909c52..ebe6b41098 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test10/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test10/out/A.java @@ -8,4 +8,4 @@ class A{ } g.k=0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test11/in/A.java index 212d6165c6..1fd5d3059a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test11/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test11/in/A.java @@ -7,4 +7,4 @@ class B extends A{ void m(){ int g= a.f; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test11/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test11/out/A.java index 4c6d120b3d..ef646fcae9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test11/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test11/out/A.java @@ -7,4 +7,4 @@ class B extends A{ void m(){ int g= a.g; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test12/in/A.java index cedb240107..85653ad540 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test12/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test12/in/A.java @@ -4,4 +4,4 @@ public class A { void m(){ A.f= 0; /**/ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test12/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test12/out/A.java index b62dcc2344..5e90831f4a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test12/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test12/out/A.java @@ -4,4 +4,4 @@ public class A { void m(){ A.g= 0; /**/ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test13/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test13/in/A.java index b2ef453623..49767735e0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test13/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test13/in/A.java @@ -4,4 +4,4 @@ public class A { void m(){ p.A.f= 0; /**/ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test13/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test13/out/A.java index 83bd4f733f..2243f68152 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test13/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test13/out/A.java @@ -4,4 +4,4 @@ public class A { void m(){ p.A.g= 0; /**/ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test14/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test14/in/A.java index 0fe2457c23..6628301525 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test14/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test14/in/A.java @@ -5,4 +5,4 @@ public class A { void m(){ p.A.f= 0; /**/ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test14/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test14/out/A.java index 309aa0e4c2..5803fc18df 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test14/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test14/out/A.java @@ -5,4 +5,4 @@ public class A { void m(){ p.A.f= 0; /**/ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test15/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test15/in/A.java index aa687946ea..ea09e1d1a8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test15/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test15/in/A.java @@ -10,4 +10,4 @@ class B{ void m(){ new A().f= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test15/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test15/out/A.java index 20f65e0e32..537b46ff81 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test15/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test15/out/A.java @@ -10,4 +10,4 @@ class B{ void m(){ new A().f= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test16/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test16/in/A.java index 62fd9d55ca..bebd10869d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test16/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test16/in/A.java @@ -4,4 +4,4 @@ class A{ public int getF() { return (this.f); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test16/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test16/out/A.java index 4e0847198c..219605698e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test16/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test16/out/A.java @@ -4,4 +4,4 @@ class A{ public int getF() { return (this.g); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test17/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test17/in/A.java index f97cafd3b9..a0519df3d5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test17/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test17/in/A.java @@ -4,4 +4,4 @@ class A{ public int getF() { return (this.f); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test17/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test17/out/A.java index e486fdde8b..3791d2217d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test17/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test17/out/A.java @@ -4,4 +4,4 @@ class A{ public int getF() { return (this.f); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test18/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test18/in/A.java index 1fc5e448c0..55372d3e13 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test18/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test18/in/A.java @@ -10,4 +10,4 @@ class A{ dont= "xp.A.field"; //xp.A.field dont= "B.field"; //B.field } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test18/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test18/out/A.java index 3bbb64e320..4544d336d0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test18/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test18/out/A.java @@ -10,4 +10,4 @@ class A{ dont= "xp.A.field"; //xp.A.field dont= "B.field"; //B.field } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test19/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test19/in/A.java index 556f0f1efd..7fea23c914 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test19/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test19/in/A.java @@ -23,4 +23,4 @@ class B { List list= a.getList(); list.addAll(a.list); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test19/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test19/out/A.java index 7e20c16e6a..331b53d0a7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test19/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test19/out/A.java @@ -23,4 +23,4 @@ class B { List list= a.getItems(); list.addAll(a.items); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test2/in/A.java index ff87d5087c..d50328bc3c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test2/in/A.java @@ -1,4 +1,4 @@ package p; interface A{ int f= 0; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test2/out/A.java index c083c1b5e7..865acec010 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test2/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test2/out/A.java @@ -1,4 +1,4 @@ package p; interface A{ int g= 0; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test20/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test20/in/A.java index 556f0f1efd..7fea23c914 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test20/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test20/in/A.java @@ -23,4 +23,4 @@ class B { List list= a.getList(); list.addAll(a.list); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test20/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test20/out/A.java index c65e0ed99a..2af03a012c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test20/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test20/out/A.java @@ -23,4 +23,4 @@ class B { List list= a.getList(); list.addAll(a.items); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test21/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test21/in/A.java index aad5385b28..532acd6e52 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test21/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test21/in/A.java @@ -13,4 +13,4 @@ enum A { class U { int one= A.ONE.fValue; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test21/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test21/out/A.java index e17a4f1625..34b0ac2ccc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test21/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test21/out/A.java @@ -13,4 +13,4 @@ enum A { class U { int one= A.ONE.fOrdinal; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test22/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test22/in/A.java index 58f65a5eef..8227c45109 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test22/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test22/in/A.java @@ -24,4 +24,4 @@ class B { Number tee=at.getTee(); at.setTee(null); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test22/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test22/out/A.java index ba15fefcf3..a9ae72b082 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test22/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test22/out/A.java @@ -24,4 +24,4 @@ class B { Number tee=at.getThing(); at.setThing(null); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test23/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test23/in/A.java index a2b00fa962..e5c982822d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test23/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test23/in/A.java @@ -12,4 +12,4 @@ class A { public void setF(Enum f) { this.f = f; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test23/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test23/out/A.java index 2bd494ef8a..407cbea275 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test23/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test23/out/A.java @@ -12,4 +12,4 @@ class A { public void setG(Enum f) { this.g = f; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test3/in/A.java index 8ae7bb8720..14d667e30a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test3/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test3/in/A.java @@ -20,4 +20,4 @@ class B{ void m(){ a.f= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test3/out/A.java index 38b1d2155d..20220f1be4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test3/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test3/out/A.java @@ -20,4 +20,4 @@ class B{ void m(){ a.g= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test4/in/A.java index 96cfc371a4..77799660db 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test4/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test4/in/A.java @@ -9,4 +9,4 @@ class B extends A{ void m(){ f= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test4/out/A.java index 700b2f6d81..2d7b6dfdb2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test4/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test4/out/A.java @@ -9,4 +9,4 @@ class B extends A{ void m(){ g= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test5/in/A.java index f6469d5c6c..0533499465 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test5/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test5/in/A.java @@ -15,4 +15,4 @@ class B{ void m(){ a.f= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test5/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test5/out/A.java index 51818fd132..4bf41b19f9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test5/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test5/out/A.java @@ -15,4 +15,4 @@ class B{ void m(){ a.g= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test6/in/A.java index 6e60f89b59..9b563152fb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test6/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test6/in/A.java @@ -19,4 +19,4 @@ class B{ b.f= 0; ab.f= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test6/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test6/out/A.java index d730014946..812c7b1d86 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test6/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test6/out/A.java @@ -19,4 +19,4 @@ class B{ b.f= 0; ab.g= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test7/in/A.java index 7553eba5c2..db719f2f4a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test7/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test7/in/A.java @@ -4,4 +4,4 @@ class A { void m(int g){ this.f= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test7/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test7/out/A.java index d332730fa0..933683b46e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test7/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test7/out/A.java @@ -4,4 +4,4 @@ class A { void m(int g){ this.g= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test8/in/A.java index 97e3a36216..ff2d1ac46b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test8/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test8/in/A.java @@ -5,4 +5,4 @@ class A{ void m(){ f.f.f.k=0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test8/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test8/out/A.java index 83a958bc91..2b7376eadc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test8/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test8/out/A.java @@ -5,4 +5,4 @@ class A{ void m(){ g.g.g.k=0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test9/in/A.java index 5c15dcfeb4..3d5bddbf01 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test9/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test9/in/A.java @@ -8,4 +8,4 @@ class A{ } f.k=0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test9/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test9/out/A.java index 92d20b8465..0956e21c66 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test9/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/test9/out/A.java @@ -8,4 +8,4 @@ class A{ } g.k=0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testAnnotation1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testAnnotation1/in/A.java index 11a2b93a91..374bd62375 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testAnnotation1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testAnnotation1/in/A.java @@ -6,4 +6,4 @@ package p; class User { int NULL= A.ZERO; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testAnnotation1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testAnnotation1/out/A.java index c8175d1906..c63f3cbab7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testAnnotation1/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testAnnotation1/out/A.java @@ -6,4 +6,4 @@ package p; class User { int NULL= A.ZORRO; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumField/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumField/in/A.java index 5f1f7bf5b0..24047064e2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumField/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumField/in/A.java @@ -18,4 +18,4 @@ class User { A.GREEN.buddy= null; } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumField/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumField/out/A.java index f77f0fb0d5..758fbd02f9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumField/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testEnumField/out/A.java @@ -18,4 +18,4 @@ class User { A.GREEN.other= null; } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail0/in/A.java index 039339c981..cad352adcd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail0/in/A.java @@ -2,4 +2,4 @@ package p; class A{ int f; private int g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail1/in/A.java index 282d63c447..ebc39b5659 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail1/in/A.java @@ -2,4 +2,4 @@ package p; class A{ public int f; public String g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail10/in/A.java index b1131d3825..c4a2f24c6c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail10/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail10/in/A.java @@ -7,4 +7,4 @@ class A{ f.k=0; } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail11/in/A.java index b263907528..4e11ef3e48 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail11/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail11/in/A.java @@ -11,4 +11,4 @@ class A{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail12/in/A.java index 36c9d0d6ac..3d83d3f802 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail12/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail12/in/A.java @@ -4,4 +4,4 @@ class A{ void m(){ int g= f; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail13/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail13/in/A.java index b2eb79d3c4..ff0fc4defe 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail13/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail13/in/A.java @@ -7,4 +7,4 @@ class B extends A{ void m(){ int g= f; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail14/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail14/in/A.java index e09468dd57..40a4c33238 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail14/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail14/in/A.java @@ -8,4 +8,4 @@ class B extends A{ int g; return f; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail2/in/A.java index 42161ad64e..8b8b581f43 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail2/in/A.java @@ -2,4 +2,4 @@ package p; class A{ int f; public static int g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail3/in/A.java index a887ae1e52..6084b8c103 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail3/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail3/in/A.java @@ -2,4 +2,4 @@ package p; class A{ protected int f; private static int g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail4/in/A.java index e2e3c00d2f..fac183d258 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail4/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail4/in/A.java @@ -2,4 +2,4 @@ package p; class A{ public static int f; public Object g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail5/in/A.java index 731bb0e07c..7c781e7298 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail5/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail5/in/A.java @@ -4,4 +4,4 @@ class B { class A { final int f= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail6/in/A.java index 2efe7c7362..c230db2608 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail6/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail6/in/A.java @@ -4,4 +4,4 @@ class A { class B { public int g; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail7/in/A.java index 0ebc1c6ee0..ef6d207197 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail7/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail7/in/A.java @@ -4,4 +4,4 @@ class A { void m(int g){ f= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail8/in/A.java index f841ee0058..af5978eb61 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail8/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail8/in/A.java @@ -5,4 +5,4 @@ class A{ Object g; f++; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail9/in/A.java index 58b9cd4546..5e475aed10 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail9/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testFail9/in/A.java @@ -6,4 +6,4 @@ class A{ A g; f.f.f.k=0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics1/in/A.java index 3046a5f724..56e7d7f5b9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics1/in/A.java @@ -6,4 +6,4 @@ class A { class B extends A { E e= f; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics1/out/A.java index 09fdbed6d1..9e4f9f18f5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics1/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics1/out/A.java @@ -6,4 +6,4 @@ class A { class B extends A { E e= g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics3/in/A.java index e012448561..6319e05902 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics3/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics3/in/A.java @@ -19,4 +19,4 @@ class B extends A { public void setF(E f) { super.setF(f); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics3/out/A.java index 85a987a32e..58bf2a5946 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics3/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testGenerics3/out/A.java @@ -19,4 +19,4 @@ class B extends A { public void setG(E f) { super.setG(f); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/in/A.java index a21137a5a6..02943d5b60 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/in/A.java @@ -7,4 +7,4 @@ public class A extends NLS { NLS.initializeMessages(BUNDLE_NAME, A.class); } private A() {} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/out/A.java index c0938ccbff..a374fb4776 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameNonPrivateField/testRenameNLSAccessor01/out/A.java @@ -7,4 +7,4 @@ public class A extends NLS { NLS.initializeMessages(BUNDLE_NAME, A.class); } private A() {} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test0/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test0/in/r/A.java index 889b397370..bdbe2f0a83 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test0/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test0/in/r/A.java @@ -5,4 +5,4 @@ package r; * @see r.A * @see r.A#A() */ -class A{} \ No newline at end of file +class A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test0/out/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test0/out/p1/A.java index eac7aa1a66..ab4660b1ed 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test0/out/p1/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test0/out/p1/A.java @@ -5,4 +5,4 @@ package p1; * @see p1.A * @see p1.A#A() */ -class A{} \ No newline at end of file +class A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test1/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test1/in/r/A.java index 362ea30620..786efb1e0b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test1/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test1/in/r/A.java @@ -1,4 +1,4 @@ package r; class A{ r.A a; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test1/out/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test1/out/p1/A.java index b0933c05a2..07afeac64c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test1/out/p1/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test1/out/p1/A.java @@ -1,4 +1,4 @@ package p1; class A{ p1.A a; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/in/fred/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/in/fred/A.java index 4e91e5aa02..2b5d9f3a6c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/in/fred/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/in/fred/A.java @@ -3,4 +3,4 @@ import r.*; class A{ r.A a; A a1; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/in/r/A.java index 5833a58db8..fa73501401 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/in/r/A.java @@ -1,4 +1,4 @@ package r; public class A{ r.A a; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/out/fred/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/out/fred/A.java index 2fbde2bb70..a9854e0de6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/out/fred/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/out/fred/A.java @@ -3,4 +3,4 @@ import p1.*; class A{ p1.A a; A a1; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/out/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/out/p1/A.java index e4cf0188a7..8d7e14c85a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/out/p1/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test2/out/p1/A.java @@ -1,4 +1,4 @@ package p1; public class A{ p1.A a; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/in/fred/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/in/fred/A.java index bb332c0287..8c80e50cb8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/in/fred/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/in/fred/A.java @@ -3,4 +3,4 @@ import r.r.*; class A{ r.r.B a; A a1; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/in/r/r/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/in/r/r/B.java index 8620e84bb2..85b0e4655a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/in/r/r/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/in/r/r/B.java @@ -1,4 +1,4 @@ package r.r; public class B{ r.r.B a; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/out/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/out/r/A.java index bbc81b51ae..32df8c3b8b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/out/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/out/r/A.java @@ -3,4 +3,4 @@ import r.r.*; class A{ r.r.B a; A a1; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/out/r/r/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/out/r/r/B.java index 8620e84bb2..85b0e4655a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/out/r/r/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test3/out/r/r/B.java @@ -1,4 +1,4 @@ package r.r; public class B{ r.r.B a; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/in/r/A.java index ebb7363127..3eb9ba5581 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/in/r/A.java @@ -1,2 +1,2 @@ package r; -class C{} \ No newline at end of file +class C{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/in/r/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/in/r/p1/A.java index 28789425ac..eec3b4469a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/in/r/p1/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/in/r/p1/A.java @@ -1,2 +1,2 @@ package r.p1; -class A{} \ No newline at end of file +class A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/out/q/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/out/q/A.java index 5fbbe5ca57..86d94a89e5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/out/q/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/out/q/A.java @@ -1,2 +1,2 @@ package q; -class A{} \ No newline at end of file +class A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/out/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/out/r/A.java index ebb7363127..3eb9ba5581 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/out/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test4/out/r/A.java @@ -1,2 +1,2 @@ package r; -class C{} \ No newline at end of file +class C{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test5/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test5/in/r/A.java index 9307b7e927..12e855d2f7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test5/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test5/in/r/A.java @@ -2,4 +2,4 @@ package r; class A{ r.A d; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test5/out/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test5/out/p1/A.java index 4860a3f33d..b598e681c5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test5/out/p1/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test5/out/p1/A.java @@ -2,4 +2,4 @@ package p1; class A{ r.A d; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test6/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test6/in/r/A.java index 460f1b7ead..913ac5bf8d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test6/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test6/in/r/A.java @@ -2,4 +2,4 @@ package r; class A{ r.A d; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test6/out/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test6/out/p1/A.java index 0647bccd55..cb283e7600 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test6/out/p1/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test6/out/p1/A.java @@ -2,4 +2,4 @@ package p1; class A{ r.A d; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/in/r/A.java index 3607c70c47..87bed35ef8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/in/r/A.java @@ -1,3 +1,3 @@ package r; class A { -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/in/r/s/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/in/r/s/B.java index 484e85842a..703751a10f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/in/r/s/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/in/r/s/B.java @@ -1,4 +1,4 @@ package r.s; public class B { -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/out/q/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/out/q/A.java index 00109608a7..1deda4ab65 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/out/q/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/out/q/A.java @@ -1,3 +1,3 @@ package q; class A { -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/out/r/s/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/out/r/s/B.java index 484e85842a..703751a10f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/out/r/s/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/test7/out/r/s/B.java @@ -1,4 +1,4 @@ package r.s; public class B { -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail0/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail0/in/r/A.java index 96dae97bc7..93ce2bc861 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail0/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail0/in/r/A.java @@ -1,2 +1,2 @@ package r; -class A{} \ No newline at end of file +class A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail1/in/r/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail1/in/r/p1/A.java index 28789425ac..eec3b4469a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail1/in/r/p1/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail1/in/r/p1/A.java @@ -1,2 +1,2 @@ package r.p1; -class A{} \ No newline at end of file +class A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail10/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail10/in/r/A.java index ebb7363127..3eb9ba5581 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail10/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail10/in/r/A.java @@ -1,2 +1,2 @@ package r; -class C{} \ No newline at end of file +class C{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail10/in/r/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail10/in/r/p1/A.java index 28789425ac..eec3b4469a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail10/in/r/p1/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail10/in/r/p1/A.java @@ -1,2 +1,2 @@ package r.p1; -class A{} \ No newline at end of file +class A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail3/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail3/in/r/A.java index 2cf2cac3a0..5d4b54b0c8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail3/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail3/in/r/A.java @@ -1,4 +1,4 @@ package r; class A{ native void f(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail4/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail4/in/r/A.java index ac8b4bb096..54d9f3152a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail4/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail4/in/r/A.java @@ -3,4 +3,4 @@ class A{ class B{ native void f(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail5/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail5/in/r/A.java index e2601f084a..821f69b3fb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail5/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail5/in/r/A.java @@ -4,4 +4,4 @@ public class A{ public static void main(String[] args){ } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail6/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail6/in/r/A.java index 09f21874d5..52be0c200f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail6/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail6/in/r/A.java @@ -2,4 +2,4 @@ package r; class A{ public static void main(String[] args){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail7/in/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail7/in/p1/A.java index b6a96e75a8..463cc3ed53 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail7/in/p1/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail7/in/p1/A.java @@ -6,4 +6,4 @@ class B{ } class AA{ static String A; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail7/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail7/in/r/A.java index 323bb3f5da..3fa25a69f4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail7/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail7/in/r/A.java @@ -1,4 +1,4 @@ package r; public class A{ public static int length(){return 42;}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail8/in/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail8/in/p1/A.java index e561724f4a..fd3aacff88 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail8/in/p1/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail8/in/p1/A.java @@ -7,4 +7,4 @@ class B{ } class fred{ class A{}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail8/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail8/in/r/A.java index 5ce5e47ff2..34e15ddab3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail8/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail8/in/r/A.java @@ -1,3 +1,3 @@ package r; public class A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail9/in/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail9/in/p1/A.java index 2c4fd179e9..a43b087802 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail9/in/p1/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail9/in/p1/A.java @@ -1,4 +1,4 @@ package p1; class B{ native void m(p.A a); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail9/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail9/in/r/A.java index 5ce5e47ff2..34e15ddab3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail9/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testFail9/in/r/A.java @@ -1,3 +1,3 @@ package r; public class A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical02/in/your/Y.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical02/in/your/Y.java index 042c84cf32..e89a7a5b8a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical02/in/your/Y.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical02/in/your/Y.java @@ -2,4 +2,4 @@ package your; public class Y { -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical03/in/my/pack/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical03/in/my/pack/C.java index c5add02b46..88887ca32d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical03/in/my/pack/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical03/in/my/pack/C.java @@ -10,4 +10,4 @@ notmy.pack.subpack notmy.pack2.subpack My.pack */ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical03/out/your/pack/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical03/out/your/pack/C.java index 20fa2b7118..4c21429fbe 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical03/out/your/pack/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchical03/out/your/pack/C.java @@ -10,4 +10,4 @@ notmy.pack.subpack notmy.pack2.subpack My.pack */ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchicalDisabledImport/in/my/pack/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchicalDisabledImport/in/my/pack/C.java index ad598bb53c..73894a48af 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchicalDisabledImport/in/my/pack/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchicalDisabledImport/in/my/pack/C.java @@ -4,4 +4,4 @@ import my.pack.C; //import my.Other; public class C { -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchicalDisabledImport/out/your/pack/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchicalDisabledImport/out/your/pack/C.java index 795dd39443..a8e3fdd704 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchicalDisabledImport/out/your/pack/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testHierarchicalDisabledImport/out/your/pack/C.java @@ -3,4 +3,4 @@ package your.pack; import your.pack.C; public class C { -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testReadOnly/in/r/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testReadOnly/in/r/A.java index 9307b7e927..12e855d2f7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testReadOnly/in/r/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testReadOnly/in/r/A.java @@ -2,4 +2,4 @@ package r; class A{ r.A d; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testReadOnly/out/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testReadOnly/out/p1/A.java index 4860a3f33d..b598e681c5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testReadOnly/out/p1/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testReadOnly/out/p1/A.java @@ -2,4 +2,4 @@ package p1; class A{ r.A d; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStatic1/in/s1/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStatic1/in/s1/B.java index a6e3404a37..8784d551dd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStatic1/in/s1/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStatic1/in/s1/B.java @@ -6,4 +6,4 @@ public class B { out.toString(); in.toString(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStatic1/out/s1/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStatic1/out/s1/B.java index 2fe8d62c9f..8c8203c336 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStatic1/out/s1/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testStatic1/out/s1/B.java @@ -6,4 +6,4 @@ public class B { out.toString(); in.toString(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testToEmptyPack/in/r/p1/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testToEmptyPack/in/r/p1/A.java index 28789425ac..eec3b4469a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testToEmptyPack/in/r/p1/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testToEmptyPack/in/r/p1/A.java @@ -1,2 +1,2 @@ package r.p1; -class A{} \ No newline at end of file +class A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testToEmptyPack/out/fred/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testToEmptyPack/out/fred/A.java index 92bc25c53b..d486c5f4b1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testToEmptyPack/out/fred/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePackage/testToEmptyPack/out/fred/A.java @@ -1,2 +1,2 @@ package fred; -class A{} \ No newline at end of file +class A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_in.java index 0519ecba6e..8d1c8b69c3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_in.java @@ -1 +1 @@ - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_out.java index 0519ecba6e..8d1c8b69c3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_out.java @@ -1 +1 @@ - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test0_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test0_in.java index f99f456b98..0aa36111c7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test0_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test0_in.java @@ -3,4 +3,4 @@ package p; class A{ void m(int i){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test0_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test0_out.java index a595b24113..cf8635fff9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test0_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test0_out.java @@ -3,4 +3,4 @@ package p; class A{ void m(int j){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test10_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test10_in.java index 35d3439164..9bdeb2b9ba 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test10_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test10_in.java @@ -2,4 +2,4 @@ package p; class A{ native void m(int i); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test10_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test10_out.java index 58f2f20a4b..82234892bd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test10_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test10_out.java @@ -2,4 +2,4 @@ package p; class A{ native void m(int j); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test11_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test11_in.java index eab99a3fd3..48c5435d02 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test11_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test11_in.java @@ -9,4 +9,4 @@ class A{ } }; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test11_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test11_out.java index 4dc6467b08..58277f8057 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test11_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test11_out.java @@ -9,4 +9,4 @@ class A{ } }; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test12_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test12_in.java index ea84baf7dc..9afd142d80 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test12_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test12_in.java @@ -8,4 +8,4 @@ class A{ } }; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test12_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test12_out.java index f2afa2b2da..43a37fa334 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test12_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test12_out.java @@ -8,4 +8,4 @@ class A{ } }; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test13_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test13_in.java index 8682f8ad50..5c90393590 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test13_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test13_in.java @@ -5,4 +5,4 @@ class A{ } void n(int i){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test13_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test13_out.java index a706f40e93..1ebed307c3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test13_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test13_out.java @@ -5,4 +5,4 @@ class A{ } void n(int i){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test14_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test14_in.java index 7ee39c6c15..a4143fa306 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test14_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test14_in.java @@ -5,4 +5,4 @@ class A{ A m(A i){ return i.m(i.m(this.i)); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test14_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test14_out.java index f9d9ef33b4..581df2e0eb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test14_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test14_out.java @@ -5,4 +5,4 @@ class A{ A m(A j){ return j.m(j.m(this.i)); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test15_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test15_in.java index 4f56552632..c02c8ee689 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test15_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test15_in.java @@ -4,4 +4,4 @@ class A{ int m(int i, int j){ return i + j; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test15_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test15_out.java index 14f918ddfd..6892f4b0bf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test15_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test15_out.java @@ -4,4 +4,4 @@ class A{ int m(int j, int i){ return j + i; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test16_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test16_in.java index b3a00982a2..ae42bdc336 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test16_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test16_in.java @@ -6,4 +6,4 @@ class A{ int j; } }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test16_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test16_out.java index f14f73b05c..bd80aee6bf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test16_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test16_out.java @@ -6,4 +6,4 @@ class A{ int j; } }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test17_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test17_in.java index ed8c3470c4..f5fa14bb65 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test17_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test17_in.java @@ -6,4 +6,4 @@ class A{ int m= 0; return i + j + k + l + m; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test17_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test17_out.java index 93d3e70477..0e18159a7a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test17_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test17_out.java @@ -6,4 +6,4 @@ class A{ int m= 0; return j + i + k + l + m; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test18_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test18_in.java index 3e13887aa6..b55e852cfd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test18_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test18_in.java @@ -5,4 +5,4 @@ class A{ class j{} i= new j(); }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test18_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test18_out.java index ffd9994e95..58f3adbcda 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test18_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test18_out.java @@ -5,4 +5,4 @@ class A{ class j{} j= new j(); }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test19_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test19_in.java index d4c7bdc75a..3be87e5987 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test19_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test19_in.java @@ -7,4 +7,4 @@ class A{ i.equals(i.toString()); i.i.i= i; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test19_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test19_out.java index c27c2e37f5..e34cdf30f0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test19_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test19_out.java @@ -7,4 +7,4 @@ class A{ j.equals(j.toString()); j.i.i= j; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test1_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test1_in.java index 10079c6e01..25b160996a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test1_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test1_in.java @@ -4,4 +4,4 @@ class A{ void m(int i){ i++; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test1_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test1_out.java index dedcb99afc..b512235892 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test1_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test1_out.java @@ -4,4 +4,4 @@ class A{ void m(int j){ j++; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test20_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test20_in.java index 378e871c9a..9994b2b017 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test20_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test20_in.java @@ -13,4 +13,4 @@ class A{ } class i{ i i; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test20_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test20_out.java index 4d51fb0c37..7ae779a458 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test20_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test20_out.java @@ -13,4 +13,4 @@ class A{ } class i{ i i; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test21_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test21_in.java index 6a179b20e5..1a99ff196a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test21_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test21_in.java @@ -9,4 +9,4 @@ class A{ ii[++i]= i ==7 ? i: i + i; } }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test21_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test21_out.java index cf380c48cc..a2c5293a2b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test21_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test21_out.java @@ -9,4 +9,4 @@ class A{ ii[++j]= j ==7 ? j: j + j; } }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test22_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test22_in.java index cbfb3379c8..fc4b0c9137 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test22_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test22_in.java @@ -5,4 +5,4 @@ class A{ void m(int i){ int u= i + this.i; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test22_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test22_out.java index b14071f63e..4c9804166e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test22_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test22_out.java @@ -5,4 +5,4 @@ class A{ void m(int j){ int u= j + this.i; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test23_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test23_in.java index 50ac32b081..0a60457ffd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test23_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test23_in.java @@ -5,4 +5,4 @@ class A{ int m(final int i, int j){ return i + j; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test23_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test23_out.java index ebbafc2fae..4ff8ffb113 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test23_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test23_out.java @@ -5,4 +5,4 @@ class A{ int m(final int j, int i){ return j + i; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test24_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test24_in.java index f9c6a078e0..2ccdeb3486 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test24_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test24_in.java @@ -5,4 +5,4 @@ class A{ void m(int i){ this.i= i; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test24_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test24_out.java index ea4b542038..41a8394bef 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test24_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test24_out.java @@ -5,4 +5,4 @@ class A{ void m(int j){ this.i= j; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test25_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test25_in.java index e73d484c84..acecf67b1e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test25_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test25_in.java @@ -5,4 +5,4 @@ class A{ int m(int i){ return i + m(m(i)); }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test25_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test25_out.java index 351eb9921c..76b2b933dc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test25_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test25_out.java @@ -5,4 +5,4 @@ class A{ int m(int j){ return j + m(m(j)); }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test26_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test26_in.java index 984ac72697..f325a2fe2b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test26_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test26_in.java @@ -10,4 +10,4 @@ class A{ }; return i + m(m(i)); }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test26_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test26_out.java index 1e3c50616e..2410e3d501 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test26_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test26_out.java @@ -10,4 +10,4 @@ class A{ }; return j + m(m(j)); }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test27_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test27_in.java index 98aa3515ae..d332c16810 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test27_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test27_in.java @@ -10,4 +10,4 @@ class A{ }; return i + m(m(i)); }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test27_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test27_out.java index 45cdfd0e22..2ec02b7998 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test27_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test27_out.java @@ -10,4 +10,4 @@ class A{ }; return j + m(m(j)); }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test28_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test28_in.java index 4551689041..c5bb37a7d1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test28_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test28_in.java @@ -5,4 +5,4 @@ class A{ i[0]= 0; return 1; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test28_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test28_out.java index 43b1750b08..d9ed03704b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test28_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test28_out.java @@ -5,4 +5,4 @@ class A{ j[0]= 0; return 1; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test29_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test29_in.java index bc7b04fbe2..dc1e356b31 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test29_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test29_in.java @@ -10,4 +10,4 @@ class A{ } return A; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test29_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test29_out.java index 000757ba15..00452cd375 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test29_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test29_out.java @@ -10,4 +10,4 @@ class A{ } return b; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test2_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test2_in.java index 3ce000b913..6ffdafb011 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test2_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test2_in.java @@ -3,4 +3,4 @@ package p; class A{ void m(int i, int k){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test2_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test2_out.java index 2e49b1601f..f244b02db0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test2_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test2_out.java @@ -3,4 +3,4 @@ package p; class A{ void m(int j, int k){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test30_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test30_in.java index b3de2c6558..dc943ad05d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test30_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test30_in.java @@ -9,4 +9,4 @@ class A{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test30_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test30_out.java index 4db7819baf..c4d2a28a25 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test30_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test30_out.java @@ -9,4 +9,4 @@ class A{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test31_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test31_in.java index f2993a541e..b278a128f5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test31_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test31_in.java @@ -9,4 +9,4 @@ class A{ } }; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test31_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test31_out.java index c0c1cbcb66..3b6b1181d8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test31_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test31_out.java @@ -9,4 +9,4 @@ class A{ } }; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test32_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test32_in.java index 275aaf9790..b072a56113 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test32_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test32_in.java @@ -2,4 +2,4 @@ package p; class A{ A(int i){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test32_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test32_out.java index 5516e0bcfe..3adb0ab1eb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test32_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test32_out.java @@ -2,4 +2,4 @@ package p; class A{ A(int j){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test33_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test33_in.java index 19baa085e6..5cc2ba6372 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test33_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test33_in.java @@ -10,4 +10,4 @@ class A{ } return A; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test33_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test33_out.java index 350fea4561..c5601f8d71 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test33_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test33_out.java @@ -10,4 +10,4 @@ class A{ } return A; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test34_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test34_in.java index 152a96149d..b3d015d548 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test34_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test34_in.java @@ -3,4 +3,4 @@ class A{ public void m(boolean test) { boolean t= (test); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test34_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test34_out.java index 24ef6a3b00..b8cc7a2251 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test34_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test34_out.java @@ -3,4 +3,4 @@ class A{ public void m(boolean test2) { boolean t= (test2); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test35_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test35_in.java index b9b24c6617..d9d0507604 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test35_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test35_in.java @@ -12,4 +12,4 @@ class A{ void m1(int i){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test35_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test35_out.java index 6ae170750c..8a9605d4f2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test35_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test35_out.java @@ -12,4 +12,4 @@ class A{ void m1(int i){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test36_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test36_in.java index fbabcd3655..935fb9343b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test36_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test36_in.java @@ -3,4 +3,4 @@ class A{ // void m(int i){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test36_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test36_out.java index a6dc3d2f98..ec3f77a038 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test36_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test36_out.java @@ -3,4 +3,4 @@ class A{ // void m(int j){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test3_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test3_in.java index 7676ba8fe5..2e752aa9bd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test3_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test3_in.java @@ -6,4 +6,4 @@ class A{ return i + k; } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test3_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test3_out.java index d1f634085c..1710e59fc9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test3_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test3_out.java @@ -6,4 +6,4 @@ class A{ return j + j1; } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test4_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test4_in.java index f607274de7..f32ac997b6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test4_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test4_in.java @@ -5,4 +5,4 @@ class A{ void m(A i){ i.k= i.k; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test4_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test4_out.java index 4e4b4c45b5..0db4c32645 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test4_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test4_out.java @@ -5,4 +5,4 @@ class A{ void m(A k){ k.k= k.k; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test5_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test5_in.java index 99ea05e7f2..b73a801af9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test5_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test5_in.java @@ -5,4 +5,4 @@ class A{ void m(int i){ this.i= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test5_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test5_out.java index b4d2054298..bc143e8c68 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test5_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test5_out.java @@ -5,4 +5,4 @@ class A{ void m(int k){ this.i= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test6_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test6_in.java index efa9a84b02..c9d8576054 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test6_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test6_in.java @@ -4,4 +4,4 @@ class A{ void m(int i){ m(i); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test6_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test6_out.java index 4dc489d82d..9a954095cc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test6_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test6_out.java @@ -4,4 +4,4 @@ class A{ void m(int k){ m(k); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test7_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test7_in.java index 66d473e9c2..5709ff6b68 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test7_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test7_in.java @@ -7,4 +7,4 @@ class A extends B{ void m(A i){ super.i= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test7_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test7_out.java index 22e4796260..336a57f2f3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test7_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test7_out.java @@ -7,4 +7,4 @@ class A extends B{ void m(A k){ super.i= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test8_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test8_in.java index e4582814d3..e24fe48234 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test8_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test8_in.java @@ -2,4 +2,4 @@ package p; abstract class A{ abstract void m(int i); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test8_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test8_out.java index c7cc090e7f..ba6c908099 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test8_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test8_out.java @@ -2,4 +2,4 @@ package p; abstract class A{ abstract void m(int j); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test9_in.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test9_in.java index 181663e386..caf9d033f7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test9_in.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test9_in.java @@ -2,4 +2,4 @@ package p; interface A{ void m(int i); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test9_out.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test9_out.java index 39e113fbb4..2cff8f2094 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test9_out.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/canRename/A_test9_out.java @@ -2,4 +2,4 @@ package p; interface A{ void m(int j); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail0.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail0.java index 65d173b307..78e9b55906 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail0.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail0.java @@ -9,4 +9,4 @@ class A{ } } }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail1.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail1.java index 43475831d8..5aeeba18a1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail1.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail1.java @@ -3,4 +3,4 @@ package p; class A{ void m(){ }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail10.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail10.java index 536d555b87..f9fc83310a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail10.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail10.java @@ -2,4 +2,4 @@ package p; abstract class A{ abstract void m(int i, int j); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail11.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail11.java index 275aadd61e..5d16ff8cb8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail11.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail11.java @@ -2,4 +2,4 @@ package p; interface A{ void m(int i, int j); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail12.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail12.java index 6327219cbf..457ff7b197 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail12.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail12.java @@ -8,4 +8,4 @@ class A{ } }; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail13.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail13.java index 14ecb4c5f8..855165dfd2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail13.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail13.java @@ -5,4 +5,4 @@ class A{ void m(int i){ j= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail14.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail14.java index 78a687f805..5e72fa482e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail14.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail14.java @@ -8,4 +8,4 @@ class A{ void m(A i){ j.k= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail15.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail15.java index 259c6a7719..a54bca8cf4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail15.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail15.java @@ -5,4 +5,4 @@ class A{ for (int j= 0; j < 10; j++){ } }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail16.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail16.java index dc723dc594..c4ae9730dc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail16.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail16.java @@ -6,4 +6,4 @@ class A{ } }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail17.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail17.java index 7b7cb27ece..34690d0cff 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail17.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail17.java @@ -8,4 +8,4 @@ class A{ catch (Throwable j){ } }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail18.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail18.java index 83f8b46672..2b82c7d8d9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail18.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail18.java @@ -5,4 +5,4 @@ class A{ void m(int i){ j.toString(); }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail19.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail19.java index 26cc5dc6d8..cd00f0c774 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail19.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail19.java @@ -7,4 +7,4 @@ class A extends B{ void m(int i){ j= 0; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail2.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail2.java index 258a47d802..a936187c9d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail2.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail2.java @@ -4,4 +4,4 @@ class A{ int m(int i, int j){ return 0; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail20.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail20.java index 155b6829b1..54d7392291 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail20.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail20.java @@ -7,4 +7,4 @@ class A implements B{ void m(int i){ int y= j; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail21.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail21.java index 98aa3515ae..d332c16810 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail21.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail21.java @@ -10,4 +10,4 @@ class A{ }; return i + m(m(i)); }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail3.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail3.java index 549fe00928..71ef70c091 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail3.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail3.java @@ -4,4 +4,4 @@ class A{ int m(int i, int j){ return 0; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail4.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail4.java index ce47b199cc..bba533c6a9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail4.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail4.java @@ -5,4 +5,4 @@ class A{ int j; return 0; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail5.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail5.java index a0397a7f99..acb602ce58 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail5.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail5.java @@ -7,4 +7,4 @@ class A{ } return 0; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail6.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail6.java index fe77c6bce1..aa7773ee60 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail6.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail6.java @@ -10,4 +10,4 @@ class A{ } return 0; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail7.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail7.java index 752c308635..8bbeec949c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail7.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail7.java @@ -8,4 +8,4 @@ class A extends B{ j= 0; return 0; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail8.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail8.java index dd612952ea..208f8a5a9f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail8.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail8.java @@ -8,4 +8,4 @@ class A implements B{ i= j; return 0; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail9.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail9.java index 0cb586805c..2e8d0db83a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail9.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameParameters/cannotRename/A_testFail9.java @@ -9,4 +9,4 @@ class B{ return 0; }; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test0/in/A.java index 09d7beb091..92d5406b58 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test0/in/A.java @@ -1,4 +1,4 @@ package p; class A{ private int f; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test0/out/A.java index 54638c7818..00953f2ffb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test0/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test0/out/A.java @@ -1,4 +1,4 @@ package p; class A{ private int g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test1/in/A.java index e7b1fae0ad..e5ff6b855e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test1/in/A.java @@ -4,4 +4,4 @@ class A{ void m(){ f++; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test1/out/A.java index 62565c0a32..3877ff3908 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test1/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test1/out/A.java @@ -4,4 +4,4 @@ class A{ void m(){ g++; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test2/in/A.java index 9b8f37b2e8..d0cfe48f39 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test2/in/A.java @@ -5,4 +5,4 @@ class A{ void m(){ f++; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test2/out/A.java index e243fcd0c4..01a7f2c9b1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test2/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test2/out/A.java @@ -5,4 +5,4 @@ class A{ void m(){ f++; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test3/in/A.java index 992a58eec4..615ac9c2a5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test3/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test3/in/A.java @@ -15,4 +15,4 @@ class A{ f++;//inc f String g= "f"; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test3/out/A.java index 001599c35c..881a979e8c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test3/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test3/out/A.java @@ -15,4 +15,4 @@ class A{ gg++;//inc gg String g= "gg"; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test4/in/A.java index 4e9361ff15..d3ebde8e67 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test4/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test4/in/A.java @@ -14,4 +14,4 @@ class A{ public void setMe(int me) { fMe= me; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test4/out/A.java index 224e8eed90..692928d470 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test4/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test4/out/A.java @@ -14,4 +14,4 @@ class A{ public void setYou(int me) { fYou= me; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test5/in/A.java index 4bf4b08f85..a0d055ec39 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test5/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test5/in/A.java @@ -6,4 +6,4 @@ class A{ return fMe; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test5/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test5/out/A.java index 852acc2484..c5d27e44d1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test5/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test5/out/A.java @@ -6,4 +6,4 @@ class A{ return fYou; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test6/in/A.java index 947a233650..f60d1ce631 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test6/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test6/in/A.java @@ -6,4 +6,4 @@ class A{ fMe= me; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test6/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test6/out/A.java index 00f75d474f..93cf7238ba 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test6/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test6/out/A.java @@ -6,4 +6,4 @@ class A{ fYou= me; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test7/in/A.java index ddb5e06a72..b36a1c827c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test7/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test7/in/A.java @@ -10,4 +10,4 @@ class A{ return fBig; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test7/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test7/out/A.java index ce85b2d26f..41dcd8da67 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test7/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test7/out/A.java @@ -10,4 +10,4 @@ class A{ return fSmall; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test8/in/A.java index 78fbddd58b..0317a06a70 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test8/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test8/in/A.java @@ -4,4 +4,4 @@ class A{ public static int getF() { return f; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test8/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test8/out/A.java index ceaf43c298..f893ed1f70 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test8/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test8/out/A.java @@ -4,4 +4,4 @@ class A{ public static int getG() { return g; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test9/in/A.java index d53e88f8af..666c6e0668 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test9/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test9/in/A.java @@ -10,4 +10,4 @@ class A{ return fBig; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test9/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test9/out/A.java index 9f4462a61e..45ccbd8224 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test9/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/test9/out/A.java @@ -10,4 +10,4 @@ class A{ return fSmall; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail0/in/A.java index 331b5e7bf9..a5309295d4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail0/in/A.java @@ -2,4 +2,4 @@ package p; class A{ private int f; private int g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail1/in/A.java index 4400551adb..328c9ca5f2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail1/in/A.java @@ -2,4 +2,4 @@ package p; class A{ private int f; private String g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail10/in/A.java index 186e8f5779..5cef54ba03 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail10/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail10/in/A.java @@ -7,4 +7,4 @@ class setE{ public void setY(int y) { this.y = y; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail2/in/A.java index 0797e05de3..d7401c4591 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail2/in/A.java @@ -2,4 +2,4 @@ package p; class A{ private int f; private static int g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail3/in/A.java index e1abbc3bf6..cbdf26eac6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail3/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail3/in/A.java @@ -2,4 +2,4 @@ package p; class A{ private int f; public static int g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail4/in/A.java index 86f75506ef..6eeb91d461 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail4/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail4/in/A.java @@ -2,4 +2,4 @@ package p; class A{ private int f; public Object g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail5/in/A.java index 96e2633e14..057cd93181 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail5/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail5/in/A.java @@ -4,4 +4,4 @@ class B { class A { private int f; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail6/in/A.java index d688226107..b99aba032f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail6/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail6/in/A.java @@ -4,4 +4,4 @@ class A { class B { private int g; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail7/in/A.java index a09bd64fcc..612a1fa047 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail7/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testFail7/in/A.java @@ -8,4 +8,4 @@ class A{ f++; } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testUnicode01/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testUnicode01/in/A.java index 6f9058f27e..24e9232f7c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testUnicode01/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testUnicode01/in/A.java @@ -20,4 +20,4 @@ class A { public void setField(A field) { this./*TODO: create Getter*/field= \u0066ield; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testUnicode01/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testUnicode01/out/A.java index 07ba6f5d72..cc8e4bc160 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testUnicode01/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateField/testUnicode01/out/A.java @@ -20,4 +20,4 @@ class A { public void setFeel(A field) { this./*TODO: create Getter*/feel= \u0066ield; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test10/in/A.java index 855db733ad..6c928c3fd5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test10/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test10/in/A.java @@ -5,4 +5,4 @@ class A { } class B { void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test10/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test10/out/A.java index 8040304f72..e67963446b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test10/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test10/out/A.java @@ -5,4 +5,4 @@ class A { } class B { void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test11/in/A.java index 41938b948d..30ccd97503 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test11/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test11/in/A.java @@ -5,4 +5,4 @@ class A { } class B extends A{ void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test11/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test11/out/A.java index 4fb51dd7b0..33c1619ee3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test11/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test11/out/A.java @@ -5,4 +5,4 @@ class A { } class B extends A{ void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test12/in/A.java index 1bfd88f535..59b7d106ef 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test12/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test12/in/A.java @@ -5,4 +5,4 @@ class A { } class B extends A{ public void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test12/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test12/out/A.java index ae12fdb534..78e6ccf4bd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test12/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test12/out/A.java @@ -5,4 +5,4 @@ class A { } class B extends A{ public void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test13/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test13/in/A.java index 2b3e68b0a7..3d77ac15ca 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test13/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test13/in/A.java @@ -10,4 +10,4 @@ class B{ class A extends B{ private void m(){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test13/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test13/out/A.java index 900894d565..dae0c4ce0d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test13/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test13/out/A.java @@ -10,4 +10,4 @@ class B{ class A extends B{ private void k(){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test14/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test14/in/A.java index d189f8afa4..981408a81d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test14/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test14/in/A.java @@ -13,4 +13,4 @@ class A extends B{ void f(){ m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test14/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test14/out/A.java index 29191617ab..7e7172760e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test14/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test14/out/A.java @@ -13,4 +13,4 @@ class A extends B{ void f(){ k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test15/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test15/in/A.java index 489be30bc3..91ed111d79 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test15/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test15/in/A.java @@ -4,4 +4,4 @@ class A{ private int m(int m){ return m(m(m)); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test15/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test15/out/A.java index 1eb3f1ef88..0d806d95e2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test15/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test15/out/A.java @@ -4,4 +4,4 @@ class A{ private int k(int m){ return k(k(m)); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test16/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test16/in/A.java index 130501a19d..170c7f71ff 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test16/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test16/in/A.java @@ -4,4 +4,4 @@ class A{ private int m(int m){ return m(m(m)); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test16/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test16/out/A.java index 03bab78eaf..76642a086e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test16/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test16/out/A.java @@ -4,4 +4,4 @@ class A{ private int fred(int m){ return fred(fred(m)); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test17/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test17/in/A.java index 7ddf22db78..fdb5626988 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test17/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test17/in/A.java @@ -5,4 +5,4 @@ public class A { } class B extends A{ void m(boolean m){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test17/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test17/out/A.java index 6d4f71ca47..7df4be2614 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test17/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test17/out/A.java @@ -5,4 +5,4 @@ public class A { } class B extends A{ void m(boolean m){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/in/A.java index 588b82dfd4..eeefe275cb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/in/A.java @@ -8,4 +8,4 @@ class B { public class A extends B { void m(int m) { } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/in/C.java index 4794cc8dd1..7a756528a4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/in/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/in/C.java @@ -3,4 +3,4 @@ class C{ void k(){ new A().m(4); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/out/A.java index af4db05b36..abb650b98d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/out/A.java @@ -8,4 +8,4 @@ class B { public class A extends B { void m(int m) { } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/out/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/out/C.java index 4794cc8dd1..7a756528a4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/out/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test18/out/C.java @@ -3,4 +3,4 @@ class C{ void k(){ new A().m(4); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test20/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test20/in/A.java index 357e768bb7..2717dbda1a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test20/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test20/in/A.java @@ -20,4 +20,4 @@ public class A{ ); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test20/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test20/out/A.java index 47a880072e..9eeaa85861 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test20/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test20/out/A.java @@ -20,4 +20,4 @@ public class A{ ); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test23/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test23/in/A.java index e19f4ef663..11bcd4cbfd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test23/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test23/in/A.java @@ -10,4 +10,4 @@ class test{ void m(){ } } -}} \ No newline at end of file +}} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test23/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test23/out/A.java index 572f93cf30..76d32260b0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test23/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test23/out/A.java @@ -10,4 +10,4 @@ class test{ void m(){ } } -}} \ No newline at end of file +}} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test24/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test24/in/A.java index eb9c0535b9..11ce189eb1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test24/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test24/in/A.java @@ -7,4 +7,4 @@ class A{ class B extends A{ void m(java.lang.String s){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test24/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test24/out/A.java index cf5dc6f9e9..8d09e640bf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test24/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test24/out/A.java @@ -7,4 +7,4 @@ class A{ class B extends A{ void m(java.lang.String s){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test26/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test26/in/A.java index 913e471c4a..efb3420f56 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test26/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test26/in/A.java @@ -5,4 +5,4 @@ class A{ private void m(){ this.m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test26/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test26/out/A.java index 950b97706a..775481339f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test26/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test26/out/A.java @@ -5,4 +5,4 @@ class A{ private void k(){ this.k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test27/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test27/in/A.java index bb7ad493aa..12af2e58a2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test27/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test27/in/A.java @@ -6,4 +6,4 @@ class A{ private void m(){ this.m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test27/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test27/out/A.java index f4deb45fed..c7cbca06dd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test27/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/test27/out/A.java @@ -6,4 +6,4 @@ class A{ private void k(){ this.m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testAnon0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testAnon0/in/A.java index 2526bbab45..6ae47c1407 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testAnon0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testAnon0/in/A.java @@ -10,4 +10,4 @@ class B{ } }; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testAnon0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testAnon0/out/A.java index 730610f459..6c03baee72 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testAnon0/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testAnon0/out/A.java @@ -10,4 +10,4 @@ class B{ } }; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail0/in/A.java index 946d84c11c..12df749fe0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail0/in/A.java @@ -2,4 +2,4 @@ package p; //can't rename native methods class A{ private native void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail1/in/A.java index ef9f4603d6..ed44bfc28b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail1/in/A.java @@ -3,4 +3,4 @@ package p; class A{ private void m(){} private void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail2/in/A.java index 72a333915a..5bbb29457d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail2/in/A.java @@ -17,4 +17,4 @@ class A { } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail5/in/A.java index 36269e5b41..c93e29bca1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail5/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenamePrivateMethod/testFail5/in/A.java @@ -7,4 +7,4 @@ public class A { m(); } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test0/in/A.java index 408f8be6bc..78d20c8b78 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test0/in/A.java @@ -1,4 +1,4 @@ package p; class A{ static void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test0/out/A.java index a8ca53b1e8..adb991ee15 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test0/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test0/out/A.java @@ -1,4 +1,4 @@ package p; class A{ static void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test1/in/A.java index e48131f061..dd872d430c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test1/in/A.java @@ -15,4 +15,4 @@ class B{ A.m(); new A().m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test1/out/A.java index e645c03213..5f2d56564e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test1/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test1/out/A.java @@ -15,4 +15,4 @@ class B{ A.k(); new A().k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test10/in/A.java index f269555468..9b3cf1fd99 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test10/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test10/in/A.java @@ -5,4 +5,4 @@ public class A { System.out.println("TestA.method"); B.method(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test10/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test10/out/A.java index 8456765e77..f4b46f6735 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test10/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test10/out/A.java @@ -5,4 +5,4 @@ public class A { System.out.println("TestA.method"); B.newmethod(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test11/in/A.java index 297b3600c8..8aaa5ab23c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test11/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test11/in/A.java @@ -5,4 +5,4 @@ public class A public static void method2() //<--- refactor rename this method { } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test11/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test11/out/A.java index 01510e37fb..27e5d08e61 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test11/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test11/out/A.java @@ -5,4 +5,4 @@ public class A public static void fred() //<--- refactor rename this method { } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test2/in/A.java index 9f1d3b67de..fcb3a2acda 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test2/in/A.java @@ -36,4 +36,4 @@ class D{ new A().m(); m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test2/out/A.java index 81351b6904..8b4453d82d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test2/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test2/out/A.java @@ -36,4 +36,4 @@ class D{ new A().k(); m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test3/in/A.java index ede5a5cc09..7e7208f8bd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test3/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test3/in/A.java @@ -12,4 +12,4 @@ void f(){ new B().m(); B.m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test3/out/A.java index d010dcb365..ecc532b0a2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test3/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test3/out/A.java @@ -12,4 +12,4 @@ void f(){ new B().k(); B.k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test4/in/A.java index 92848255e5..177aff288c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test4/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test4/in/A.java @@ -12,4 +12,4 @@ void f(){ new B().m(); B.m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test4/out/A.java index c86867fbe2..02b7b4f75f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test4/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test4/out/A.java @@ -12,4 +12,4 @@ void f(){ new B().m(); B.m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test6/in/A.java index d1cea8751b..d3e6194d13 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test6/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test6/in/A.java @@ -10,4 +10,4 @@ class test1{ void mm(){ } } -}} \ No newline at end of file +}} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test6/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test6/out/A.java index f1bbca337f..9fea2fec58 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test6/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test6/out/A.java @@ -10,4 +10,4 @@ class test1{ void mm(){ } } -}} \ No newline at end of file +}} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test7/in/A.java index 13de2de117..3b2fdc1d13 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test7/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test7/in/A.java @@ -4,4 +4,4 @@ class A{ static int m(int m){ return m(m(m)); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test7/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test7/out/A.java index f8d38991b5..9ddce71272 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test7/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test7/out/A.java @@ -4,4 +4,4 @@ class A{ static int k(int m){ return k(k(m)); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test8/in/A.java index b1f304f454..184a002600 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test8/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test8/in/A.java @@ -10,4 +10,4 @@ class B extends A{ static int m(int m){ return m(m(m)); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test8/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test8/out/A.java index 3dd2377e26..75a2f05d38 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test8/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test8/out/A.java @@ -10,4 +10,4 @@ class B extends A{ static int m(int m){ return m(m(m)); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test9/in/A.java index 3e09fbc021..935a034363 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test9/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test9/in/A.java @@ -11,4 +11,4 @@ class B extends A{ static int m(int m){ return m(m(m)); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test9/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test9/out/A.java index 4f11385066..797e619126 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test9/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/test9/out/A.java @@ -11,4 +11,4 @@ class B extends A{ static int m(int m){ return m(m(m)); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail0/in/A.java index 515cf69ced..d6ad61a956 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail0/in/A.java @@ -2,4 +2,4 @@ package p; //can't rename native methods class A{ static private native void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail1/in/A.java index 64520ec36f..cf24cb7e6a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail1/in/A.java @@ -3,4 +3,4 @@ package p; class A{ static private void m(){} static private void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail2/in/A.java index 25603412cb..40e8c7a1ae 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail2/in/A.java @@ -5,4 +5,4 @@ class B{ } class A extends B{ static public void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail4/in/A.java index 32fda7c41b..6a6e07d5a9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail4/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail4/in/A.java @@ -3,4 +3,4 @@ package p; class A{ static public void m(){} void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail5/in/A.java index 43d650a41b..18023e3afd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail5/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail5/in/A.java @@ -2,4 +2,4 @@ package p; //can't rename native methods class A{ static native void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail6/in/A.java index 2cedaae026..1715b5f454 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail6/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail6/in/A.java @@ -3,4 +3,4 @@ package p; class A{ static public void m(){} static public void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail7/in/A.java index 9bacef716a..b6901ffd53 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail7/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail7/in/A.java @@ -3,4 +3,4 @@ package p; class A{ static public void m(){} static private void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail8/in/A.java index d0d9225b21..ca47d08cca 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail8/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testFail8/in/A.java @@ -3,4 +3,4 @@ package p; class A{ static public void m(){} private void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport1/in/A.java index 43074a0cec..04a57b1294 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport1/in/A.java @@ -12,4 +12,4 @@ class B { void use() { int t= m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport1/out/A.java index eaa2f81270..fc4696c729 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport1/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport1/out/A.java @@ -12,4 +12,4 @@ class B { void use() { int t= k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport3/in/A.java index 02acba5c3e..468857c60c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport3/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport3/in/A.java @@ -12,4 +12,4 @@ class B { int t= m; m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport3/out/A.java index b48391b0af..661fa2bd2b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport3/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport3/out/A.java @@ -13,4 +13,4 @@ class B { int t= m; k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport4/in/A.java index 61a1ddfb3b..ac7cd69ec2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport4/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport4/in/A.java @@ -12,4 +12,4 @@ class B { int t= m; m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport4/out/A.java index 2f120458b2..5c6bd5872c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport4/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport4/out/A.java @@ -12,4 +12,4 @@ class B { int t= m; k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport5/in/A.java index 887c2311a4..ab82ca1588 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport5/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport5/in/A.java @@ -12,4 +12,4 @@ class B { m(); m(1); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport5/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport5/out/A.java index 94c1764b5b..924a3a0013 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport5/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImport5/out/A.java @@ -13,4 +13,4 @@ class B { k(); m(1); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImportFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImportFail0/in/A.java index cc7f52cf9e..b3929d4cc1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImportFail0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameStaticMethod/testStaticImportFail0/in/A.java @@ -13,4 +13,4 @@ class B { m(); } void k() {} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda2/in/A.java index 93056d1719..874e6ab3d8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda2/in/A.java @@ -10,4 +10,4 @@ public class C1 { I /*[*/ii/*]*/= (int a) -> a+100; return ii.foo(x) + p; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda2/out/A.java index b0b207f177..98dc7a3fcd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda2/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testLambda2/out/A.java @@ -10,4 +10,4 @@ public class C1 { I /*[*/renamedIi/*]*/= (int a) -> a+100; return renamedIi.foo(x) + p; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod2/in/A.java index b7ff6e84f4..ff295b0b00 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod2/in/A.java @@ -11,4 +11,4 @@ interface I { class Test { void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod2/out/A.java index f67429c5ba..5ed8369086 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod2/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethod2/out/A.java @@ -11,4 +11,4 @@ interface I { class Test { void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethodReference0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethodReference0/in/A.java index 7a6b8017f0..656265cdae 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethodReference0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethodReference0/in/A.java @@ -21,4 +21,4 @@ class I { } class Sub extends I { Supplier hexer3 = super::searchForRefs; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethodReference0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethodReference0/out/A.java index 992612daff..000939ef32 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethodReference0/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTests18/testMethodReference0/out/A.java @@ -21,4 +21,4 @@ class I { } class Sub extends I { Supplier hexer3 = super::searchForRefs1; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test0/in/A.java index 6291b8090d..a3f0bca206 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test0/in/A.java @@ -1,3 +1,3 @@ package p; class A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test0/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test0/out/B.java index d110d65e7a..3e51795e6a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test0/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test0/out/B.java @@ -1,3 +1,3 @@ package p; class B{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test1/in/A.java index bddabc6079..9a9c7f8c81 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test1/in/A.java @@ -1,4 +1,4 @@ package p; class A{ A a; -}; \ No newline at end of file +}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test1/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test1/out/B.java index 7cad311ca9..32474087ff 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test1/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test1/out/B.java @@ -1,4 +1,4 @@ package p; class B{ B a; -}; \ No newline at end of file +}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test10/in/A.java index 8d59977ac5..99b32a04d8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test10/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test10/in/A.java @@ -9,4 +9,4 @@ class A{ } return A; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test10/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test10/out/B.java index 2eafbb8ced..e2eb6d6a3a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test10/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test10/out/B.java @@ -9,4 +9,4 @@ class B{ } return A; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/in/A.java index 6291b8090d..a3f0bca206 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/in/A.java @@ -1,3 +1,3 @@ package p; class A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/in/AA.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/in/AA.java index 480ae03b70..8ccbc129ba 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/in/AA.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/in/AA.java @@ -1,3 +1,3 @@ package p; class AA extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/out/AA.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/out/AA.java index 20face0185..af05b0fd92 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/out/AA.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/out/AA.java @@ -1,3 +1,3 @@ package p; class AA extends B{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/out/B.java index d110d65e7a..3e51795e6a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test11/out/B.java @@ -1,3 +1,3 @@ package p; class B{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test12/in/A.java index 6c84ebfabc..1872bd1325 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test12/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test12/in/A.java @@ -3,4 +3,4 @@ class A{ void m(){ A a = (A)new Object(); }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test12/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test12/out/B.java index 1cb62a5730..4ba5abdccb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test12/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test12/out/B.java @@ -3,4 +3,4 @@ class B{ void m(){ B a = (B)new Object(); }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test13/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test13/in/A.java index cd577770c7..26211faa09 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test13/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test13/in/A.java @@ -3,4 +3,4 @@ class A{ void m(){ boolean b = (new A()) instanceof A; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test13/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test13/out/B.java index 5925007793..1798a9b63f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test13/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test13/out/B.java @@ -3,4 +3,4 @@ class B{ void m(){ boolean b = (new B()) instanceof B; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test14/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test14/in/A.java index 1a3912e1b2..e685bb3f00 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test14/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test14/in/A.java @@ -1,4 +1,4 @@ package p; class A{ A a = new A(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test14/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test14/out/B.java index 926aaed0c7..9326bf67ac 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test14/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test14/out/B.java @@ -1,4 +1,4 @@ package p; class B{ B a = new B(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test15/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test15/in/A.java index cd26dd851c..3db385cd32 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test15/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test15/in/A.java @@ -6,4 +6,4 @@ class AA{ AA(){ A.s(); }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test15/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test15/out/B.java index 6fc60563d2..50b32c616d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test15/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test15/out/B.java @@ -6,4 +6,4 @@ class AA{ AA(){ B.s(); }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test16/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test16/in/A.java index 65fdbace45..6a785dba5a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test16/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test16/in/A.java @@ -20,4 +20,4 @@ class AA extends A{ } return A; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test16/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test16/out/B.java index e2d8732f61..15baa4f53f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test16/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test16/out/B.java @@ -20,4 +20,4 @@ class AA extends B{ } return A; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test17/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test17/in/A.java index dd850cea61..99057f7b7d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test17/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test17/in/A.java @@ -4,4 +4,4 @@ interface I{ } class A{ int A = I.A; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test17/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test17/out/B.java index 77da929431..30e4145d2f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test17/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test17/out/B.java @@ -4,4 +4,4 @@ interface I{ } class B{ int A = I.A; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test18/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test18/in/A.java index 791c40d8c0..97fa2158c5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test18/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test18/in/A.java @@ -8,4 +8,4 @@ class AA{ } catch(A a){} } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test18/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test18/out/B.java index f7ee99aa51..b3cd2cd04b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test18/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test18/out/B.java @@ -8,4 +8,4 @@ class AA{ } catch(B a){} } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test2/in/A.java index efd6ca89db..71d5cdb6de 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test2/in/A.java @@ -1,4 +1,4 @@ package p; class A{ int A; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test2/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test2/out/B.java index 96d20fcdee..947939d2f7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test2/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test2/out/B.java @@ -1,4 +1,4 @@ package p; class B{ int A; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test26/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test26/in/A.java index 36252a3e9a..20b77da2c8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test26/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test26/in/A.java @@ -6,4 +6,4 @@ class A{ A.this.x++; } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test26/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test26/out/B.java index 23e2e05234..713752e708 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test26/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test26/out/B.java @@ -6,4 +6,4 @@ class B{ B.this.x++; } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/in/A.java index b047e010e8..10395fbc05 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/in/A.java @@ -1,2 +1,2 @@ package p; -public class A{}; \ No newline at end of file +public class A{}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/in/C.java index ffcf8fd5c1..f692f859da 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/in/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/in/C.java @@ -1,3 +1,3 @@ package p1; import p.A; -class C{}; \ No newline at end of file +class C{}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/out/B.java index 98407702f9..871cbd1140 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/out/B.java @@ -1,2 +1,2 @@ package p; -public class B{}; \ No newline at end of file +public class B{}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/out/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/out/C.java index 3e07200b82..0a5e500289 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/out/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test29/out/C.java @@ -1,3 +1,3 @@ package p1; import p.B; -class C{}; \ No newline at end of file +class C{}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test3/in/A.java index 68579037d4..30c6cf4c55 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test3/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test3/in/A.java @@ -2,4 +2,4 @@ package p; class A{ } class AA extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test3/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test3/out/B.java index 72a47fcda2..72540325f8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test3/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test3/out/B.java @@ -2,4 +2,4 @@ package p; class B{ } class AA extends B{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test30/in/AA.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test30/in/AA.java index 47f9fc04c2..b200c05b9c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test30/in/AA.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test30/in/AA.java @@ -2,4 +2,4 @@ package p; class AA{ AA(){ A.f=0; }; } - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test30/out/AA.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test30/out/AA.java index aaf251bae5..4f72ef6d8b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test30/out/AA.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test30/out/AA.java @@ -2,4 +2,4 @@ package p; class AA{ AA(){ B.f=0; }; } - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test31/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test31/in/A.java index 061be77e2e..3fe9b13c1b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test31/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test31/in/A.java @@ -1,2 +1,2 @@ package p; -class A{}; \ No newline at end of file +class A{}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test31/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test31/out/B.java index 4c0308068b..9cf1380b99 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test31/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test31/out/B.java @@ -1,2 +1,2 @@ package p; -class B{}; \ No newline at end of file +class B{}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test32/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test32/in/A.java index 34864070d4..bff9a53c8c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test32/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test32/in/A.java @@ -3,4 +3,4 @@ class A{ } class C{ C(A a){}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test32/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test32/out/B.java index a7c112876c..04dd52e5eb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test32/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test32/out/B.java @@ -3,4 +3,4 @@ class B{ } class C{ C(B a){}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test34/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test34/in/A.java index 7fe39a7c2c..85d491a418 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test34/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test34/in/A.java @@ -2,4 +2,4 @@ package p; public class A { {A a;} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test34/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test34/out/B.java index cedeb23b62..1911faaffc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test34/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test34/out/B.java @@ -2,4 +2,4 @@ package p; public class B { {B a;} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test35/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test35/in/A.java index d3969f20ed..1bef28cb0f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test35/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test35/in/A.java @@ -2,4 +2,4 @@ package p; public class A { static {A a;} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test35/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test35/out/B.java index 161b651354..823a834eb6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test35/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test35/out/B.java @@ -2,4 +2,4 @@ package p; public class B { static {B a;} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test36/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test36/in/A.java index 80671d0a0d..485deefdb0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test36/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test36/in/A.java @@ -3,4 +3,4 @@ package p; public class A { static {A a;} static {A a;} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test36/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test36/out/B.java index d99b2828a3..ddcf869889 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test36/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test36/out/B.java @@ -3,4 +3,4 @@ package p; public class B { static {B a;} static {B a;} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test37/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test37/in/A.java index a5cf5bae91..12db0cfad3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test37/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test37/in/A.java @@ -3,4 +3,4 @@ package p; public class A { static {A a;} {A a;} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test37/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test37/out/B.java index 0a55f979ce..8245683312 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test37/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test37/out/B.java @@ -3,4 +3,4 @@ package p; public class B { static {B a;} {B a;} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test38/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test38/in/A.java index 9b76ec05ba..6ae1939b36 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test38/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test38/in/A.java @@ -5,4 +5,4 @@ public class A { class C{ {A a;} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test38/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test38/out/B.java index 9084847c4e..92443eea49 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test38/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test38/out/B.java @@ -5,4 +5,4 @@ public class B { class C{ {B a;} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test39/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test39/in/A.java index 806e5a6b38..e87f43dd3c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test39/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test39/in/A.java @@ -5,4 +5,4 @@ public class A { class C{ static {A a;} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test39/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test39/out/B.java index f7855ef30a..19f10c159f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test39/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test39/out/B.java @@ -5,4 +5,4 @@ public class B { class C{ static {B a;} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test40/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test40/in/A.java index ad31dc6b5b..20579ce954 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test40/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test40/in/A.java @@ -9,4 +9,4 @@ class C { } new A(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test40/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test40/out/B.java index 3e19bb49cc..297bc3cfe8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test40/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test40/out/B.java @@ -9,4 +9,4 @@ class C { } new A(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test41/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test41/in/A.java index 04f17fdc4f..4e0f31e2d3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test41/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test41/in/A.java @@ -5,4 +5,4 @@ public class A { A= new A(new A(A)); return A; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test41/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test41/out/B.java index dddd152064..7a790d75e4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test41/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test41/out/B.java @@ -5,4 +5,4 @@ public class B { A= new B(new B(A)); return A; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test42/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test42/in/A.java index 5418dd9908..84bc19f7b8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test42/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test42/in/A.java @@ -5,4 +5,4 @@ class A { A= new A(new A(A)); return A; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test42/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test42/out/B.java index 744edb4495..3d00e00d14 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test42/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test42/out/B.java @@ -5,4 +5,4 @@ class B { A= new B(new B(A)); return A; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test43/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test43/in/A.java index d187f54107..b5687e8a59 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test43/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test43/in/A.java @@ -7,4 +7,4 @@ class X extends p.A{ void x(){ p.A.A= A.A;//fields come first } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test43/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test43/out/B.java index 20e27278c8..77500540a4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test43/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test43/out/B.java @@ -7,4 +7,4 @@ class X extends p.B{ void x(){ p.B.A= A.A;//fields come first } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test44/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test44/in/A.java index 04c067d3e8..a509489e7e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test44/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test44/in/A.java @@ -4,4 +4,4 @@ interface A { } class K implements A{ } -interface C extends A{} \ No newline at end of file +interface C extends A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test44/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test44/out/B.java index f9d3d925f9..2f83a82d4a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test44/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test44/out/B.java @@ -4,4 +4,4 @@ interface B { } class K implements B{ } -interface C extends B{} \ No newline at end of file +interface C extends B{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test45/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test45/in/A.java index 18d05b7633..8a157c0eac 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test45/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test45/in/A.java @@ -7,4 +7,4 @@ class X extends p.A{ void x(){ p.A.A= A.A; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test45/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test45/out/B.java index 61d6943889..ea3fbf4322 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test45/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test45/out/B.java @@ -7,4 +7,4 @@ class X extends p.B{ void x(){ p.B.A= A.A; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/in/A.java index b047e010e8..10395fbc05 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/in/A.java @@ -1,2 +1,2 @@ package p; -public class A{}; \ No newline at end of file +public class A{}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/in/C.java index ffcf8fd5c1..f692f859da 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/in/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/in/C.java @@ -1,3 +1,3 @@ package p1; import p.A; -class C{}; \ No newline at end of file +class C{}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/out/B.java index 98407702f9..871cbd1140 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/out/B.java @@ -1,2 +1,2 @@ package p; -public class B{}; \ No newline at end of file +public class B{}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/out/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/out/C.java index 3e07200b82..0a5e500289 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/out/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test46/out/C.java @@ -1,3 +1,3 @@ package p1; import p.B; -class C{}; \ No newline at end of file +class C{}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test47/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test47/in/A.java index 6ae44a0427..c3f9228f75 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test47/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test47/in/A.java @@ -7,4 +7,4 @@ class C{ void s(){ new A ( ); } -}; \ No newline at end of file +}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test47/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test47/out/B.java index 6d95d4f9c8..27d6ab8624 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test47/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test47/out/B.java @@ -7,4 +7,4 @@ class C{ void s(){ new B ( ); } -}; \ No newline at end of file +}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test48/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test48/in/A.java index 92da31a60a..79efa34105 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test48/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test48/in/A.java @@ -7,4 +7,4 @@ class C{ void s(){ new p . A ( ); } -}; \ No newline at end of file +}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test48/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test48/out/B.java index 6fc2e7c985..8fffdccfe9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test48/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test48/out/B.java @@ -7,4 +7,4 @@ class C{ void s(){ new p . B ( ); } -}; \ No newline at end of file +}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test49/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test49/in/A.java index dc7c33de0e..05e600923e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test49/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test49/in/A.java @@ -15,4 +15,4 @@ class C{ = 6; } -}; \ No newline at end of file +}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test49/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test49/out/B.java index 9c92c70ba4..1b45d28359 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test49/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test49/out/B.java @@ -15,4 +15,4 @@ class C{ = 6; } -}; \ No newline at end of file +}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test5/in/A.java index efce98d07d..16ec5cbf5e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test5/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test5/in/A.java @@ -1,4 +1,4 @@ package p; class A{ void m(A a){}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test5/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test5/out/B.java index bfca11103b..fec98235ec 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test5/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test5/out/B.java @@ -1,4 +1,4 @@ package p; class B{ void m(B a){}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test50/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test50/in/A.java index 6cd6718c7b..19788bb80a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test50/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test50/in/A.java @@ -11,4 +11,4 @@ class C extends A{ C(){ super(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test50/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test50/out/B.java index 33ff76e09e..8b02f264d1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test50/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test50/out/B.java @@ -11,4 +11,4 @@ class C extends B{ C(){ super(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/in/A.java index c57bddf3cb..ab9890f924 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/in/A.java @@ -1,4 +1,4 @@ package p; public class A{ public class X{} -}; \ No newline at end of file +}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/in/C.java index a10bebd4a2..c7b2ac902f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/in/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/in/C.java @@ -1,3 +1,3 @@ package p1; import p.A.*; -class C{}; \ No newline at end of file +class C{}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/out/B.java index dfa16de1d3..16da6f9ef7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/out/B.java @@ -1,4 +1,4 @@ package p; public class B{ public class X{} -}; \ No newline at end of file +}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/out/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/out/C.java index 149a043124..64c4632905 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/out/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test51/out/C.java @@ -1,3 +1,3 @@ package p1; import p.B.*; -class C{}; \ No newline at end of file +class C{}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test52/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test52/in/A.java index 5e98305e7d..5d3ce94458 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test52/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test52/in/A.java @@ -3,4 +3,4 @@ public class A{ A[] m(){ return (A[])new A[3]; } -}; \ No newline at end of file +}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test52/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test52/out/B.java index 28cefd2acf..c8d22d6854 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test52/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test52/out/B.java @@ -3,4 +3,4 @@ public class B{ B[] m(){ return (B[])new B[3]; } -}; \ No newline at end of file +}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test53/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test53/in/A.java index 8237dbef1a..08467a3dcd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test53/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test53/in/A.java @@ -6,4 +6,4 @@ public class A{ A m(){ return (A)new A(); } -}; \ No newline at end of file +}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test53/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test53/out/B.java index 9afa2e5c6c..8c6802b591 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test53/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test53/out/B.java @@ -6,4 +6,4 @@ public class B{ A m(){ return (A)new A(); } -}; \ No newline at end of file +}; diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test54/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test54/in/A.java index 67a5e75fef..411805028f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test54/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test54/in/A.java @@ -13,4 +13,4 @@ public class A{ }; class B{ A.X ax= new A().new X(null); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test54/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test54/out/A.java index efea233d55..acee271f51 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test54/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test54/out/A.java @@ -13,4 +13,4 @@ public class A{ }; class B{ A.XYZ ax= new A().new XYZ(null); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test55/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test55/in/A.java index 5abee52f97..e2054bcb0d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test55/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test55/in/A.java @@ -13,4 +13,4 @@ public class A{ }; class B{ A.X ax= new A().new X(null); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test55/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test55/out/A.java index 3a6a288fcc..4db1ca52e4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test55/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test55/out/A.java @@ -13,4 +13,4 @@ public class A{ }; class B{ A.X ax= new A().new X(null); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/A.java index 92da053753..17715c9e7d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/A.java @@ -1,4 +1,4 @@ package a.a; class A { A() {} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/B.java index 66b8fb2670..0f6cced59c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/B.java @@ -1,4 +1,4 @@ package a.a; class B { public A theA; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/default/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/default/A.java index c3f152c722..f0067217dd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/default/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/in/default/A.java @@ -1,3 +1,3 @@ class A { A() {} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/A.java index 92da053753..17715c9e7d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/A.java @@ -1,4 +1,4 @@ package a.a; class A { A() {} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/B.java index 66b8fb2670..0f6cced59c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/B.java @@ -1,4 +1,4 @@ package a.a; class B { public A theA; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/default/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/default/B.java index c21ade7754..819fda975a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/default/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test56/out/default/B.java @@ -1,3 +1,3 @@ class B { B() {} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test58/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test58/in/A.java index 0b139cea6d..8a20e58211 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test58/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test58/in/A.java @@ -9,4 +9,4 @@ class Test { public static void main(String[] arguments) { System.out.println(A.CONSTANT); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test58/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test58/out/B.java index d6da1b0959..e4489bad35 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test58/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test58/out/B.java @@ -9,4 +9,4 @@ class Test { public static void main(String[] arguments) { System.out.println(B.CONSTANT); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test59/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test59/in/A.java index 3faabb5de0..b8b7586c6c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test59/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test59/in/A.java @@ -3,4 +3,4 @@ class A { void f(){ A a= ( A )this; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test59/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test59/out/B.java index f8e4430eaf..5098bc9c56 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test59/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test59/out/B.java @@ -3,4 +3,4 @@ class B { void f(){ B a= ( B )this; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test6/in/A.java index c96f5c8331..129f9d5653 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test6/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test6/in/A.java @@ -1,4 +1,4 @@ package p; class A{ void m(A A){}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test6/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test6/out/B.java index e32d1a0c93..31329fb0e2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test6/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test6/out/B.java @@ -1,4 +1,4 @@ package p; class B{ void m(B A){}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test7/in/A.java index ff50450f33..3cbf194a5c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test7/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test7/in/A.java @@ -1,4 +1,4 @@ package p; class A{ A m(){return null;}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test7/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test7/out/B.java index 38e8cf21a1..c8c0e07951 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test7/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test7/out/B.java @@ -1,4 +1,4 @@ package p; class B{ B m(){return null;}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test8/in/A.java index 8d3c292dad..e86027eefe 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test8/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test8/in/A.java @@ -3,4 +3,4 @@ class A{ void m(){ A: return; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test8/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test8/out/B.java index 62858b84a6..16a6c3bbc6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test8/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test8/out/B.java @@ -3,4 +3,4 @@ class B{ void m(){ A: return; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test9/in/A.java index 5d48bdf0e7..9d3ad03c17 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test9/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test9/in/A.java @@ -3,4 +3,4 @@ class A{ void m(){ A A; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test9/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test9/out/B.java index 3f6c10b2c5..d3bac47c15 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test9/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/test9/out/B.java @@ -3,4 +3,4 @@ class B{ void m(){ B A; }; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation1/in/A.java index beb259df68..a32c316065 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation1/in/A.java @@ -13,4 +13,4 @@ class Client { @Deprecated @A() void bad() { } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation1/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation1/out/B.java index 75504bea91..1361943545 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation1/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation1/out/B.java @@ -13,4 +13,4 @@ class Client { @Deprecated @B() void bad() { } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation2/in/A.java index 2f22ecf9c2..4e25999d83 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation2/in/A.java @@ -18,4 +18,4 @@ class Client { void bad() { final @A int local= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation2/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation2/out/B.java index 772b22ddd1..6666f37c49 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation2/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testAnnotation2/out/B.java @@ -18,4 +18,4 @@ class Client { void bad() { final @B int local= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum1/in/p2/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum1/in/p2/A.java index a34ecece32..b474a3dbda 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum1/in/p2/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum1/in/p2/A.java @@ -7,4 +7,4 @@ class A { p.A b= p.A.ONE; A a2= new A(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum1/out/p2/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum1/out/p2/A.java index 76d8ab8fde..b65ab696e3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum1/out/p2/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testEnum1/out/p2/A.java @@ -7,4 +7,4 @@ class A { p.B b= p.B.ONE; A a2= new A(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail0/in/A.java index 6f63ab9a05..86b85feaaf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail0/in/A.java @@ -2,4 +2,4 @@ package p; class A { } class B extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail00/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail00/in/A.java index 6f63ab9a05..86b85feaaf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail00/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail00/in/A.java @@ -2,4 +2,4 @@ package p; class A { } class B extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail01/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail01/in/A.java index f6daf1db37..0b377a2e3c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail01/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail01/in/A.java @@ -6,4 +6,4 @@ class C extends A{ } class B extends C{ } - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail02/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail02/in/A.java index 6f63ab9a05..86b85feaaf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail02/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail02/in/A.java @@ -2,4 +2,4 @@ package p; class A { } class B extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail03/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail03/in/A.java index f6daf1db37..0b377a2e3c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail03/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail03/in/A.java @@ -6,4 +6,4 @@ class C extends A{ } class B extends C{ } - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail04/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail04/in/A.java index f6daf1db37..0b377a2e3c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail04/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail04/in/A.java @@ -6,4 +6,4 @@ class C extends A{ } class B extends C{ } - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail1/in/A.java index f6daf1db37..0b377a2e3c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail1/in/A.java @@ -6,4 +6,4 @@ class C extends A{ } class B extends C{ } - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail10/in/A.java index a7cbe67c95..911becc44a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail10/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail10/in/A.java @@ -6,4 +6,4 @@ class A{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail11/in/A.java index b376073902..641c80a930 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail11/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail11/in/A.java @@ -1,4 +1,4 @@ package p; class B{ class A{} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail12/in/A.java index 179edb20a8..9ae055ec5f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail12/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail12/in/A.java @@ -1,4 +1,4 @@ package p; class A{ interface B{} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail16/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail16/in/A.java index e325f6ae07..0d4519ba73 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail16/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail16/in/A.java @@ -2,4 +2,4 @@ package p; class Outer{ class A{} class B{} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail17/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail17/in/A.java index ae12ea269e..86d6e4efd6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail17/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail17/in/A.java @@ -2,4 +2,4 @@ package p; class Outer{ class A{} interface B{} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail18/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail18/in/A.java index ad30f07e9d..a55776dee1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail18/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail18/in/A.java @@ -4,4 +4,4 @@ class Outer{ class A{} class B{} } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail19/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail19/in/A.java index ad30f07e9d..a55776dee1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail19/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail19/in/A.java @@ -4,4 +4,4 @@ class Outer{ class A{} class B{} } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail2/in/A.java index 304ff482a5..e60677ef4b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail2/in/A.java @@ -3,4 +3,4 @@ class A extends B{ } class B{ } - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail20/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail20/in/A.java index 7ca9bbb780..7df814bb8a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail20/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail20/in/A.java @@ -1,3 +1,3 @@ package p1; public class A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail20/in/AA.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail20/in/AA.java index 74916a64b7..59b0c498f3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail20/in/AA.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail20/in/AA.java @@ -1,4 +1,4 @@ package p2; import p1.*; class AA extends A{} -class B extends AA{} \ No newline at end of file +class B extends AA{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail21/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail21/in/A.java index 77c8e4454f..befe1ca6b3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail21/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail21/in/A.java @@ -1,2 +1,2 @@ package p1; -class A{} \ No newline at end of file +class A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail21/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail21/in/C.java index 3681e46e89..eb98501016 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail21/in/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail21/in/C.java @@ -1,2 +1,2 @@ package p1.B; -class C{} \ No newline at end of file +class C{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail22/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail22/in/A.java index 32ba7d380c..2d41926744 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail22/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail22/in/A.java @@ -1,2 +1,2 @@ package p; -class A{} \ No newline at end of file +class A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail22/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail22/in/B.java index 7c55812eb9..041d1b1bf4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail22/in/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail22/in/B.java @@ -1,2 +1,2 @@ package p; -interface B{} \ No newline at end of file +interface B{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/A.java index 25ac9bf8cd..c30c8d1998 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/A.java @@ -1,2 +1,2 @@ package p1; -public class A{} \ No newline at end of file +public class A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/B.java index 1e8902b045..6863ce34b7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/B.java @@ -1,2 +1,2 @@ package p3; -public class B{} \ No newline at end of file +public class B{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/Bogus.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/Bogus.java index c10e59b641..d171ddb9c8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/Bogus.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail23/in/Bogus.java @@ -1,4 +1,4 @@ package p2; import p1.A; import p3.B; -class Bogus{} \ No newline at end of file +class Bogus{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail24/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail24/in/A.java index 25ac9bf8cd..c30c8d1998 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail24/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail24/in/A.java @@ -1,2 +1,2 @@ package p1; -public class A{} \ No newline at end of file +public class A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail24/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail24/in/B.java index 3945a4963c..7644b90c4d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail24/in/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail24/in/B.java @@ -1,3 +1,3 @@ package p2; import p1.A; -class B{} \ No newline at end of file +class B{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail25/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail25/in/A.java index 25ac9bf8cd..c30c8d1998 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail25/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail25/in/A.java @@ -1,2 +1,2 @@ package p1; -public class A{} \ No newline at end of file +public class A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail25/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail25/in/B.java index 042c4555f8..76b64ba830 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail25/in/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail25/in/B.java @@ -1,3 +1,3 @@ package p2; import p1.A; -interface B{} \ No newline at end of file +interface B{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail26/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail26/in/A.java index 61b6e6fe84..9290bdb36e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail26/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail26/in/A.java @@ -1,3 +1,3 @@ package p1; import p2.B; -public class A{} \ No newline at end of file +public class A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail26/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail26/in/B.java index 8a3f9bf832..f103712d50 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail26/in/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail26/in/B.java @@ -1,2 +1,2 @@ package p2; -public interface B{} \ No newline at end of file +public interface B{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail27/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail27/in/A.java index 8071f64086..dd3c44c148 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail27/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail27/in/A.java @@ -1,3 +1,3 @@ package p1; import p2.B; -public class A{} \ No newline at end of file +public class A{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail27/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail27/in/B.java index 16d51006d7..c16f798891 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail27/in/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail27/in/B.java @@ -1,2 +1,2 @@ package p2; -public class B{} \ No newline at end of file +public class B{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail28/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail28/in/A.java index 056876b696..e5f5f72113 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail28/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail28/in/A.java @@ -6,4 +6,4 @@ class A{ return A.length; } } - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail29/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail29/in/A.java index 61d356642c..50e30fb065 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail29/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail29/in/A.java @@ -5,4 +5,4 @@ class A{ return A.length; } } - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail30/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail30/in/A.java index 4ab0bf37f7..96451bcaf9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail30/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail30/in/A.java @@ -6,4 +6,4 @@ class A{ return A.length; } } - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail31/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail31/in/C.java index 1b13cadce4..a9a111e931 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail31/in/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail31/in/C.java @@ -3,4 +3,4 @@ import p1.*; import p2.B; class C{ Object o = new A(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail32/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail32/in/A.java index 7b5d1765fe..f6160631ed 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail32/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail32/in/A.java @@ -2,4 +2,4 @@ package p; import p1.*; public class A{ Object o = new B(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail32/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail32/in/B.java index 568eb40467..c5ce263299 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail32/in/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail32/in/B.java @@ -1,2 +1,2 @@ package p1; -public class B{} \ No newline at end of file +public class B{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail36/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail36/in/A.java index 00a75d1d30..bd28db0e45 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail36/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail36/in/A.java @@ -10,4 +10,4 @@ class C { void m() { A.length= 0; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail37/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail37/in/A.java index 71df552c4e..9ab680f074 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail37/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail37/in/A.java @@ -1,4 +1,4 @@ package p; public class A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail37/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail37/in/B.java index 6cb383e50c..f0b30e133c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail37/in/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail37/in/B.java @@ -1,2 +1,2 @@ package p; -class B{} \ No newline at end of file +class B{} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail38/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail38/in/A.java index b7438c3376..e9d6257835 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail38/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail38/in/A.java @@ -5,4 +5,4 @@ public class A{ native void j(); } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail39/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail39/in/A.java index 94de0d7290..d4e9d2e447 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail39/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail39/in/A.java @@ -1,4 +1,4 @@ package p; public class A{ native void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail4/in/A.java index 6291b8090d..a3f0bca206 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail4/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail4/in/A.java @@ -1,3 +1,3 @@ package p; class A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail4/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail4/in/B.java index 361389266e..9b31f282b3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail4/in/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail4/in/B.java @@ -1,4 +1,4 @@ package p; class B extends A{ } - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail40/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail40/in/A.java index 71e483637d..f0060b33b9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail40/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail40/in/A.java @@ -3,4 +3,4 @@ public class A{ class C{ native void m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail45/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail45/in/A.java index 5554553652..4861d6ae0d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail45/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail45/in/A.java @@ -9,4 +9,4 @@ class FF implements I{ int m(){ return A.length(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail46/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail46/in/A.java index 2c0539cb2b..dd917ebdcf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail46/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail46/in/A.java @@ -7,4 +7,4 @@ class S{ Integer B= null; return A.MAX_VALUE; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail47/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail47/in/A.java index a6af04df85..2f75a6beb3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail47/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail47/in/A.java @@ -6,4 +6,4 @@ class S{ int m(Integer B){ return A.MAX_VALUE; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail48/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail48/in/A.java index 730681c29f..489be0c3bc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail48/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail48/in/A.java @@ -5,4 +5,4 @@ class X{ class B{ } A a; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail49/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail49/in/A.java index 6e5046d0f3..7dde1e7aeb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail49/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail49/in/A.java @@ -7,4 +7,4 @@ class X{ A m(){ return null; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/A.java index 6291b8090d..a3f0bca206 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/A.java @@ -1,3 +1,3 @@ package p; class A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/B.java index 3d18e87f2c..cb98593504 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/B.java @@ -1,4 +1,4 @@ package p; class B extends C{ } - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/C.java index 293a290d8e..ad4ea55b9b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail5/in/C.java @@ -1,3 +1,3 @@ package p; class C extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail50/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail50/in/A.java index ce74207dd3..40f7bf15d3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail50/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail50/in/A.java @@ -6,4 +6,4 @@ class X{ } void m(A a){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail51/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail51/in/A.java index 223883f8af..f9f31688ac 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail51/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail51/in/A.java @@ -6,4 +6,4 @@ class X{ } X(A a){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail52/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail52/in/A.java index 7129fc6fb4..3356aed4a9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail52/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail52/in/A.java @@ -6,4 +6,4 @@ class X{ } void m() throws A{ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail53/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail53/in/A.java index 917fe91714..facc5fbdd1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail53/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail53/in/A.java @@ -6,4 +6,4 @@ class X{ } X() throws A{ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail55/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail55/in/A.java index 45a7007471..55adf400dd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail55/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail55/in/A.java @@ -12,4 +12,4 @@ class X{ } catch (A a){ } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail56/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail56/in/A.java index 927609bcd0..5a11fcaac2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail56/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail56/in/A.java @@ -5,4 +5,4 @@ class X{ class B extends Exception{ } Object o= A.class; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail57/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail57/in/A.java index 222d305485..76faf3e2fb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail57/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail57/in/A.java @@ -5,4 +5,4 @@ class X{ class B{ } Object o= new A(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail58/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail58/in/A.java index eaab62a9a4..8b4aa63ad1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail58/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail58/in/A.java @@ -5,4 +5,4 @@ class X{ class B{ } Object o= new A(){}; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail59/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail59/in/A.java index 5b3be0549b..461a8f6610 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail59/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail59/in/A.java @@ -5,4 +5,4 @@ class X{ class B{ } Object o= new A[0]; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail6/in/A.java index 07a2149e92..a86002f784 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail6/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail6/in/A.java @@ -1,3 +1,3 @@ package p; class A extends C{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail6/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail6/in/B.java index d110d65e7a..3e51795e6a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail6/in/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail6/in/B.java @@ -1,3 +1,3 @@ package p; class B{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail60/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail60/in/A.java index 2b19f3b219..1c8ae0f1fa 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail60/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail60/in/A.java @@ -7,4 +7,4 @@ class X{ Object m(Object o){ return (A)o; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail64/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail64/in/A.java index aca1914723..76f267df96 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail64/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail64/in/A.java @@ -6,4 +6,4 @@ class X{ } class Fred extends A{ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail65/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail65/in/A.java index 773ea1ea1f..5540dd1f3f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail65/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail65/in/A.java @@ -6,4 +6,4 @@ class X{ class B{} A a; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail66/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail66/in/A.java index cbd29475d6..e7fa738602 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail66/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail66/in/A.java @@ -10,4 +10,4 @@ class X{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail67/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail67/in/A.java index 1bd4502d9a..f7bf696de1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail67/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail67/in/A.java @@ -9,4 +9,4 @@ class X{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail68/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail68/in/A.java index 9f6c6536f7..39baf08b60 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail68/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail68/in/A.java @@ -10,4 +10,4 @@ class X{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail69/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail69/in/A.java index 41099487f4..69b94fae8e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail69/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail69/in/A.java @@ -9,4 +9,4 @@ class X{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail7/in/A.java index dd7b3a08ec..4d645568b2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail7/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail7/in/A.java @@ -3,4 +3,4 @@ class A{ } class B{} - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail70/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail70/in/A.java index 0f3f1b42dc..5ea0ad64e8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail70/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail70/in/A.java @@ -9,4 +9,4 @@ class X{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail73/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail73/in/A.java index 98430b0ff3..7173667a57 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail73/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail73/in/A.java @@ -5,4 +5,4 @@ class X{ class B {} Object o= A.class; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail74/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail74/in/A.java index 10d8bfe5ae..18bb3e6f76 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail74/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail74/in/A.java @@ -6,4 +6,4 @@ class X{ class B{} Object o= new A(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail75/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail75/in/A.java index f6cdea7c8e..b8179aa446 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail75/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail75/in/A.java @@ -6,4 +6,4 @@ class X{ class B{} Object o= new A(){}; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail76/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail76/in/A.java index 48f65c645a..5a2263866e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail76/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail76/in/A.java @@ -6,4 +6,4 @@ class X{ class B{} Object o= new A[0]; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail77/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail77/in/A.java index a4d5354efb..3e706268bb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail77/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail77/in/A.java @@ -10,4 +10,4 @@ class X{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail78/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail78/in/A.java index b2d42cb5ca..58ebb60393 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail78/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail78/in/A.java @@ -10,4 +10,4 @@ class X{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail8/in/A.java index 4a3f2232fd..e2b4ec41ac 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail8/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail8/in/A.java @@ -1,4 +1,4 @@ package p; class A{ } - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail8/in/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail8/in/B.java index d5d34df8e9..33ab84203d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail8/in/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail8/in/B.java @@ -1,3 +1,3 @@ package p; class B{} - \ No newline at end of file + diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail82/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail82/in/A.java index 96d072c3b9..6f7b8f8f8f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail82/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail82/in/A.java @@ -2,4 +2,4 @@ package p; class A{} class X{ class B extends A{} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail83/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail83/in/A.java index ffe08d46d5..2d6f0d916d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail83/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail83/in/A.java @@ -5,4 +5,4 @@ class X{ void m(){ class C implements A, Cloneable{} } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail85/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail85/in/A.java index 7e9bfb18a2..ba3fed6ad5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail85/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail85/in/A.java @@ -5,4 +5,4 @@ class A{ native void n(); } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail86/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail86/in/A.java index fef1289fc2..b9e1188191 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail86/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail86/in/A.java @@ -2,4 +2,4 @@ package p; class A{} class C{ native void n(A a); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail87/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail87/in/A.java index 9c0c81c667..92257dca39 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail87/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail87/in/A.java @@ -4,4 +4,4 @@ class C{ class D{ native void n(A a); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail88/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail88/in/A.java index 2c1bc5188d..2621351e91 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail88/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail88/in/A.java @@ -5,4 +5,4 @@ class A{ native void m(); } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail89/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail89/in/A.java index da0e6dd7da..e01e47599a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail89/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail89/in/A.java @@ -7,4 +7,4 @@ class A{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail9/in/A.java index 8c0da8d655..792669c13d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail9/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail9/in/A.java @@ -1,3 +1,3 @@ class A{ class B{} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail91/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail91/in/A.java index a830c1af95..61592597c5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail91/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail91/in/A.java @@ -11,4 +11,4 @@ class FF implements I{ int m(){ return A.length(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail92/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail92/in/A.java index 639b145c2d..75081e2e09 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail92/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail92/in/A.java @@ -5,4 +5,4 @@ public class A{ class B{} } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail93/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail93/in/A.java index 40039ab182..cea88dcf2e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail93/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail93/in/A.java @@ -7,4 +7,4 @@ public class A{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail94/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail94/in/A.java index ff0cb15983..62e6a9da45 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail94/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail94/in/A.java @@ -2,4 +2,4 @@ package p; class A{} class B{ native void m(A a); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail95/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail95/in/A.java index ac49ce4c6a..4067643861 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail95/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFail95/in/A.java @@ -15,4 +15,4 @@ class A { } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFailRegression1GCRKMQ/in/Blinky.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFailRegression1GCRKMQ/in/Blinky.java index 4140567871..0f6085358b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFailRegression1GCRKMQ/in/Blinky.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testFailRegression1GCRKMQ/in/Blinky.java @@ -6,4 +6,4 @@ public class Blinky{ public static void main(String[] args) { } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalInnerClass/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalInnerClass/in/A.java index b376073902..641c80a930 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalInnerClass/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalInnerClass/in/A.java @@ -1,4 +1,4 @@ package p; class B{ class A{} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName1/in/A.java index 6f63ab9a05..86b85feaaf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName1/in/A.java @@ -2,4 +2,4 @@ package p; class A { } class B extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName2/in/A.java index 6f63ab9a05..86b85feaaf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName2/in/A.java @@ -2,4 +2,4 @@ package p; class A { } class B extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName3/in/A.java index 6f63ab9a05..86b85feaaf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName3/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName3/in/A.java @@ -2,4 +2,4 @@ package p; class A { } class B extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName4/in/A.java index 6f63ab9a05..86b85feaaf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName4/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName4/in/A.java @@ -2,4 +2,4 @@ package p; class A { } class B extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName5/in/A.java index 6f63ab9a05..86b85feaaf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName5/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName5/in/A.java @@ -2,4 +2,4 @@ package p; class A { } class B extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName6/in/A.java index 6f63ab9a05..86b85feaaf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName6/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName6/in/A.java @@ -2,4 +2,4 @@ package p; class A { } class B extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName7/in/A.java index 6f63ab9a05..86b85feaaf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName7/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName7/in/A.java @@ -2,4 +2,4 @@ package p; class A { } class B extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName8/in/A.java index 6f63ab9a05..86b85feaaf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName8/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testIllegalTypeName8/in/A.java @@ -2,4 +2,4 @@ package p; class A { } class B extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testNoOp/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testNoOp/in/A.java index 6f63ab9a05..86b85feaaf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testNoOp/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testNoOp/in/A.java @@ -2,4 +2,4 @@ package p; class A { } class B extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName1/in/A.java index 23fae3e676..8b7d8d5d86 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName1/in/A.java @@ -1,4 +1,4 @@ package p; class A { -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName1/out/B.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName1/out/B.java index 4059e228fa..0863f5f49b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName1/out/B.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName1/out/B.java @@ -1,4 +1,4 @@ package p; class B { -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName2/in/Transient.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName2/in/Transient.java index a9fd86fa84..625afe77c6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName2/in/Transient.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName2/in/Transient.java @@ -9,4 +9,4 @@ public class Transient { } class TransientProperty { -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName2/out/TransientEquipment.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName2/out/TransientEquipment.java index 68c20ce575..7ee1b1dd19 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName2/out/TransientEquipment.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testQualifiedName2/out/TransientEquipment.java @@ -9,4 +9,4 @@ public class TransientEquipment { } class TransientProperty { -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements34/in/Try.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements34/in/Try.java index e8ca69550e..111c1a51ae 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements34/in/Try.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements34/in/Try.java @@ -17,4 +17,4 @@ public class Try { @interface Constants { Class value(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements34/out/Bla.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements34/out/Bla.java index f99087b7c0..aac3f8c503 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements34/out/Bla.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testSimilarElements34/out/Bla.java @@ -17,4 +17,4 @@ public class Bla { @interface Constants { Class value(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg1/in/A.java index 6f63ab9a05..86b85feaaf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg1/in/A.java @@ -2,4 +2,4 @@ package p; class A { } class B extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg2/in/A.java index 6f63ab9a05..86b85feaaf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg2/in/A.java @@ -2,4 +2,4 @@ package p; class A { } class B extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg3/in/A.java index 6f63ab9a05..86b85feaaf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg3/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg3/in/A.java @@ -2,4 +2,4 @@ package p; class A { } class B extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg4/in/A.java index 6f63ab9a05..86b85feaaf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg4/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameType/testWrongArg4/in/A.java @@ -2,4 +2,4 @@ package p; class A { } class B extends A{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test0/in/A.java index 85166d9e81..f2fe37c828 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test0/in/A.java @@ -1,4 +1,4 @@ package p; class A{ private int f; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test0/out/A.java index 4016d53f6f..13835cde25 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test0/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test0/out/A.java @@ -1,4 +1,4 @@ package p; class A{ private int f; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test1/in/A.java index e1f3b897c2..e7304493f4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test1/in/A.java @@ -4,4 +4,4 @@ class A{ void m(){ T g= f; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test1/out/A.java index 2267609b65..d2af6bc2e7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test1/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test1/out/A.java @@ -4,4 +4,4 @@ class A{ void m(){ S g= f; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test10/in/A.java index 77bc6b53ca..f14a8b4d7f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test10/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test10/in/A.java @@ -7,4 +7,4 @@ class A{ return null; } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test10/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test10/out/A.java index 3b841f8ffd..975c4d4df4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test10/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test10/out/A.java @@ -7,4 +7,4 @@ class A{ return null; } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test11/in/A.java index c8e154f614..ae0292f1fe 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test11/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test11/in/A.java @@ -2,4 +2,4 @@ package p; class A{ private int f; static T f(T t) {return null;} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test11/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test11/out/A.java index 09beebdef9..cdf8ae0d16 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test11/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test11/out/A.java @@ -2,4 +2,4 @@ package p; class A{ private int f; static T f(T t) {return null;} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test12/in/A.java index 1be1f59eb8..815e283e9b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test12/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test12/in/A.java @@ -7,4 +7,4 @@ class A{ return null; } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test12/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test12/out/A.java index 60d75559a6..16f40d5349 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test12/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test12/out/A.java @@ -7,4 +7,4 @@ class A{ return null; } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test13/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test13/in/A.java index ed344d5bb8..f053a65095 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test13/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test13/in/A.java @@ -15,4 +15,4 @@ class A { class Inner { T tee; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test13/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test13/out/A.java index b52cba1024..e1c1072a6b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test13/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test13/out/A.java @@ -15,4 +15,4 @@ class A { class Inner { S tee; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test2/in/A.java index e1f3b897c2..e7304493f4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test2/in/A.java @@ -4,4 +4,4 @@ class A{ void m(){ T g= f; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test2/out/A.java index f300dc73a5..e7c8f99b03 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test2/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test2/out/A.java @@ -4,4 +4,4 @@ class A{ void m(){ T g= f; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test3/in/A.java index 714c3e90ae..4a4d0d6f9b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test3/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test3/in/A.java @@ -5,4 +5,4 @@ class A{ T g= f; return null; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test3/out/A.java index 59c53f56b3..17b2ad8769 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test3/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test3/out/A.java @@ -5,4 +5,4 @@ class A{ S g= f; return null; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test4/in/A.java index 714c3e90ae..4a4d0d6f9b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test4/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test4/in/A.java @@ -5,4 +5,4 @@ class A{ T g= f; return null; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test4/out/A.java index 7e31116860..eeea684882 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test4/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test4/out/A.java @@ -5,4 +5,4 @@ class A{ T g= f; return null; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test5/in/A.java index 81f2604938..1066a58c02 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test5/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test5/in/A.java @@ -3,4 +3,4 @@ class A{ private int f; class B{ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test5/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test5/out/A.java index 00518e0e17..393428b2f0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test5/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test5/out/A.java @@ -3,4 +3,4 @@ class A{ private int f; class B{ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test6/in/A.java index 86dee3ac87..b4366c861d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test6/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test6/in/A.java @@ -3,4 +3,4 @@ class A{ private int f; class B{ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test6/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test6/out/A.java index 6b0a8af2aa..dc0950259d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test6/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test6/out/A.java @@ -3,4 +3,4 @@ class A{ private int f; class B{ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test7/in/A.java index 81f2604938..1066a58c02 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test7/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test7/in/A.java @@ -3,4 +3,4 @@ class A{ private int f; class B{ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test7/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test7/out/A.java index 00518e0e17..393428b2f0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test7/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test7/out/A.java @@ -3,4 +3,4 @@ class A{ private int f; class B{ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test8/in/A.java index 86dee3ac87..b4366c861d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test8/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test8/in/A.java @@ -3,4 +3,4 @@ class A{ private int f; class B{ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test8/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test8/out/A.java index 6b0a8af2aa..dc0950259d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test8/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test8/out/A.java @@ -3,4 +3,4 @@ class A{ private int f; class B{ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test9/in/A.java index c8e154f614..ae0292f1fe 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test9/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test9/in/A.java @@ -2,4 +2,4 @@ package p; class A{ private int f; static T f(T t) {return null;} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test9/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test9/out/A.java index 483f335a1f..479468c572 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test9/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/test9/out/A.java @@ -2,4 +2,4 @@ package p; class A{ private int f; static S f(S t) {return null;} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail0/in/A.java index b9f960f9d6..61062c7e9d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail0/in/A.java @@ -3,4 +3,4 @@ class A{ class S {} private int f; private int g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail1/in/A.java index fefcd3c509..63862f504a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail1/in/A.java @@ -3,4 +3,4 @@ class A{ class S{} private int f; private String g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail2/in/A.java index 0c2e8dc482..d2fdf2abca 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail2/in/A.java @@ -3,4 +3,4 @@ class A{ static class S {} private int f; private int g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail3/in/A.java index 29db22ffcb..46bea2c3b2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail3/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail3/in/A.java @@ -2,4 +2,4 @@ package p; class A{ private int f; private String g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail4/in/A.java index 9b790edef9..bff55a8d2b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail4/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail4/in/A.java @@ -3,4 +3,4 @@ class A{ static class S{} private int f; private String g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail5/in/A.java index 37599f59c0..7f9dfbebd6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail5/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameTypeParameter/testFail5/in/A.java @@ -8,4 +8,4 @@ class A{ } private T f; private B g; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test1/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test1/in/A.java index b390b33079..8250f22604 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test1/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test1/in/A.java @@ -2,4 +2,4 @@ package p; //renaming A.m to k abstract class A { abstract void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test1/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test1/out/A.java index 1c62c6136d..f2308a3580 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test1/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test1/out/A.java @@ -2,4 +2,4 @@ package p; //renaming A.m to k abstract class A { abstract void k(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test10/in/A.java index 189c1ee19a..ed2c6b7e14 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test10/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test10/in/A.java @@ -5,4 +5,4 @@ class A { } class B { void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test10/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test10/out/A.java index 39cbee99b0..25dae59a8c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test10/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test10/out/A.java @@ -5,4 +5,4 @@ class A { } class B { void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test11/in/A.java index 73b0420fbd..c4898bb0c6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test11/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test11/in/A.java @@ -5,4 +5,4 @@ class A { } class B extends A{ void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test11/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test11/out/A.java index 43cb6471f8..be42c40cbf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test11/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test11/out/A.java @@ -5,4 +5,4 @@ class A { } class B extends A{ void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test12/in/A.java index eba14d94f2..920cde4209 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test12/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test12/in/A.java @@ -5,4 +5,4 @@ class A { } class B extends A{ public void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test12/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test12/out/A.java index dff6414e6a..d003b33e5b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test12/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test12/out/A.java @@ -5,4 +5,4 @@ class A { } class B extends A{ public void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test13/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test13/in/A.java index 0e114b1f54..637186f4d0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test13/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test13/in/A.java @@ -10,4 +10,4 @@ class B{ class A extends B{ void m(){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test13/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test13/out/A.java index aa8b9db50a..84fdb84819 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test13/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test13/out/A.java @@ -10,4 +10,4 @@ class B{ class A extends B{ void k(){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test14/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test14/in/A.java index 962ae44b30..5d9161ee00 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test14/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test14/in/A.java @@ -13,4 +13,4 @@ class A extends B{ void f(){ m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test14/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test14/out/A.java index 978ee424ff..a865571529 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test14/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test14/out/A.java @@ -13,4 +13,4 @@ class A extends B{ void f(){ k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test15/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test15/in/A.java index 0dc48afb50..31bd8969cc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test15/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test15/in/A.java @@ -4,4 +4,4 @@ class A{ int m(int m){ return m(m(m)); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test15/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test15/out/A.java index 1459a9a374..87b325dd1f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test15/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test15/out/A.java @@ -4,4 +4,4 @@ class A{ int k(int m){ return k(k(m)); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test16/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test16/in/A.java index ab6d0b5f28..65e5031b84 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test16/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test16/in/A.java @@ -4,4 +4,4 @@ class A{ int m(int m){ return m(m(m)); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test16/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test16/out/A.java index f701b63023..591b618bb0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test16/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test16/out/A.java @@ -4,4 +4,4 @@ class A{ int fred(int m){ return fred(fred(m)); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test17/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test17/in/A.java index 9e7294fa32..fffa40b2a2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test17/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test17/in/A.java @@ -5,4 +5,4 @@ public class A { } class B extends A{ void m(boolean m){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test17/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test17/out/A.java index 4c211164b7..ea843e0cb8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test17/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test17/out/A.java @@ -5,4 +5,4 @@ public class A { } class B extends A{ void m(boolean m){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/in/A.java index 6208aa1bcc..f693724bea 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/in/A.java @@ -8,4 +8,4 @@ class B { public class A extends B { void m(int m) { } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/in/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/in/C.java index 4794cc8dd1..7a756528a4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/in/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/in/C.java @@ -3,4 +3,4 @@ class C{ void k(){ new A().m(4); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/out/A.java index 763c416444..bf90622ab7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/out/A.java @@ -8,4 +8,4 @@ class B { public class A extends B { void kk(int m) { } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/out/C.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/out/C.java index 493535e516..50be084e0f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/out/C.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test18/out/C.java @@ -3,4 +3,4 @@ class C{ void k(){ new A().kk(4); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test19/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test19/in/A.java index 00408dab4e..ed49df4eba 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test19/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test19/in/A.java @@ -10,4 +10,4 @@ class B{ A a= new A(); a.m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test19/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test19/out/A.java index ce318189f8..3524dfd0dd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test19/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test19/out/A.java @@ -10,4 +10,4 @@ class B{ A a= new A(); a.fred(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test2/in/A.java index 34ca89ca28..32437152eb 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test2/in/A.java @@ -12,4 +12,4 @@ class B{ . m (); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test2/out/A.java index d7ddb5942b..37e64c77dc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test2/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test2/out/A.java @@ -12,4 +12,4 @@ class B{ . fred (); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test20/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test20/in/A.java index 726d3fbd0d..71376170cd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test20/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test20/in/A.java @@ -22,4 +22,4 @@ class B{ ); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test20/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test20/out/A.java index 0750d28932..9209b70f21 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test20/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test20/out/A.java @@ -22,4 +22,4 @@ class B{ ); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test21/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test21/in/A.java index 4d69649273..1d9da6ef87 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test21/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test21/in/A.java @@ -10,4 +10,4 @@ class B extends A{ super . m (4); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test21/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test21/out/A.java index e16a39c911..1ab524bf6a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test21/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test21/out/A.java @@ -10,4 +10,4 @@ class B extends A{ super . fred (4); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test22/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test22/in/A.java index 56d0efa5d3..e710cf9c9c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test22/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test22/in/A.java @@ -37,4 +37,4 @@ class test{ public static void main(String[] args){ new B().fred(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test22/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test22/out/A.java index c09b947f50..c7f2d905b5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test22/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test22/out/A.java @@ -37,4 +37,4 @@ class test{ public static void main(String[] args){ new B().fred(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test23/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test23/in/A.java index 34da048fa0..a11c9d0be2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test23/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test23/in/A.java @@ -10,4 +10,4 @@ class test{ void m(){} } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test23/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test23/out/A.java index ad18f1a50e..bef64199c9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test23/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test23/out/A.java @@ -10,4 +10,4 @@ class test{ void k(){} } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test24/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test24/in/A.java index 751eff5b73..145ea92093 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test24/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test24/in/A.java @@ -7,4 +7,4 @@ class A{ class B extends A{ void m(java.lang.String s){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test24/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test24/out/A.java index 692f88804b..84cdbff136 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test24/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test24/out/A.java @@ -7,4 +7,4 @@ class A{ class B extends A{ void k(java.lang.String s){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test25/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test25/in/A.java index b7498e1e9e..c7b3e2ac2e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test25/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test25/in/A.java @@ -12,4 +12,4 @@ class A{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test25/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test25/out/A.java index a0ccb4dedf..930c5aa5fc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test25/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test25/out/A.java @@ -12,4 +12,4 @@ class A{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test26/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test26/in/A.java index a89eb28fe8..fac066648b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test26/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test26/in/A.java @@ -8,4 +8,4 @@ class B{ static { new A().m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test26/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test26/out/A.java index 0f715d6b6b..136e79f289 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test26/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test26/out/A.java @@ -8,4 +8,4 @@ class B{ static { new A().k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test27/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test27/in/A.java index 23de0650aa..0abe4341c6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test27/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test27/in/A.java @@ -8,4 +8,4 @@ class B{ { new A().m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test27/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test27/out/A.java index 6b618dc584..390b797059 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test27/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test27/out/A.java @@ -8,4 +8,4 @@ class B{ { new A().k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test28/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test28/in/A.java index 4a44acd658..eeb5eecaa6 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test28/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test28/in/A.java @@ -6,4 +6,4 @@ class A{ { new A().m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test28/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test28/out/A.java index 73719a3d6f..eb3ec7d4fe 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test28/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test28/out/A.java @@ -6,4 +6,4 @@ class A{ { new A().k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test29/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test29/in/A.java index d3cb7ef42a..e3651afb35 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test29/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test29/in/A.java @@ -6,4 +6,4 @@ class A{ static { new A().m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test29/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test29/out/A.java index 833cebf042..287c7e1576 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test29/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test29/out/A.java @@ -6,4 +6,4 @@ class A{ static { new A().k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test30/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test30/in/A.java index 1fdbd9b003..44249dc8ba 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test30/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test30/in/A.java @@ -17,4 +17,4 @@ class C{ void f(B b){ b.f().m().f().m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test30/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test30/out/A.java index cf5f40463a..14c37f1d90 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test30/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test30/out/A.java @@ -17,4 +17,4 @@ class C{ void f(B b){ b.f().k().f().k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test31/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test31/in/A.java index 60f4b48c2e..0223559e01 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test31/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test31/in/A.java @@ -5,4 +5,4 @@ class A{ void m(){ this.m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test31/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test31/out/A.java index 5325623a22..02d184f289 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test31/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test31/out/A.java @@ -5,4 +5,4 @@ class A{ void k(){ this.k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test32/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test32/in/A.java index db159df798..016800cc42 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test32/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test32/in/A.java @@ -6,4 +6,4 @@ class A{ void m(){ this.m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test32/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test32/out/A.java index d129128266..5f47c6cc2a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test32/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test32/out/A.java @@ -6,4 +6,4 @@ class A{ void k(){ this.m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test33/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test33/in/A.java index e955c8b377..176974d940 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test33/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test33/in/A.java @@ -8,4 +8,4 @@ class AQE extends A{ public void m(){ super.m(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test33/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test33/out/A.java index 7eafaed2a7..cba2164d0d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test33/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test33/out/A.java @@ -8,4 +8,4 @@ class AQE extends A{ public void k(){ super.k(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test34/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test34/in/A.java index 3a6c8d4d09..5aa192e8b5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test34/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test34/in/A.java @@ -15,4 +15,4 @@ class B extends A { public B() { super(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test34/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test34/out/A.java index 3a6c8d4d09..5aa192e8b5 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test34/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test34/out/A.java @@ -15,4 +15,4 @@ class B extends A { public B() { super(); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test35/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test35/in/A.java index 7f8b38653a..dd37b7f7bd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test35/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test35/in/A.java @@ -6,4 +6,4 @@ class A { class B extends A{ protected void foo(Object o){} protected void foo(String s){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test35/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test35/out/A.java index f76e88f76d..42e04d6a55 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test35/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test35/out/A.java @@ -6,4 +6,4 @@ class A { class B extends A{ protected void bar(Object o){} protected void foo(String s){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test36/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test36/in/A.java index 065d28b9f3..23b97769b4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test36/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test36/in/A.java @@ -4,4 +4,4 @@ class A extends F { } class F { void foo(F b){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test36/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test36/out/A.java index de317bae68..b8298573f0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test36/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test36/out/A.java @@ -4,4 +4,4 @@ class A extends F { } class F { void foo(F b){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test37/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test37/in/A.java index ccb07863f4..6f345eea60 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test37/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test37/in/A.java @@ -4,4 +4,4 @@ class A { } class F extends A { void foo(String s){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test37/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test37/out/A.java index 85b0a81405..b26ccb1abc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test37/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test37/out/A.java @@ -4,4 +4,4 @@ class A { } class F extends A { void foo(String s){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test39/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test39/in/A.java index 9b11821a82..f7662f924c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test39/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test39/in/A.java @@ -16,4 +16,4 @@ class X{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test39/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test39/out/A.java index 3e2b8557f0..dc5417e0f2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test39/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/test39/out/A.java @@ -16,4 +16,4 @@ class X{ } } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testAnon0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testAnon0/in/A.java index 09ece355a9..dd04917768 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testAnon0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testAnon0/in/A.java @@ -10,4 +10,4 @@ class B{ } }; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testAnon0/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testAnon0/out/A.java index 3ebde2a0e5..201bf1e606 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testAnon0/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testAnon0/out/A.java @@ -10,4 +10,4 @@ class B{ } }; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail0/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail0/in/A.java index e6c4867b21..042bb29577 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail0/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail0/in/A.java @@ -2,4 +2,4 @@ package p; //can't rename native methods class A{ native m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail10/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail10/in/A.java index f7b9bb496b..db20564cf3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail10/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail10/in/A.java @@ -5,4 +5,4 @@ class B{ } class A extends B{ void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail11/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail11/in/A.java index 5f055ac2b8..5e7b850e98 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail11/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail11/in/A.java @@ -5,4 +5,4 @@ class B{ } class A extends B{ void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail12/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail12/in/A.java index 9c02f0cea8..9b2151c43b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail12/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail12/in/A.java @@ -5,4 +5,4 @@ class B{ } abstract class A extends B{ abstract void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail13/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail13/in/A.java index 4333b65878..d31b19a653 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail13/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail13/in/A.java @@ -5,4 +5,4 @@ abstract class B{ } class A extends B{ void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail14/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail14/in/A.java index e835268798..feba65e864 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail14/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail14/in/A.java @@ -5,4 +5,4 @@ class B{ } class A extends B{ void m(int f){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail15/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail15/in/A.java index c1f7d7b433..8619325a6a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail15/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail15/in/A.java @@ -7,4 +7,4 @@ class B extends C{ } class A extends B{ void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail17/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail17/in/A.java index 9eb829a49e..f2b31f4fa0 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail17/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail17/in/A.java @@ -5,4 +5,4 @@ class A { } class B extends A{ native void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail18/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail18/in/A.java index a1da77971a..e10e0b2b0e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail18/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail18/in/A.java @@ -5,4 +5,4 @@ class A { } class B extends A{ private void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail19/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail19/in/A.java index 8b3a74e83e..eaab9762a1 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail19/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail19/in/A.java @@ -5,4 +5,4 @@ class A { } class B extends A{ public void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail2/in/A.java index 6ef68c1dde..82ec495a8f 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail2/in/A.java @@ -5,4 +5,4 @@ class B{ } class A extends B{ void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail20/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail20/in/A.java index 90c07d1c75..9dda7cea25 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail20/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail20/in/A.java @@ -7,4 +7,4 @@ class A { class B extends A{ public void k(){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail22/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail22/in/A.java index 5a154741e3..a85cf5cf2d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail22/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail22/in/A.java @@ -7,4 +7,4 @@ class A { class B extends A{ private static void k(){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail23/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail23/in/A.java index 3d07a6597f..5cb4de48f2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail23/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail23/in/A.java @@ -7,4 +7,4 @@ class B { class A extends B{ void m(){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail24/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail24/in/A.java index a53fdd9ca9..4f38a648e3 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail24/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail24/in/A.java @@ -7,4 +7,4 @@ class B { class A extends B{ void m(){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail25/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail25/in/A.java index 3d07a6597f..5cb4de48f2 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail25/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail25/in/A.java @@ -7,4 +7,4 @@ class B { class A extends B{ void m(){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail26/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail26/in/A.java index 6b4353ac90..94956b0a22 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail26/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail26/in/A.java @@ -4,4 +4,4 @@ class A { void k(){} void m(){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail27/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail27/in/A.java index aba458a04e..f9c4d6e689 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail27/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail27/in/A.java @@ -4,4 +4,4 @@ class A { private void k(){} void m(){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail28/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail28/in/A.java index bf6ed6af03..9cad424a19 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail28/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail28/in/A.java @@ -4,4 +4,4 @@ class A { static void k(){} void m(){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail29/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail29/in/A.java index 3af831e301..29b59ff0a8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail29/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail29/in/A.java @@ -7,4 +7,4 @@ class B{ class A extends B{ void m(){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail3/in/A.java index 102bf1217b..bdfd389d7d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail3/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail3/in/A.java @@ -7,4 +7,4 @@ class C extends B{ } class A extends C{ int m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail31/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail31/in/A.java index d756bcaf52..aad7a9cd4c 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail31/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail31/in/A.java @@ -9,4 +9,4 @@ class B extends A{ void k(Object m){ System.out.println("B"); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail32/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail32/in/A.java index 8fcdbd8627..c88d65e31a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail32/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail32/in/A.java @@ -9,4 +9,4 @@ class B extends A{ void k(String m){ System.out.println("B"); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail33/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail33/in/A.java index c917be1601..8ca3a966f8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail33/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail33/in/A.java @@ -4,4 +4,4 @@ class A{ public java.lang.String toString(){ return "fred"; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail34/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail34/in/A.java index 1c72cc22c9..d0627c80b8 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail34/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail34/in/A.java @@ -7,4 +7,4 @@ class A{ class B extends A{ void k(java.lang.String s){ } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail36/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail36/in/A.java index 98e2eed663..39c811c371 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail36/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail36/in/A.java @@ -5,4 +5,4 @@ class B{ } class A extends B{ public void m(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail37/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail37/in/A.java index d4c4e402ab..e988aa1389 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail37/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail37/in/A.java @@ -5,4 +5,4 @@ class A{ } class B extends A{ static public void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail4/in/A.java index 3fc227b62e..01cf3bcf17 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail4/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail4/in/A.java @@ -9,4 +9,4 @@ class B extends A implements I{ interface I { void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail40/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail40/in/A.java index fe57a304a7..4dd837df96 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail40/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail40/in/A.java @@ -8,4 +8,4 @@ class A { m(12); k(13); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail41/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail41/in/A.java index dfda34776c..196480527b 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail41/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail41/in/A.java @@ -15,4 +15,4 @@ class C { k(); } } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail5/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail5/in/A.java index ff8d75e0bc..7977329fb7 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail5/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail5/in/A.java @@ -13,4 +13,4 @@ interface I { } interface I2 extends I{ -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail6/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail6/in/A.java index 7d0529c832..dea12855c4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail6/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail6/in/A.java @@ -6,4 +6,4 @@ class A implements I{ interface I { void m(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail7/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail7/in/A.java index 64b78f3a3c..45a463b4ce 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail7/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail7/in/A.java @@ -3,4 +3,4 @@ package p; class A{ void m(){} void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail8/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail8/in/A.java index b3f4cac678..9734b71801 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail8/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail8/in/A.java @@ -5,4 +5,4 @@ class A{ } class B extends A{ void k(){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail9/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail9/in/A.java index fe8816e77b..89f5d7d73a 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail9/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testFail9/in/A.java @@ -8,4 +8,4 @@ class B extends A{ } class C extends B{ int k(int i){} -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics2/in/A.java index 547d71cfd0..e496f4eabe 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics2/in/A.java @@ -18,4 +18,4 @@ class Unrelated { public boolean add(E e) { return false; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics2/out/A.java index 4acaf304c6..4437dee159 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics2/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics2/out/A.java @@ -18,4 +18,4 @@ class Unrelated { public boolean add(E e) { return false; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics3/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics3/in/A.java index e1e889628d..8d663b591e 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics3/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics3/in/A.java @@ -35,4 +35,4 @@ interface Unrelated2 { interface Unrelated3 { boolean add(T t); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics3/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics3/out/A.java index 30e1a15d78..c05fbbb28d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics3/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics3/out/A.java @@ -35,4 +35,4 @@ interface Unrelated2 { interface Unrelated3 { boolean add(T t); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics4/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics4/in/A.java index d1a5e41c50..15f669b82d 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics4/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics4/in/A.java @@ -36,4 +36,4 @@ interface Unrelated2 { interface Unrelated3 { boolean takeANumber(Number n); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics4/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics4/out/A.java index 80f2c14e87..f3538db6fc 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics4/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testGenerics4/out/A.java @@ -36,4 +36,4 @@ interface Unrelated2 { interface Unrelated3 { boolean takeANumber(Number n); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testVarargs2/in/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testVarargs2/in/A.java index 649a7707bf..1a725b2ae4 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testVarargs2/in/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testVarargs2/in/A.java @@ -8,4 +8,4 @@ public class A { */ public void m(String... args) { } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testVarargs2/out/A.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testVarargs2/out/A.java index b0997180f4..7f0604df88 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testVarargs2/out/A.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/RenameVirtualMethodInClass/testVarargs2/out/A.java @@ -8,4 +8,4 @@ public class A { */ public void k(String... args) { } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/subModule/src/main/java/com/codenvy/sub/ClassInSubModule.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/subModule/src/main/java/com/codenvy/sub/ClassInSubModule.java index 475faa6d5e..6ed4f8bbbd 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/subModule/src/main/java/com/codenvy/sub/ClassInSubModule.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/subModule/src/main/java/com/codenvy/sub/ClassInSubModule.java @@ -60,4 +60,4 @@ public class ClassInSubModule { public String greetServer(String input) throws IllegalArgumentException { return ""; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/test/src/main/java/com/codenvy/test/MyClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/test/src/main/java/com/codenvy/test/MyClass.java index a5126b9a5f..84b917d5e9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/test/src/main/java/com/codenvy/test/MyClass.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/multimoduleProject/test/src/main/java/com/codenvy/test/MyClass.java @@ -60,4 +60,4 @@ public class MyClass { public String greetServer(String input) throws IllegalArgumentException { return ""; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/GenerateLink.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/GenerateLink.java index 10b63b1d54..832c11d221 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/GenerateLink.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/GenerateLink.java @@ -20,4 +20,4 @@ import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) public @interface GenerateLink { String rel(); -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/MyClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/MyClass.java index a5126b9a5f..84b917d5e9 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/MyClass.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/MyClass.java @@ -60,4 +60,4 @@ public class MyClass { public String greetServer(String input) throws IllegalArgumentException { return ""; } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/TestClass.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/TestClass.java index 166f35eee6..6eb806ae22 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/TestClass.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/org/eclipse/che/test/TestClass.java @@ -2,4 +2,4 @@ package org.eclipse.che.test; public class TestClass{ MyClass myClass; -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/p1/X.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/p1/X.java index 973ca8fc87..6579068daf 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/p1/X.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/p1/X.java @@ -3,4 +3,4 @@ import p2.*; public class X { public void foo() { } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/zzz/Z.java b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/zzz/Z.java index 987f63135f..e20ec70082 100644 --- a/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/zzz/Z.java +++ b/plugins/plugin-java/che-plugin-java-ext-lang-server/src/test/resources/projects/test/src/main/java/zzz/Z.java @@ -5,4 +5,4 @@ public class Z{ public Z(char[] value){ char[] aa = Arrays.copyOf(value, value.length); } -} \ No newline at end of file +} diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/src/main/test/org/eclipse/che/plugin/java/plain/client/wizard/PlainJavaPagePresenterTest.java b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/src/main/test/org/eclipse/che/plugin/java/plain/client/wizard/PlainJavaPagePresenterTest.java index 654fa9be07..718c965437 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/src/main/test/org/eclipse/che/plugin/java/plain/client/wizard/PlainJavaPagePresenterTest.java +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-ide/src/main/test/org/eclipse/che/plugin/java/plain/client/wizard/PlainJavaPagePresenterTest.java @@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; 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; diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/test/java/org/eclipse/che/plugin/java/plain/server/projecttype/ClasspathBuilderTest.java b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/test/java/org/eclipse/che/plugin/java/plain/server/projecttype/ClasspathBuilderTest.java index e5e71f794d..40bee47d56 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/test/java/org/eclipse/che/plugin/java/plain/server/projecttype/ClasspathBuilderTest.java +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/test/java/org/eclipse/che/plugin/java/plain/server/projecttype/ClasspathBuilderTest.java @@ -12,8 +12,8 @@ package org.eclipse.che.plugin.java.plain.server.projecttype; import static java.util.Arrays.asList; import static org.fest.assertions.Assertions.assertThat; -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.times; import static org.mockito.Mockito.verify; diff --git a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/test/java/org/eclipse/che/plugin/java/plain/server/projecttype/PlainJavaValueProviderFactoryTest.java b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/test/java/org/eclipse/che/plugin/java/plain/server/projecttype/PlainJavaValueProviderFactoryTest.java index 2bdc78db09..8c5c64abc7 100644 --- a/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/test/java/org/eclipse/che/plugin/java/plain/server/projecttype/PlainJavaValueProviderFactoryTest.java +++ b/plugins/plugin-java/che-plugin-java-plain/che-plugin-java-plain-server/src/test/java/org/eclipse/che/plugin/java/plain/server/projecttype/PlainJavaValueProviderFactoryTest.java @@ -13,7 +13,7 @@ package org.eclipse.che.plugin.java.plain.server.projecttype; import static org.eclipse.che.ide.ext.java.shared.Constants.OUTPUT_FOLDER; import static org.eclipse.che.ide.ext.java.shared.Constants.SOURCE_FOLDER; import static org.fest.assertions.Assertions.assertThat; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/plugins/plugin-languageserver/che-plugin-languageserver-ide/src/test/java/org/eclipse/che/plugin/languageserver/ide/editor/codeassist/CompletionItemBasedCompletionProposalTest.java b/plugins/plugin-languageserver/che-plugin-languageserver-ide/src/test/java/org/eclipse/che/plugin/languageserver/ide/editor/codeassist/CompletionItemBasedCompletionProposalTest.java index 8ba75443e2..f0255f3800 100644 --- a/plugins/plugin-languageserver/che-plugin-languageserver-ide/src/test/java/org/eclipse/che/plugin/languageserver/ide/editor/codeassist/CompletionItemBasedCompletionProposalTest.java +++ b/plugins/plugin-languageserver/che-plugin-languageserver-ide/src/test/java/org/eclipse/che/plugin/languageserver/ide/editor/codeassist/CompletionItemBasedCompletionProposalTest.java @@ -12,10 +12,10 @@ package org.eclipse.che.plugin.languageserver.ide.editor.codeassist; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -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 static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/plugins/plugin-machine/che-plugin-machine-ext-server/src/test/java/org/eclipse/che/ide/ext/machine/server/ssh/WorkspaceSshKeysTest.java b/plugins/plugin-machine/che-plugin-machine-ext-server/src/test/java/org/eclipse/che/ide/ext/machine/server/ssh/WorkspaceSshKeysTest.java index b087da32ed..9ccf53713e 100644 --- a/plugins/plugin-machine/che-plugin-machine-ext-server/src/test/java/org/eclipse/che/ide/ext/machine/server/ssh/WorkspaceSshKeysTest.java +++ b/plugins/plugin-machine/che-plugin-machine-ext-server/src/test/java/org/eclipse/che/ide/ext/machine/server/ssh/WorkspaceSshKeysTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.ide.ext.machine.server.ssh; -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; diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/command/MavenPagePresenterTest.java b/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/command/MavenPagePresenterTest.java index 298149fa5b..dc8a4fbfb1 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/command/MavenPagePresenterTest.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/command/MavenPagePresenterTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.plugin.maven.client.command; -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; @@ -24,7 +24,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) diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/comunnication/MavenMessagesHandlerTest.java b/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/comunnication/MavenMessagesHandlerTest.java index e042eac9de..3cb363b20b 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/comunnication/MavenMessagesHandlerTest.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/comunnication/MavenMessagesHandlerTest.java @@ -10,8 +10,8 @@ */ package org.eclipse.che.plugin.maven.client.comunnication; -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; @@ -35,7 +35,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class MavenMessagesHandlerTest { diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/comunnication/progressor/ResolveDependencyPresenterTest.java b/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/comunnication/progressor/ResolveDependencyPresenterTest.java index 0427a92dc8..52c7573baf 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/comunnication/progressor/ResolveDependencyPresenterTest.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/comunnication/progressor/ResolveDependencyPresenterTest.java @@ -16,7 +16,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 Valeriy Svydenko */ @RunWith(MockitoJUnitRunner.class) diff --git a/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/wizard/MavenPagePresenterTest.java b/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/wizard/MavenPagePresenterTest.java index 50ba155800..2519aa9ea0 100644 --- a/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/wizard/MavenPagePresenterTest.java +++ b/plugins/plugin-maven/che-plugin-maven-ide/src/test/java/org/eclipse/che/plugin/maven/client/wizard/MavenPagePresenterTest.java @@ -12,8 +12,8 @@ package org.eclipse.che.plugin.maven.client.wizard; import static org.eclipse.che.ide.api.project.type.wizard.ProjectWizardMode.UPDATE; import static org.eclipse.che.ide.api.project.type.wizard.ProjectWizardRegistrar.WIZARD_MODE_KEY; -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.verify; import static org.mockito.Mockito.when; @@ -39,9 +39,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; /** @author Valeriy Svydenko */ @RunWith(MockitoJUnitRunner.class) @@ -81,7 +80,8 @@ public class MavenPagePresenterTest { when(workspaceRoot.getContainer(TEXT)).thenReturn(containerPromise); when(workspaceRoot.estimate(MavenAttributes.MAVEN_ID)).thenReturn(sourceEstimationPromise); - when(containerPromise.then(Matchers.>>anyObject())) + when(containerPromise.then( + org.mockito.ArgumentMatchers.>>anyObject())) .thenReturn(containerPromise); } @@ -101,9 +101,11 @@ public class MavenPagePresenterTest { when(localization.mavenPageErrorDialogTitle()).thenReturn(dialogTitle); when(dialogFactory.createMessageDialog(anyString(), anyString(), anyObject())) .thenReturn(messageDialog); - when(sourceEstimationPromise.then(Matchers.>anyObject())) + when(sourceEstimationPromise.then( + org.mockito.ArgumentMatchers.>anyObject())) .thenReturn(sourceEstimationPromise); - when(sourceEstimationPromise.catchError(Matchers.>anyObject())) + when(sourceEstimationPromise.catchError( + org.mockito.ArgumentMatchers.>anyObject())) .thenReturn(sourceEstimationPromise); mavenPagePresenter.init(projectConfig); diff --git a/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProviderTest.java b/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProviderTest.java index e3f2ceb36f..8ac4c85b47 100644 --- a/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProviderTest.java +++ b/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/projecttype/MavenValueProviderTest.java @@ -11,7 +11,7 @@ package org.eclipse.che.plugin.maven.server.projecttype; import static java.util.Collections.singletonList; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/rmi/MavenProjectManagerTest.java b/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/rmi/MavenProjectManagerTest.java index 4424171ca2..13213b3a56 100644 --- a/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/rmi/MavenProjectManagerTest.java +++ b/plugins/plugin-maven/che-plugin-maven-server/src/test/java/org/eclipse/che/plugin/maven/server/rmi/MavenProjectManagerTest.java @@ -11,7 +11,7 @@ package org.eclipse.che.plugin.maven.server.rmi; 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; diff --git a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/test/java/org/eclipse/che/plugin/nodejsdbg/ide/configuration/NodeJsDebuggerConfigurationPagePresenterTest.java b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/test/java/org/eclipse/che/plugin/nodejsdbg/ide/configuration/NodeJsDebuggerConfigurationPagePresenterTest.java index 513ae3a619..0b1d8c80c5 100644 --- a/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/test/java/org/eclipse/che/plugin/nodejsdbg/ide/configuration/NodeJsDebuggerConfigurationPagePresenterTest.java +++ b/plugins/plugin-nodejs-debugger/che-plugin-nodejs-debugger-ide/src/test/java/org/eclipse/che/plugin/nodejsdbg/ide/configuration/NodeJsDebuggerConfigurationPagePresenterTest.java @@ -12,8 +12,8 @@ package org.eclipse.che.plugin.nodejsdbg.ide.configuration; import static org.eclipse.che.plugin.nodejsdbg.ide.NodeJsDebugger.ConnectionProperties.SCRIPT; import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -32,7 +32,7 @@ import org.mockito.ArgumentCaptor; 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) diff --git a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/test/java/org/eclipse/che/ide/ext/plugins/client/command/GwtChePagePresenterTest.java b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/test/java/org/eclipse/che/ide/ext/plugins/client/command/GwtChePagePresenterTest.java index 56d8d77a5b..1a5a44ec2c 100644 --- a/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/test/java/org/eclipse/che/ide/ext/plugins/client/command/GwtChePagePresenterTest.java +++ b/plugins/plugin-sdk/che-plugin-sdk-ext-plugins/src/test/java/org/eclipse/che/ide/ext/plugins/client/command/GwtChePagePresenterTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.ide.ext.plugins.client.command; -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; @@ -24,7 +24,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) diff --git a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/src/test/java/org/ecipse/che/plugin/testing/testng/server/TestNGRunnerTest.java b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/src/test/java/org/ecipse/che/plugin/testing/testng/server/TestNGRunnerTest.java index e114dbd2de..ca2f60fb3a 100644 --- a/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/src/test/java/org/ecipse/che/plugin/testing/testng/server/TestNGRunnerTest.java +++ b/plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-server/src/test/java/org/ecipse/che/plugin/testing/testng/server/TestNGRunnerTest.java @@ -10,7 +10,7 @@ */ package org.ecipse.che.plugin.testing.testng.server; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/plugins/plugin-testing/che-plugin-testing-ide/src/test/java/org/eclipse/che/plugin/testing/ide/ExecutorPromiseMocker.java b/plugins/plugin-testing/che-plugin-testing-ide/src/test/java/org/eclipse/che/plugin/testing/ide/ExecutorPromiseMocker.java index 5c4081db38..5106718a74 100644 --- a/plugins/plugin-testing/che-plugin-testing-ide/src/test/java/org/eclipse/che/plugin/testing/ide/ExecutorPromiseMocker.java +++ b/plugins/plugin-testing/che-plugin-testing-ide/src/test/java/org/eclipse/che/plugin/testing/ide/ExecutorPromiseMocker.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.plugin.testing.ide; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; @@ -19,7 +19,6 @@ import org.eclipse.che.api.promises.client.PromiseError; import org.eclipse.che.api.promises.client.js.Executor; import org.eclipse.che.api.promises.client.js.RejectFunction; import org.eclipse.che.api.promises.client.js.ResolveFunction; -import org.mockito.Matchers; /** * Utility class that allows mocking a Che Promise from an Executor.ExecutorBody. @@ -46,7 +45,7 @@ public class ExecutorPromiseMocker extends PromiseMocker { return null; })) .when(resolveFunction) - .apply(Matchers.any()); + .apply(org.mockito.ArgumentMatchers.any()); doAnswer( new FunctionAnswer( diff --git a/plugins/plugin-testing/che-plugin-testing-ide/src/test/java/org/eclipse/che/plugin/testing/ide/PromiseMocker.java b/plugins/plugin-testing/che-plugin-testing-ide/src/test/java/org/eclipse/che/plugin/testing/ide/PromiseMocker.java index 37f39fae4b..fae6fee4b9 100644 --- a/plugins/plugin-testing/che-plugin-testing-ide/src/test/java/org/eclipse/che/plugin/testing/ide/PromiseMocker.java +++ b/plugins/plugin-testing/che-plugin-testing-ide/src/test/java/org/eclipse/che/plugin/testing/ide/PromiseMocker.java @@ -18,7 +18,6 @@ import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; -import org.mockito.Matchers; /** * Mockito mock provider for Che Promise objects. @@ -42,7 +41,7 @@ public class PromiseMocker { } public PromiseMocker applyOnThenPromise(T value) { - when(promise.thenPromise(Matchers.>>any())) + when(promise.thenPromise(org.mockito.ArgumentMatchers.>>any())) .then( new FunctionAnswer>, Promise>( function -> { @@ -57,7 +56,7 @@ public class PromiseMocker { } public PromiseMocker applyOnThenOperation(T value) { - when(promise.then(Matchers.>any())) + when(promise.then(org.mockito.ArgumentMatchers.>any())) .then( new FunctionAnswer, Promise>( op -> { @@ -72,7 +71,7 @@ public class PromiseMocker { } public PromiseMocker applyOnCatchErrorOperation(PromiseError error) { - when(promise.catchError(Matchers.>any())) + when(promise.catchError(org.mockito.ArgumentMatchers.>any())) .then( new FunctionAnswer, Promise>( op -> { diff --git a/plugins/plugin-traefik/plugin-traefik-docker/src/test/java/org/eclipse/che/plugin/traefik/TraefikCreateContainerInterceptorTest.java b/plugins/plugin-traefik/plugin-traefik-docker/src/test/java/org/eclipse/che/plugin/traefik/TraefikCreateContainerInterceptorTest.java index 2f6b6a6f2f..103f39fb42 100644 --- a/plugins/plugin-traefik/plugin-traefik-docker/src/test/java/org/eclipse/che/plugin/traefik/TraefikCreateContainerInterceptorTest.java +++ b/plugins/plugin-traefik/plugin-traefik-docker/src/test/java/org/eclipse/che/plugin/traefik/TraefikCreateContainerInterceptorTest.java @@ -33,7 +33,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/plugins/plugin-urlfactory/src/test/java/org/eclipse/che/plugin/urlfactory/URLFactoryBuilderTest.java b/plugins/plugin-urlfactory/src/test/java/org/eclipse/che/plugin/urlfactory/URLFactoryBuilderTest.java index d6f9f636f9..f038723c41 100644 --- a/plugins/plugin-urlfactory/src/test/java/org/eclipse/che/plugin/urlfactory/URLFactoryBuilderTest.java +++ b/plugins/plugin-urlfactory/src/test/java/org/eclipse/che/plugin/urlfactory/URLFactoryBuilderTest.java @@ -17,7 +17,7 @@ import static org.eclipse.che.dto.server.DtoFactory.newDto; import static org.eclipse.che.plugin.urlfactory.URLFactoryBuilder.DEFAULT_DOCKER_IMAGE; import static org.eclipse.che.plugin.urlfactory.URLFactoryBuilder.MACHINE_NAME; import static org.eclipse.che.plugin.urlfactory.URLFactoryBuilder.MEMORY_LIMIT_BYTES; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/test/java/org/eclipse/che/plugin/zdb/ide/configuration/ZendDbgConfigurationPagePresenterTest.java b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/test/java/org/eclipse/che/plugin/zdb/ide/configuration/ZendDbgConfigurationPagePresenterTest.java index 10d85eb5de..e0e8c8a1ed 100644 --- a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/test/java/org/eclipse/che/plugin/zdb/ide/configuration/ZendDbgConfigurationPagePresenterTest.java +++ b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-ide/src/test/java/org/eclipse/che/plugin/zdb/ide/configuration/ZendDbgConfigurationPagePresenterTest.java @@ -17,7 +17,7 @@ import static org.eclipse.che.plugin.zdb.ide.configuration.ZendDbgConfigurationT import static org.eclipse.che.plugin.zdb.ide.configuration.ZendDbgConfigurationType.DEFAULT_CLIENT_HOST_IP; import static org.eclipse.che.plugin.zdb.ide.configuration.ZendDbgConfigurationType.DEFAULT_DEBUG_PORT; import static org.eclipse.che.plugin.zdb.ide.configuration.ZendDbgConfigurationType.DEFAULT_USE_SSL_ENCRYPTION; -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; @@ -35,7 +35,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; /** * Zend dbg configuration page presenter tests. diff --git a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/src/test/java/org/eclipse/che/plugin/zdb/server/AbstractZendDbgSessionTest.java b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/src/test/java/org/eclipse/che/plugin/zdb/server/AbstractZendDbgSessionTest.java index 78061b1394..cfe8d68e37 100644 --- a/plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/src/test/java/org/eclipse/che/plugin/zdb/server/AbstractZendDbgSessionTest.java +++ b/plugins/plugin-zend-debugger/che-plugin-zend-debugger-server/src/test/java/org/eclipse/che/plugin/zdb/server/AbstractZendDbgSessionTest.java @@ -10,7 +10,7 @@ package org.eclipse.che.plugin.zdb.server; import static org.mockito.AdditionalAnswers.returnsFirstArg; -import static org.mockito.Matchers.anyObject; +import static org.mockito.ArgumentMatchers.anyObject; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/selenium/che-selenium-test/src/test/resources/org/eclipse/che/selenium/refactor/methods/private/testFail5/out/B.java b/selenium/che-selenium-test/src/test/resources/org/eclipse/che/selenium/refactor/methods/private/testFail5/out/B.java index 32556657fd..ef1224b10f 100644 --- a/selenium/che-selenium-test/src/test/resources/org/eclipse/che/selenium/refactor/methods/private/testFail5/out/B.java +++ b/selenium/che-selenium-test/src/test/resources/org/eclipse/che/selenium/refactor/methods/private/testFail5/out/B.java @@ -21,4 +21,4 @@ public class A{ } } - \ No newline at end of file + diff --git a/selenium/che-selenium-test/src/test/resources/projects/debugStepInto/src/main/java/org/eclipse/qa/examples/AppController.java b/selenium/che-selenium-test/src/test/resources/projects/debugStepInto/src/main/java/org/eclipse/qa/examples/AppController.java index 477732cd47..f8bcb8d180 100644 --- a/selenium/che-selenium-test/src/test/resources/projects/debugStepInto/src/main/java/org/eclipse/qa/examples/AppController.java +++ b/selenium/che-selenium-test/src/test/resources/projects/debugStepInto/src/main/java/org/eclipse/qa/examples/AppController.java @@ -39,4 +39,4 @@ public class AppController implements Controller { view.addObject("num", result); return view; } -} \ No newline at end of file +} diff --git a/wsagent/che-core-api-git/src/test/java/org/eclipse/che/api/git/LocalGitUserResolverTest.java b/wsagent/che-core-api-git/src/test/java/org/eclipse/che/api/git/LocalGitUserResolverTest.java index 5156523f02..d46701ac7a 100644 --- a/wsagent/che-core-api-git/src/test/java/org/eclipse/che/api/git/LocalGitUserResolverTest.java +++ b/wsagent/che-core-api-git/src/test/java/org/eclipse/che/api/git/LocalGitUserResolverTest.java @@ -11,8 +11,8 @@ package org.eclipse.che.api.git; import static javax.ws.rs.core.UriBuilder.fromUri; -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; diff --git a/wsagent/che-core-api-git/src/test/java/org/eclipse/che/git/impl/CloneTest.java b/wsagent/che-core-api-git/src/test/java/org/eclipse/che/git/impl/CloneTest.java index 0c09a84b21..de60c45871 100644 --- a/wsagent/che-core-api-git/src/test/java/org/eclipse/che/git/impl/CloneTest.java +++ b/wsagent/che-core-api-git/src/test/java/org/eclipse/che/git/impl/CloneTest.java @@ -12,7 +12,7 @@ package org.eclipse.che.git.impl; import static org.eclipse.che.git.impl.GitTestUtil.cleanupTestRepo; import static org.eclipse.che.git.impl.GitTestUtil.connectToGitRepositoryWithContent; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/wsagent/che-core-api-languageserver/src/test/java/org/eclipse/che/api/languageserver/registry/LanguageServerRegistryImplTest.java b/wsagent/che-core-api-languageserver/src/test/java/org/eclipse/che/api/languageserver/registry/LanguageServerRegistryImplTest.java index 28a15e42a4..71a8efbdb5 100644 --- a/wsagent/che-core-api-languageserver/src/test/java/org/eclipse/che/api/languageserver/registry/LanguageServerRegistryImplTest.java +++ b/wsagent/che-core-api-languageserver/src/test/java/org/eclipse/che/api/languageserver/registry/LanguageServerRegistryImplTest.java @@ -10,9 +10,9 @@ */ package org.eclipse.che.api.languageserver.registry; -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.spy; import static org.mockito.Mockito.verify; diff --git a/wsagent/che-core-api-languageserver/src/test/java/org/eclipse/che/api/languageserver/registry/ServerInitializerImplTest.java b/wsagent/che-core-api-languageserver/src/test/java/org/eclipse/che/api/languageserver/registry/ServerInitializerImplTest.java index 2611a2f5ac..f55a60ce28 100644 --- a/wsagent/che-core-api-languageserver/src/test/java/org/eclipse/che/api/languageserver/registry/ServerInitializerImplTest.java +++ b/wsagent/che-core-api-languageserver/src/test/java/org/eclipse/che/api/languageserver/registry/ServerInitializerImplTest.java @@ -10,9 +10,9 @@ */ package org.eclipse.che.api.languageserver.registry; -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.doNothing; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.timeout; diff --git a/wsagent/che-core-api-oauth/src/test/java/org/eclipse/che/security/oauth/RemoteOAuthTokenProviderTest.java b/wsagent/che-core-api-oauth/src/test/java/org/eclipse/che/security/oauth/RemoteOAuthTokenProviderTest.java index 2504dd48f7..fd4aebf0a3 100644 --- a/wsagent/che-core-api-oauth/src/test/java/org/eclipse/che/security/oauth/RemoteOAuthTokenProviderTest.java +++ b/wsagent/che-core-api-oauth/src/test/java/org/eclipse/che/security/oauth/RemoteOAuthTokenProviderTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.security.oauth; -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; diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/project/server/ProjectServiceTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/project/server/ProjectServiceTest.java index 40966ffe28..45ccdd021c 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/project/server/ProjectServiceTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/project/server/ProjectServiceTest.java @@ -23,7 +23,7 @@ import static org.eclipse.che.commons.lang.ws.rs.ExtMediaType.APPLICATION_ZIP; import static org.everrest.core.ApplicationContext.anApplicationContext; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/project/server/handlers/CreateBaseProjectTypeHandlerTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/project/server/handlers/CreateBaseProjectTypeHandlerTest.java index 6933123fbe..51b3b3b22a 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/project/server/handlers/CreateBaseProjectTypeHandlerTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/project/server/handlers/CreateBaseProjectTypeHandlerTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.api.project.server.handlers; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/project/server/importer/ProjectImportOutputJsonRpcLineConsumerTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/project/server/importer/ProjectImportOutputJsonRpcLineConsumerTest.java index ea92276084..ddaf72a0db 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/project/server/importer/ProjectImportOutputJsonRpcLineConsumerTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/project/server/importer/ProjectImportOutputJsonRpcLineConsumerTest.java @@ -10,8 +10,8 @@ */ package org.eclipse.che.api.project.server.importer; -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.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -26,7 +26,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 test for the {@link ProjectImportOutputJsonRpcLineConsumer}. diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/HashSumsCounterTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/HashSumsCounterTest.java index f1cc3d3aa8..82303d8c12 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/HashSumsCounterTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/HashSumsCounterTest.java @@ -13,7 +13,7 @@ package org.eclipse.che.api.vfs; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Sets.newHashSet; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/LockedFileFinderTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/LockedFileFinderTest.java index 304f203fb8..788e175659 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/LockedFileFinderTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/LockedFileFinderTest.java @@ -13,7 +13,7 @@ package org.eclipse.che.api.vfs; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Sets.newHashSet; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/TarArchiverTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/TarArchiverTest.java index c6bdcb8836..a8bfe5c9d1 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/TarArchiverTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/TarArchiverTest.java @@ -15,7 +15,7 @@ import static com.google.common.collect.Maps.newHashMap; import static java.util.stream.Collectors.toMap; 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; diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/ZipArchiverTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/ZipArchiverTest.java index bab7fa6cd3..647a29aca2 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/ZipArchiverTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/ZipArchiverTest.java @@ -15,7 +15,7 @@ import static com.google.common.collect.Maps.newHashMap; import static java.util.stream.Collectors.toMap; 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; diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/file/DefaultFileWatcherNotificationHandlerTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/file/DefaultFileWatcherNotificationHandlerTest.java index a63c8aae9b..7a928907a7 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/file/DefaultFileWatcherNotificationHandlerTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/file/DefaultFileWatcherNotificationHandlerTest.java @@ -13,7 +13,7 @@ package org.eclipse.che.api.vfs.impl.file; import static org.eclipse.che.api.project.shared.dto.event.FileWatcherEventType.CREATED; import static org.eclipse.che.api.project.shared.dto.event.FileWatcherEventType.DELETED; import static org.eclipse.che.api.project.shared.dto.event.FileWatcherEventType.MODIFIED; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/file/LocalVirtualFileSystemTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/file/LocalVirtualFileSystemTest.java index 8b88d0b89e..f10da3ca38 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/file/LocalVirtualFileSystemTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/file/LocalVirtualFileSystemTest.java @@ -10,8 +10,8 @@ */ package org.eclipse.che.api.vfs.impl.file; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/file/LocalVirtualFileTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/file/LocalVirtualFileTest.java index ee52354bac..ac90a3b70e 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/file/LocalVirtualFileTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/file/LocalVirtualFileTest.java @@ -18,8 +18,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -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.verify; diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/memory/MemoryVirtualFileSystemTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/memory/MemoryVirtualFileSystemTest.java index fa5c50df66..22fab45af9 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/memory/MemoryVirtualFileSystemTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/memory/MemoryVirtualFileSystemTest.java @@ -10,8 +10,8 @@ */ package org.eclipse.che.api.vfs.impl.memory; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/memory/MemoryVirtualFileTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/memory/MemoryVirtualFileTest.java index 8ce844c42c..9f872ca1c6 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/memory/MemoryVirtualFileTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/impl/memory/MemoryVirtualFileTest.java @@ -19,8 +19,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -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.verify; diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/search/impl/FSLuceneSearcherTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/search/impl/FSLuceneSearcherTest.java index 8b367d4562..d28858c97e 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/search/impl/FSLuceneSearcherTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/search/impl/FSLuceneSearcherTest.java @@ -11,8 +11,8 @@ package org.eclipse.che.api.vfs.search.impl; import static com.google.common.collect.Lists.newArrayList; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.argThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/search/impl/MemoryLuceneSearcherTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/search/impl/MemoryLuceneSearcherTest.java index 41fa00b33f..c8ca7bc200 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/search/impl/MemoryLuceneSearcherTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/search/impl/MemoryLuceneSearcherTest.java @@ -14,8 +14,8 @@ import static com.google.common.collect.Lists.newArrayList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.argThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileTreeWalkerTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileTreeWalkerTest.java index f0778f1d5d..7d79a049d7 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileTreeWalkerTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileTreeWalkerTest.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** Tests for {@link FileTreeWalker} */ @SuppressWarnings({"WeakerAccess", "ResultOfMethodCallIgnored"}) diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherByPathValueTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherByPathValueTest.java index f3faaecb19..7ee37b753b 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherByPathValueTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherByPathValueTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.api.vfs.watcher; -import static org.mockito.Matchers.anyInt; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,7 +24,7 @@ import org.junit.rules.TemporaryFolder; 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 FileWatcherByPathValue} */ @RunWith(MockitoJUnitRunner.class) diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherEventHandlerTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherEventHandlerTest.java index 391aa26181..051dfca498 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherEventHandlerTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherEventHandlerTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** Tests for {@link FileWatcherEventHandler} */ @RunWith(MockitoJUnitRunner.class) diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherManagerTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherManagerTest.java index af3ba81109..4bbf300daf 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherManagerTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherManagerTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** Tests for {@link FileWatcherManager} */ @RunWith(MockitoJUnitRunner.class) diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherOperationTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherOperationTest.java index b7567789e8..081047891b 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherOperationTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherOperationTest.java @@ -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; /** Tests for {@link FileWatcherOperation} */ @RunWith(MockitoJUnitRunner.class) diff --git a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherServiceTest.java b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherServiceTest.java index 39eef178c2..f796c337d4 100644 --- a/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherServiceTest.java +++ b/wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/vfs/watcher/FileWatcherServiceTest.java @@ -34,7 +34,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; /** Tests for {@link FileWatcherService} */ @RunWith(MockitoJUnitRunner.class) diff --git a/wsagent/che-core-git-impl-jgit/src/test/java/org/eclipse/che/git/impl/jgit/JGitConnectionTest.java b/wsagent/che-core-git-impl-jgit/src/test/java/org/eclipse/che/git/impl/jgit/JGitConnectionTest.java index 0cd2eaa32e..ce36afaae9 100644 --- a/wsagent/che-core-git-impl-jgit/src/test/java/org/eclipse/che/git/impl/jgit/JGitConnectionTest.java +++ b/wsagent/che-core-git-impl-jgit/src/test/java/org/eclipse/che/git/impl/jgit/JGitConnectionTest.java @@ -12,10 +12,10 @@ package org.eclipse.che.git.impl.jgit; import static java.util.Collections.singletonList; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; diff --git a/wsagent/che-core-ssh-key-ide/src/test/java/org/eclipse/che/plugin/ssh/key/client/manage/SshKeyManagerPresenterTest.java b/wsagent/che-core-ssh-key-ide/src/test/java/org/eclipse/che/plugin/ssh/key/client/manage/SshKeyManagerPresenterTest.java index 6c973de606..20d94f7ec2 100644 --- a/wsagent/che-core-ssh-key-ide/src/test/java/org/eclipse/che/plugin/ssh/key/client/manage/SshKeyManagerPresenterTest.java +++ b/wsagent/che-core-ssh-key-ide/src/test/java/org/eclipse/che/plugin/ssh/key/client/manage/SshKeyManagerPresenterTest.java @@ -13,11 +13,11 @@ package org.eclipse.che.plugin.ssh.key.client.manage; import static org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode.FLOAT_MODE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import static org.mockito.ArgumentMatchers.any; +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.any; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.RETURNS_DEFAULTS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -58,10 +58,8 @@ 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.InjectMocks; -import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -143,7 +141,7 @@ public class SshKeyManagerPresenterTest { presenter.go(container); - verify(service).getPairs(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); + verify(service).getPairs(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); verify(container).setWidget(eq(view)); } @@ -187,8 +185,7 @@ public class SshKeyManagerPresenterTest { confirmCallback.accepted(); verify(confirmDialog).show(); - verify(service) - .deletePair(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), eq(GITHUB_HOST)); + verify(service).deletePair(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), eq(GITHUB_HOST)); } @Test @@ -216,8 +213,7 @@ public class SshKeyManagerPresenterTest { cancelCallback.cancelled(); verify(confirmDialog).show(); - verify(service, never()) - .deletePair(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), anyString()); + verify(service, never()).deletePair(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), anyString()); } @Test @@ -250,9 +246,8 @@ public class SshKeyManagerPresenterTest { operationVoidCapture.getValue().apply(null); verify(confirmDialog).show(); - verify(service) - .deletePair(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), eq(GITHUB_HOST)); - verify(service).getPairs(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); + verify(service).deletePair(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), eq(GITHUB_HOST)); + verify(service).getPairs(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); } @Test @@ -285,10 +280,10 @@ public class SshKeyManagerPresenterTest { operationErrorCapture.getValue().apply(JsPromiseError.create("")); verify(confirmDialog).show(); - verify(service).deletePair(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), anyString()); + verify(service).deletePair(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), anyString()); verify(notificationManager) .notify(anyString(), eq(StatusNotification.Status.FAIL), eq(FLOAT_MODE)); - verify(service, never()).getPairs(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); + verify(service, never()).getPairs(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); } @Test @@ -325,9 +320,8 @@ public class SshKeyManagerPresenterTest { operationSshPairDTOsCapture.getValue().apply(sshPairDtoArray); verify(confirmDialog).show(); - verify(service) - .deletePair(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), eq(GITHUB_HOST)); - verify(service).getPairs(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); + verify(service).deletePair(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), eq(GITHUB_HOST)); + verify(service).getPairs(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); verify(view).setPairs(eq(sshPairDtoArray)); } @@ -365,9 +359,8 @@ public class SshKeyManagerPresenterTest { operationErrorCapture.getValue().apply(JsPromiseError.create("")); verify(confirmDialog).show(); - verify(service) - .deletePair(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), eq(GITHUB_HOST)); - verify(service).getPairs(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); + verify(service).deletePair(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), eq(GITHUB_HOST)); + verify(service).getPairs(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); verify(view, never()).setPairs(eq(sshPairDtoArray)); verify(notificationManager) .notify( @@ -389,7 +382,7 @@ public class SshKeyManagerPresenterTest { verify(sshPairDTOsPromise).then(operationSshPairDTOsCapture.capture()); operationSshPairDTOsCapture.getValue().apply(sshPairDtoArray); - verify(service).getPairs(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); + verify(service).getPairs(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); verify(view).setPairs(eq(sshPairDtoArray)); } @@ -406,7 +399,7 @@ public class SshKeyManagerPresenterTest { verify(sshPairDTOsPromise).catchError(operationErrorCapture.capture()); operationErrorCapture.getValue().apply(JsPromiseError.create("")); - verify(service).getPairs(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); + verify(service).getPairs(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); verify(view, never()).setPairs(eq(sshPairDtoArray)); } @@ -430,8 +423,7 @@ public class SshKeyManagerPresenterTest { InputCallback inputCallback = inputCallbackCaptor.getValue(); inputCallback.accepted(GITHUB_HOST); - verify(service) - .generatePair(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), eq(GITHUB_HOST)); + verify(service).generatePair(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), eq(GITHUB_HOST)); } @Test @@ -449,13 +441,13 @@ public class SshKeyManagerPresenterTest { .createInputDialog( nullable(String.class), nullable(String.class), - ArgumentMatchers.any(), + org.mockito.ArgumentMatchers.any(), cancelCallbackCaptor.capture()); CancelCallback cancelCallback = cancelCallbackCaptor.getValue(); cancelCallback.cancelled(); verify(service, never()) - .generatePair(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), eq(GITHUB_HOST)); + .generatePair(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), eq(GITHUB_HOST)); } @Test @@ -479,9 +471,8 @@ public class SshKeyManagerPresenterTest { verify(sshPairDTOPromise).catchError(operationErrorCapture.capture()); operationErrorCapture.getValue().apply(JsPromiseError.create("")); - verify(service) - .generatePair(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), eq(GITHUB_HOST)); - verify(service, never()).getPairs(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); + verify(service).generatePair(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), eq(GITHUB_HOST)); + verify(service, never()).getPairs(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); verify(view, never()).setPairs((List) anyObject()); verify(notificationManager) .notify( @@ -516,9 +507,8 @@ public class SshKeyManagerPresenterTest { verify(sshPairDTOsPromise).then(operationSshPairDTOsCapture.capture()); operationSshPairDTOsCapture.getValue().apply(sshPairDtoArray); - verify(service) - .generatePair(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), eq(GITHUB_HOST)); - verify(service).getPairs(Matchers.eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); + verify(service).generatePair(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE), eq(GITHUB_HOST)); + verify(service).getPairs(eq(SshKeyManagerPresenter.VCS_SSH_SERVICE)); verify(view).setPairs(eq(sshPairDtoArray)); } diff --git a/wsagent/che-core-ssh-key-server/src/test/java/org/eclipse/che/plugin/ssh/key/HttpSshServiceClientTest.java b/wsagent/che-core-ssh-key-server/src/test/java/org/eclipse/che/plugin/ssh/key/HttpSshServiceClientTest.java index 4468035d46..b0b488dd81 100644 --- a/wsagent/che-core-ssh-key-server/src/test/java/org/eclipse/che/plugin/ssh/key/HttpSshServiceClientTest.java +++ b/wsagent/che-core-ssh-key-server/src/test/java/org/eclipse/che/plugin/ssh/key/HttpSshServiceClientTest.java @@ -11,8 +11,8 @@ package org.eclipse.che.plugin.ssh.key; import static javax.ws.rs.core.UriBuilder.fromUri; -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; diff --git a/wsmaster/che-core-api-account/src/test/java/org/eclipse/che/account/spi/AccountValidatorTest.java b/wsmaster/che-core-api-account/src/test/java/org/eclipse/che/account/spi/AccountValidatorTest.java index c17b8b1e2a..87ce2b8de3 100644 --- a/wsmaster/che-core-api-account/src/test/java/org/eclipse/che/account/spi/AccountValidatorTest.java +++ b/wsmaster/che-core-api-account/src/test/java/org/eclipse/che/account/spi/AccountValidatorTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.account.spi; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doThrow; import org.eclipse.che.account.api.AccountManager; diff --git a/wsmaster/che-core-api-auth/src/test/java/org/eclipse/che/security/oauth/OAuthAuthenticationServiceTest.java b/wsmaster/che-core-api-auth/src/test/java/org/eclipse/che/security/oauth/OAuthAuthenticationServiceTest.java index cc87878407..6449ad039a 100644 --- a/wsmaster/che-core-api-auth/src/test/java/org/eclipse/che/security/oauth/OAuthAuthenticationServiceTest.java +++ b/wsmaster/che-core-api-auth/src/test/java/org/eclipse/che/security/oauth/OAuthAuthenticationServiceTest.java @@ -15,8 +15,8 @@ import static org.eclipse.che.dto.server.DtoFactory.newDto; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -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.when; import static org.testng.Assert.assertEquals; diff --git a/wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/FactoryServiceTest.java b/wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/FactoryServiceTest.java index 3d4772e7d2..165474a779 100644 --- a/wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/FactoryServiceTest.java +++ b/wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/FactoryServiceTest.java @@ -26,11 +26,11 @@ import static org.eclipse.che.dto.server.DtoFactory.cloneDto; import static org.eclipse.che.dto.server.DtoFactory.newDto; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyMapOf; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyMapOf; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; diff --git a/wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/builder/FactoryBuilderTest.java b/wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/builder/FactoryBuilderTest.java index d91d284d00..fe14321182 100644 --- a/wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/builder/FactoryBuilderTest.java +++ b/wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/builder/FactoryBuilderTest.java @@ -15,8 +15,8 @@ import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; import static java.util.Objects.requireNonNull; import static org.eclipse.che.dto.server.DtoFactory.newDto; -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 com.google.common.collect.ImmutableMap; diff --git a/wsmaster/che-core-api-system/src/test/java/org/eclipse/che/api/system/server/SystemEventsWebsocketBroadcasterTest.java b/wsmaster/che-core-api-system/src/test/java/org/eclipse/che/api/system/server/SystemEventsWebsocketBroadcasterTest.java index 2cc373d1cb..860d03ea05 100644 --- a/wsmaster/che-core-api-system/src/test/java/org/eclipse/che/api/system/server/SystemEventsWebsocketBroadcasterTest.java +++ b/wsmaster/che-core-api-system/src/test/java/org/eclipse/che/api/system/server/SystemEventsWebsocketBroadcasterTest.java @@ -12,7 +12,7 @@ package org.eclipse.che.api.system.server; import static org.eclipse.che.api.system.shared.SystemStatus.PREPARING_TO_SHUTDOWN; import static org.eclipse.che.api.system.shared.SystemStatus.RUNNING; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.verify; diff --git a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/PreferenceManagerTest.java b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/PreferenceManagerTest.java index c0eb44c752..3d16150100 100644 --- a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/PreferenceManagerTest.java +++ b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/PreferenceManagerTest.java @@ -11,8 +11,8 @@ package org.eclipse.che.api.user.server; import static java.util.Arrays.asList; -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.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/ProfileServiceTest.java b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/ProfileServiceTest.java index df165d276c..486cf3df05 100644 --- a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/ProfileServiceTest.java +++ b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/ProfileServiceTest.java @@ -15,7 +15,7 @@ import static java.util.Arrays.asList; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/UserManagerTest.java b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/UserManagerTest.java index 6e55991e7e..8b4407469e 100644 --- a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/UserManagerTest.java +++ b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/UserManagerTest.java @@ -10,9 +10,9 @@ */ package org.eclipse.che.api.user.server; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyMapOf; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyMapOf; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/UserServiceTest.java b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/UserServiceTest.java index f6f7724b0c..9319dc952e 100644 --- a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/UserServiceTest.java +++ b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/UserServiceTest.java @@ -16,8 +16,8 @@ import static org.eclipse.che.dto.server.DtoFactory.newDto; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; diff --git a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/UserValidatorTest.java b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/UserValidatorTest.java index fae16d2bb6..ca2824e1c8 100644 --- a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/UserValidatorTest.java +++ b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/UserValidatorTest.java @@ -10,8 +10,8 @@ */ package org.eclipse.che.api.user.server; -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.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/jpa/JpaUserDaoTest.java b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/jpa/JpaUserDaoTest.java index 00ce8100d8..ab7cc15cef 100644 --- a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/jpa/JpaUserDaoTest.java +++ b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/jpa/JpaUserDaoTest.java @@ -10,10 +10,10 @@ */ package org.eclipse.che.api.user.server.jpa; -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.anyInt; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/spi/tck/UserDaoTest.java b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/spi/tck/UserDaoTest.java index 9f78495ca8..bccba7a97a 100644 --- a/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/spi/tck/UserDaoTest.java +++ b/wsmaster/che-core-api-user/src/test/java/org/eclipse/che/api/user/server/spi/tck/UserDaoTest.java @@ -13,7 +13,7 @@ package org.eclipse.che.api.user.server.spi.tck; import static java.util.Arrays.asList; import static java.util.Arrays.stream; import static java.util.stream.Collectors.toSet; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/TemporaryWorkspaceRemoverTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/TemporaryWorkspaceRemoverTest.java index 6c02e14790..7eca27b7bd 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/TemporaryWorkspaceRemoverTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/TemporaryWorkspaceRemoverTest.java @@ -10,10 +10,10 @@ */ package org.eclipse.che.api.workspace.server; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; -import static org.mockito.Matchers.intThat; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.intThat; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.times; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceManagerTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceManagerTest.java index f16e138468..61676878e4 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceManagerTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceManagerTest.java @@ -19,10 +19,10 @@ import static org.eclipse.che.api.core.model.workspace.WorkspaceStatus.RUNNING; import static org.eclipse.che.api.core.model.workspace.WorkspaceStatus.STARTING; import static org.eclipse.che.api.core.model.workspace.WorkspaceStatus.STOPPED; import static org.eclipse.che.api.workspace.server.WorkspaceManager.UPDATED_ATTRIBUTE_NAME; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceRuntimesTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceRuntimesTest.java index f9e940dcd4..aa3acf3482 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceRuntimesTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceRuntimesTest.java @@ -10,9 +10,9 @@ */ package org.eclipse.che.api.workspace.server; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceServiceTerminationTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceServiceTerminationTest.java index 3332c34f1c..406a57c4c0 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceServiceTerminationTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceServiceTerminationTest.java @@ -10,7 +10,7 @@ */ package org.eclipse.che.api.workspace.server; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceServiceTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceServiceTest.java index bd7f7387e1..09d8234bc4 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceServiceTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/WorkspaceServiceTest.java @@ -23,11 +23,11 @@ import static org.eclipse.che.dto.server.DtoFactory.newDto; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +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; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/hc/HttpConnectionServerCheckerTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/hc/HttpConnectionServerCheckerTest.java index ff3cad58b4..477c7db796 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/hc/HttpConnectionServerCheckerTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/hc/HttpConnectionServerCheckerTest.java @@ -10,8 +10,8 @@ */ package org.eclipse.che.api.workspace.server.hc; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/hc/ServersCheckerTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/hc/ServersCheckerTest.java index 8e2e2760c9..4991080392 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/hc/ServersCheckerTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/hc/ServersCheckerTest.java @@ -10,10 +10,10 @@ */ package org.eclipse.che.api.workspace.server.hc; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyObject; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.after; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/InternalRuntimeTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/InternalRuntimeTest.java index 598a40c550..4ca62e65f7 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/InternalRuntimeTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/InternalRuntimeTest.java @@ -15,9 +15,9 @@ import static java.util.Collections.singletonMap; import static org.eclipse.che.api.core.model.workspace.runtime.ServerStatus.RUNNING; import static org.eclipse.che.api.core.model.workspace.runtime.ServerStatus.STOPPED; import static org.eclipse.che.api.core.model.workspace.runtime.ServerStatus.UNKNOWN; -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.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/tck/StackDaoTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/tck/StackDaoTest.java index eb76350f52..be6842ac4c 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/tck/StackDaoTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/tck/StackDaoTest.java @@ -13,7 +13,7 @@ package org.eclipse.che.api.workspace.server.spi.tck; import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; import static org.eclipse.che.api.workspace.server.spi.tck.WorkspaceDaoTest.createWorkspaceConfig; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/tck/WorkspaceDaoTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/tck/WorkspaceDaoTest.java index 902bea0403..2dc709f182 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/tck/WorkspaceDaoTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/spi/tck/WorkspaceDaoTest.java @@ -14,7 +14,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; import static java.util.stream.Collectors.toList; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackLoaderTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackLoaderTest.java index 3e4a04d311..9512816061 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackLoaderTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackLoaderTest.java @@ -12,7 +12,7 @@ package org.eclipse.che.api.workspace.server.stack; import static java.util.Collections.singletonMap; import static org.eclipse.che.dto.server.DtoFactory.newDto; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackServiceTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackServiceTest.java index b8f286bc19..0f6574c8c9 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackServiceTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackServiceTest.java @@ -23,11 +23,11 @@ import static org.eclipse.che.dto.server.DtoFactory.newDto; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_NAME; import static org.everrest.assured.JettyHttpServer.ADMIN_USER_PASSWORD; import static org.everrest.assured.JettyHttpServer.SECURE_PATH; +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.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.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackValidatorTest.java b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackValidatorTest.java index f9b2e68b0b..0d5fccbbc0 100644 --- a/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackValidatorTest.java +++ b/wsmaster/che-core-api-workspace/src/test/java/org/eclipse/che/api/workspace/server/stack/StackValidatorTest.java @@ -11,7 +11,7 @@ package org.eclipse.che.api.workspace.server.stack; import static org.eclipse.che.dto.server.DtoFactory.newDto; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import java.util.ArrayList; diff --git a/wsmaster/integration-tests/cascade-removal/src/test/java/org/eclipse/che/core/db/jpa/CascadeRemovalTest.java b/wsmaster/integration-tests/cascade-removal/src/test/java/org/eclipse/che/core/db/jpa/CascadeRemovalTest.java index 26ff6bdfaa..e05d2ca5f3 100644 --- a/wsmaster/integration-tests/cascade-removal/src/test/java/org/eclipse/che/core/db/jpa/CascadeRemovalTest.java +++ b/wsmaster/integration-tests/cascade-removal/src/test/java/org/eclipse/che/core/db/jpa/CascadeRemovalTest.java @@ -16,7 +16,7 @@ import static org.eclipse.che.core.db.jpa.TestObjectsFactory.createProfile; import static org.eclipse.che.core.db.jpa.TestObjectsFactory.createSshPair; import static org.eclipse.che.core.db.jpa.TestObjectsFactory.createUser; import static org.eclipse.che.core.db.jpa.TestObjectsFactory.createWorkspace; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when;