Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eng committed Jun 4, 2012
1 parent 0766155 commit cb05ffe
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 6 deletions.
1 change: 0 additions & 1 deletion zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
View file
Expand Up @@ -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;
Expand Down
27 changes: 22 additions & 5 deletions zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
View file
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -81,6 +85,7 @@ public class TranslationPresenterTest
// mock view components
private HasValue<Boolean> mockOptionsToggle;
private HasValue<Boolean> mockSouthPanelToggle;
private HasSelectionHandlers<Integer> mockSouthPanel;


private Capture<EnterWorkspaceEventHandler> capturedEnterWorkspaceEventHandler;
Expand All @@ -90,6 +95,9 @@ public class TranslationPresenterTest
private Capture<AsyncCallback<GetTranslatorListResult>> capturedTranslatorListRequestCallback;
private Capture<ValueChangeHandler<Boolean>> capturedOptionsToggleValueChangeHandler;
private Capture<ValueChangeHandler<Boolean>> capturedSouthPanelToggleValueChangeHandler;
private Capture<SelectionHandler<Integer>> capturedSouthPanelSelectionHandler;

private Capture<PublishWorkspaceChatEventHandler> capturedPublishWorkspaceChatEventHandler;

private Capture<NativePreviewHandler> capturedKeyShortcutHandler;

Expand All @@ -112,6 +120,7 @@ public void createMocks()

mockOptionsToggle = createMock(HasValue.class);
mockSouthPanelToggle = createMock(HasValue.class);
mockSouthPanel = createMock(HasSelectionHandlers.class);
}

private TranslationPresenter newTranslationPresenter()
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -512,6 +521,7 @@ private void setupDefaultMockExpectations(Map<EditorClientId, PersonSessionDetai
expect(mockMessages.showEditorOptions()).andReturn(TEST_SHOW_OPTIONS_TOOLTIP).anyTimes();
expect(mockMessages.hideEditorOptions()).andReturn(TEST_HIDE_OPTIONS_TOOLTIP).anyTimes();


capturedEnterWorkspaceEventHandler = new Capture<EnterWorkspaceEventHandler>();
expect(mockEventBus.addHandler(eq(EnterWorkspaceEvent.getType()), and(capture(capturedEnterWorkspaceEventHandler), isA(EnterWorkspaceEventHandler.class)))).andReturn(createMock(HandlerRegistration.class)).once();
capturedExitWorkspaceEventHandler = new Capture<ExitWorkspaceEventHandler>();
Expand All @@ -521,6 +531,10 @@ private void setupDefaultMockExpectations(Map<EditorClientId, PersonSessionDetai

setupUserListRequestResponse(initialParticipants);

expect(mockDisplay.getSouthTabPanel()).andReturn(mockSouthPanel).anyTimes();
capturedSouthPanelSelectionHandler = new Capture<SelectionHandler<Integer>>();
expect(mockSouthPanel.addSelectionHandler(and(capture(capturedSouthPanelSelectionHandler), isA(SelectionHandler.class)))).andReturn(createMock(HandlerRegistration.class)).once();

expect(mockDisplay.getOptionsToggle()).andReturn(mockOptionsToggle).anyTimes();
capturedOptionsToggleValueChangeHandler = new Capture<ValueChangeHandler<Boolean>>();
expect(mockOptionsToggle.addValueChangeHandler(and(capture(capturedOptionsToggleValueChangeHandler), isA(ValueChangeHandler.class)))).andReturn(createMock(HandlerRegistration.class)).once();
Expand All @@ -534,6 +548,9 @@ private void setupDefaultMockExpectations(Map<EditorClientId, PersonSessionDetai

capturedKeyShortcutHandler = new Capture<NativePreviewHandler>();
expect(mockNativeEvent.addNativePreviewHandler(and(capture(capturedKeyShortcutHandler), isA(NativePreviewHandler.class)))).andReturn(createMock(HandlerRegistration.class)).once();

capturedPublishWorkspaceChatEventHandler = new Capture<PublishWorkspaceChatEventHandler>();
expect(mockEventBus.addHandler(eq(PublishWorkspaceChatEvent.getType()), and(capture(capturedPublishWorkspaceChatEventHandler), isA(PublishWorkspaceChatEventHandler.class)))).andReturn(createMock(HandlerRegistration.class)).once();
}

/**
Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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<GetTranslatorListResult>
Expand Down

0 comments on commit cb05ffe

Please sign in to comment.