From c5e854326164b4c54e590e8ad1a7c85bd7376f8b Mon Sep 17 00:00:00 2001 From: Valeriy Svydenko Date: Fri, 29 Jul 2016 18:03:14 +0300 Subject: [PATCH] fix failed build --- .../client/manage/SshKeyManagerPresenter.java | 28 +++++++++---------- .../manage/SshKeyManagerPresenterTest.java | 24 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/plugins/plugin-ssh-key/che-plugin-ssh-key-ide/src/main/java/org/eclipse/che/plugin/ssh/key/client/manage/SshKeyManagerPresenter.java b/plugins/plugin-ssh-key/che-plugin-ssh-key-ide/src/main/java/org/eclipse/che/plugin/ssh/key/client/manage/SshKeyManagerPresenter.java index c6cd02002ed..408529c59fa 100644 --- a/plugins/plugin-ssh-key/che-plugin-ssh-key-ide/src/main/java/org/eclipse/che/plugin/ssh/key/client/manage/SshKeyManagerPresenter.java +++ b/plugins/plugin-ssh-key/che-plugin-ssh-key-ide/src/main/java/org/eclipse/che/plugin/ssh/key/client/manage/SshKeyManagerPresenter.java @@ -12,28 +12,26 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.AcceptsOneWidget; -import com.google.gwt.user.client.ui.Label; import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.che.api.promises.client.Operation; import org.eclipse.che.api.promises.client.OperationException; import org.eclipse.che.api.promises.client.PromiseError; -import org.eclipse.che.ide.api.ssh.SshServiceClient; import org.eclipse.che.api.ssh.shared.dto.SshPairDto; import org.eclipse.che.ide.api.app.AppContext; import org.eclipse.che.ide.api.app.CurrentUser; -import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.api.preferences.AbstractPreferencePagePresenter; -import org.eclipse.che.ide.ui.TextBox; -import org.eclipse.che.plugin.ssh.key.client.SshKeyUploaderRegistry; -import org.eclipse.che.plugin.ssh.key.client.upload.UploadSshKeyPresenter; -import org.eclipse.che.plugin.ssh.key.client.SshKeyUploader; -import org.eclipse.che.plugin.ssh.key.client.SshKeyLocalizationConstant; import org.eclipse.che.ide.api.dialogs.CancelCallback; import org.eclipse.che.ide.api.dialogs.ConfirmCallback; import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.api.dialogs.InputCallback; +import org.eclipse.che.ide.api.notification.NotificationManager; +import org.eclipse.che.ide.api.preferences.AbstractPreferencePagePresenter; +import org.eclipse.che.ide.api.ssh.SshServiceClient; +import org.eclipse.che.plugin.ssh.key.client.SshKeyLocalizationConstant; +import org.eclipse.che.plugin.ssh.key.client.SshKeyUploader; +import org.eclipse.che.plugin.ssh.key.client.SshKeyUploaderRegistry; +import org.eclipse.che.plugin.ssh.key.client.upload.UploadSshKeyPresenter; import javax.validation.constraints.NotNull; import java.util.List; @@ -52,12 +50,12 @@ public class SshKeyManagerPresenter extends AbstractPreferencePagePresenter impl public static final String GITHUB_HOST = "github.com"; public static final String VCS_SSH_SERVICE = "vcs"; - private final AppContext appContext; - private final DialogFactory dialogFactory; - private final SshKeyManagerView view; - private final SshServiceClient service; - private final SshKeyUploaderRegistry registry; - private final ShowSshKeyView showSshKeyView; + private final AppContext appContext; + private final DialogFactory dialogFactory; + private final SshKeyManagerView view; + private final SshServiceClient service; + private final SshKeyUploaderRegistry registry; + private final ShowSshKeyView showSshKeyView; private final SshKeyLocalizationConstant constant; private final UploadSshKeyPresenter uploadSshKeyPresenter; private final NotificationManager notificationManager; diff --git a/plugins/plugin-ssh-key/che-plugin-ssh-key-ide/src/test/java/org/eclipse/che/plugin/ssh/key/client/manage/SshKeyManagerPresenterTest.java b/plugins/plugin-ssh-key/che-plugin-ssh-key-ide/src/test/java/org/eclipse/che/plugin/ssh/key/client/manage/SshKeyManagerPresenterTest.java index 784752e4084..41c7f7a155c 100644 --- a/plugins/plugin-ssh-key/che-plugin-ssh-key-ide/src/test/java/org/eclipse/che/plugin/ssh/key/client/manage/SshKeyManagerPresenterTest.java +++ b/plugins/plugin-ssh-key/che-plugin-ssh-key-ide/src/test/java/org/eclipse/che/plugin/ssh/key/client/manage/SshKeyManagerPresenterTest.java @@ -20,23 +20,23 @@ import org.eclipse.che.api.promises.client.Promise; import org.eclipse.che.api.promises.client.PromiseError; import org.eclipse.che.api.promises.client.js.JsPromiseError; -import org.eclipse.che.ide.api.ssh.SshServiceClient; import org.eclipse.che.api.ssh.shared.dto.SshPairDto; import org.eclipse.che.ide.api.app.AppContext; -import org.eclipse.che.ide.api.notification.NotificationManager; -import org.eclipse.che.ide.api.notification.StatusNotification; -import org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode; -import org.eclipse.che.plugin.ssh.key.client.SshKeyLocalizationConstant; -import org.eclipse.che.plugin.ssh.key.client.upload.UploadSshKeyPresenter; -import org.eclipse.che.plugin.ssh.key.client.SshResources; -import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; import org.eclipse.che.ide.api.dialogs.CancelCallback; import org.eclipse.che.ide.api.dialogs.ConfirmCallback; +import org.eclipse.che.ide.api.dialogs.ConfirmDialog; import org.eclipse.che.ide.api.dialogs.DialogFactory; import org.eclipse.che.ide.api.dialogs.InputCallback; -import org.eclipse.che.ide.api.dialogs.ConfirmDialog; import org.eclipse.che.ide.api.dialogs.InputDialog; import org.eclipse.che.ide.api.dialogs.MessageDialog; +import org.eclipse.che.ide.api.notification.NotificationManager; +import org.eclipse.che.ide.api.notification.StatusNotification; +import org.eclipse.che.ide.api.notification.StatusNotification.DisplayMode; +import org.eclipse.che.ide.api.ssh.SshServiceClient; +import org.eclipse.che.ide.rest.DtoUnmarshallerFactory; +import org.eclipse.che.plugin.ssh.key.client.SshKeyLocalizationConstant; +import org.eclipse.che.plugin.ssh.key.client.SshResources; +import org.eclipse.che.plugin.ssh.key.client.upload.UploadSshKeyPresenter; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -110,6 +110,8 @@ public class SshKeyManagerPresenterTest { @Mock private SshServiceClient service; @Mock + private ShowSshKeyView showSshKeyView; + @Mock private SshKeyLocalizationConstant constant; @Mock private SshResources resources; @@ -160,13 +162,13 @@ public void testGo() { @Test public void testOnViewClickedWhenGetPublicKeyIsSuccess() { when(sshPairDto.getPublicKey()).thenReturn("publicKey"); + when(sshPairDto.getName()).thenReturn("name"); MessageDialog messageDialog = mock(MessageDialog.class); when(dialogFactory.createMessageDialog(anyString(), anyString(), (ConfirmCallback)anyObject())).thenReturn(messageDialog); presenter.onViewClicked(sshPairDto); - verify(dialogFactory).createMessageDialog(anyString(), eq("publicKey"), (ConfirmCallback)anyObject()); - verify(messageDialog).show(); + verify(showSshKeyView).show("name", "publicKey"); } @Test