From cb05ffe7f005f8455ad94e5e9a3536f5bbbd4f2f Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Mon, 4 Jun 2012 14:52:19 +1000 Subject: [PATCH] Fix test --- .../client/view/WorkspaceUsersView.java | 1 - .../presenter/TranslationPresenterTest.java | 27 +++++++++++++++---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java index 441cc16b0f..ab6cf37238 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java @@ -16,7 +16,6 @@ import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HasText; import com.google.gwt.user.client.ui.HorizontalPanel; -import com.google.gwt.user.client.ui.InlineLabel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.PushButton; import com.google.gwt.user.client.ui.ScrollPanel; diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java index 9651e2189c..d570f16086 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java @@ -27,6 +27,8 @@ import org.zanata.webtrans.client.events.ExitWorkspaceEvent; import org.zanata.webtrans.client.events.ExitWorkspaceEventHandler; import org.zanata.webtrans.client.events.NativeEvent; +import org.zanata.webtrans.client.events.PublishWorkspaceChatEvent; +import org.zanata.webtrans.client.events.PublishWorkspaceChatEventHandler; import org.zanata.webtrans.client.events.WorkspaceContextUpdateEvent; import org.zanata.webtrans.client.events.WorkspaceContextUpdateEventHandler; import org.zanata.webtrans.client.presenter.TranslationPresenter.Display; @@ -42,6 +44,8 @@ import org.zanata.webtrans.shared.rpc.GetTranslatorListResult; import org.zanata.webtrans.shared.rpc.HasWorkspaceChatData.MESSAGE_TYPE; +import com.google.gwt.event.logical.shared.HasSelectionHandlers; +import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.event.logical.shared.ValueChangeEvent; import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.event.shared.HandlerRegistration; @@ -81,6 +85,7 @@ public class TranslationPresenterTest // mock view components private HasValue mockOptionsToggle; private HasValue mockSouthPanelToggle; + private HasSelectionHandlers mockSouthPanel; private Capture capturedEnterWorkspaceEventHandler; @@ -90,6 +95,9 @@ public class TranslationPresenterTest private Capture> capturedTranslatorListRequestCallback; private Capture> capturedOptionsToggleValueChangeHandler; private Capture> capturedSouthPanelToggleValueChangeHandler; + private Capture> capturedSouthPanelSelectionHandler; + + private Capture capturedPublishWorkspaceChatEventHandler; private Capture capturedKeyShortcutHandler; @@ -112,6 +120,7 @@ public void createMocks() mockOptionsToggle = createMock(HasValue.class); mockSouthPanelToggle = createMock(HasValue.class); + mockSouthPanel = createMock(HasSelectionHandlers.class); } private TranslationPresenter newTranslationPresenter() @@ -359,9 +368,9 @@ public void updateParticipantsOnEnterWorkspace() expect(mockWorkspaceUsersPresenter.getTranslatorsSize()).andReturn(2); - mockWorkspaceUsersPresenter.dispatchChatAction("bob", TEST_HAS_JONINED_WORKSPACE_MESSAGE, MESSAGE_TYPE.USER_MSG); + mockWorkspaceUsersPresenter.dispatchChatAction(null, TEST_HAS_JONINED_WORKSPACE_MESSAGE, MESSAGE_TYPE.SYSTEM_MSG); expectLastCall(); - + mockWorkspaceUsersPresenter.addTranslator(new EditorClientId("sessionId1"), new Person(new PersonId("bob"), "Bob Smith", "http://www.gravatar.com/avatar/bob@zanata.org?d=mm&s=16"), null); expectLastCall(); @@ -512,6 +521,7 @@ private void setupDefaultMockExpectations(Map(); expect(mockEventBus.addHandler(eq(EnterWorkspaceEvent.getType()), and(capture(capturedEnterWorkspaceEventHandler), isA(EnterWorkspaceEventHandler.class)))).andReturn(createMock(HandlerRegistration.class)).once(); capturedExitWorkspaceEventHandler = new Capture(); @@ -521,6 +531,10 @@ private void setupDefaultMockExpectations(Map>(); + expect(mockSouthPanel.addSelectionHandler(and(capture(capturedSouthPanelSelectionHandler), isA(SelectionHandler.class)))).andReturn(createMock(HandlerRegistration.class)).once(); + expect(mockDisplay.getOptionsToggle()).andReturn(mockOptionsToggle).anyTimes(); capturedOptionsToggleValueChangeHandler = new Capture>(); expect(mockOptionsToggle.addValueChangeHandler(and(capture(capturedOptionsToggleValueChangeHandler), isA(ValueChangeHandler.class)))).andReturn(createMock(HandlerRegistration.class)).once(); @@ -534,6 +548,9 @@ private void setupDefaultMockExpectations(Map(); expect(mockNativeEvent.addNativePreviewHandler(and(capture(capturedKeyShortcutHandler), isA(NativePreviewHandler.class)))).andReturn(createMock(HandlerRegistration.class)).once(); + + capturedPublishWorkspaceChatEventHandler = new Capture(); + expect(mockEventBus.addHandler(eq(PublishWorkspaceChatEvent.getType()), and(capture(capturedPublishWorkspaceChatEventHandler), isA(PublishWorkspaceChatEventHandler.class)))).andReturn(createMock(HandlerRegistration.class)).once(); } /** @@ -561,7 +578,7 @@ private void resetAllMocks() reset(mockMessages, mockNativeEvent, mockSidePanelPresenter, mockTranslationEditorPresenter, mockTransMemoryPresenter); reset(mockWorkspaceContext, mockWorkspaceUsersPresenter); - reset(mockOptionsToggle, mockSouthPanelToggle); + reset(mockOptionsToggle, mockSouthPanelToggle, mockSouthPanel); } private void replayAllMocks() @@ -570,7 +587,7 @@ private void replayAllMocks() replay(mockMessages, mockNativeEvent, mockSidePanelPresenter, mockTranslationEditorPresenter, mockTransMemoryPresenter); replay(mockWorkspaceContext, mockWorkspaceUsersPresenter); - replay(mockOptionsToggle, mockSouthPanelToggle); + replay(mockOptionsToggle, mockSouthPanelToggle, mockSouthPanel); } private void verifyAllMocks() @@ -579,7 +596,7 @@ private void verifyAllMocks() verify(mockMessages, mockNativeEvent, mockSidePanelPresenter, mockTranslationEditorPresenter, mockTransMemoryPresenter); verify(mockWorkspaceContext, mockWorkspaceUsersPresenter); - verify(mockOptionsToggle, mockSouthPanelToggle); + verify(mockOptionsToggle, mockSouthPanelToggle, mockSouthPanel); } private class TranslatorListSuccessAnswer implements IAnswer