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 Jul 4, 2012
1 parent b24c993 commit 8a1a36a
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 47 deletions.
12 changes: 7 additions & 5 deletions zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.ui.xml
View file
Expand Up @@ -12,7 +12,7 @@
}

.container{
width:400px;
width:420px;
height:100px;
color:#FFFFFF;
}
Expand All @@ -23,19 +23,21 @@
background:#000000;
width:100%;
height:100px;
border-radius:18px;
border-radius:12px;
padding:5px;
}

.layoutTable
{
width:80px;
width:95px;
height:80px;
cursor:pointer;
}

.layoutTable td
{
font-size:0.5em;
border-radius:3px;
font-size:0.8em;
border-radius:5px;
box-shadow:inset 0 0 6px 2px #C3C3C3;
}

Expand Down
63 changes: 21 additions & 42 deletions zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
View file
Expand Up @@ -88,15 +88,12 @@ public class AppPresenterTest
WebTransMessages mockMessages;
Person mockPerson;

HasCommand mockLeaveWorkspaceMenuItem;
HasCommand mockSignoutMenuItem;
HasCommand mockHelpMenuItem;

KeyShortcutPresenter mockKeyShortcutPresenter;
DocumentListPresenter mockDocumentListPresenter;
SearchResultsPresenter mockSearchResultsPresenter;
TranslationPresenter mockTranslationPresenter;
NotificationPresenter mockNotificationPresenter;
LayoutSelectorPresenter mockLayoutPresenter;

Window mockWindow;
Location mockWindowLocation;
Expand All @@ -115,10 +112,6 @@ public class AppPresenterTest
private Capture<WorkspaceContextUpdateEventHandler> capturedWorkspaceContextUpdatedEventHandler;
private Capture<PresenterRevealedHandler> capturedPresenterRevealedHandler;

private Capture<Command> capturedLeaveWorkspaceLinkCommand;
private Capture<Command> capturedSignoutLinkCommand;
private Capture<Command> capturedHelpLinkCommand;

private DocumentInfo testDocInfo;
private DocumentId testDocId;
private TranslationStats testDocStats;
Expand All @@ -136,17 +129,15 @@ public void createMocks()
mockHistory = createMock(History.class);
mockIdentity = createMock(Identity.class);
mockKeyShortcutPresenter = createMock(KeyShortcutPresenter.class);
mockLeaveWorkspaceMenuItem = createMock(HasCommand.class);
mockMessages = createMock(WebTransMessages.class);
mockPerson = createMock(Person.class);
mockSearchResultsPresenter = createMock(SearchResultsPresenter.class);
mockSignoutMenuItem = createMock(HasCommand.class);
mockTranslationPresenter = createMock(TranslationPresenter.class);
mockWindow = createMock(Window.class);
mockWindowLocation = createMock(Window.Location.class);
mockWorkspaceContext = createMock(WorkspaceContext.class);
mockNotificationPresenter = createMock(NotificationPresenter.class);
mockHelpMenuItem = createMock(HasCommand.class);
mockLayoutPresenter = createMock(LayoutSelectorPresenter.class);

capturedSearchLinkClickHandler = new Capture<ClickHandler>();
capturedDocumentLinkClickHandler = new Capture<ClickHandler>();
Expand All @@ -159,11 +150,6 @@ public void createMocks()
capturedProjectStatsUpdatedEventHandler = new Capture<ProjectStatsUpdatedEventHandler>();
capturedWorkspaceContextUpdatedEventHandler = new Capture<WorkspaceContextUpdateEventHandler>();
capturedPresenterRevealedHandler = new Capture<PresenterRevealedHandler>();

capturedSignoutLinkCommand = new Capture<Command>();
capturedLeaveWorkspaceLinkCommand = new Capture<Command>();
capturedHelpLinkCommand = new Capture<Command>();

}

@BeforeMethod
Expand All @@ -177,7 +163,7 @@ void beforeMethod()

setupDefaultMockExpectations();

appPresenter = new AppPresenter(mockDisplay, mockEventBus, mockKeyShortcutPresenter, mockTranslationPresenter, mockDocumentListPresenter, mockSearchResultsPresenter, mockNotificationPresenter, mockIdentity, mockWorkspaceContext, mockMessages, mockHistory, mockWindow, mockWindowLocation);
appPresenter = new AppPresenter(mockDisplay, mockEventBus, mockKeyShortcutPresenter, mockTranslationPresenter, mockDocumentListPresenter, mockSearchResultsPresenter, mockNotificationPresenter, mockLayoutPresenter, mockIdentity, mockWorkspaceContext, mockMessages, mockHistory, mockWindow, mockWindowLocation);

mockNotificationPresenter.setNotificationListener(appPresenter);
expectLastCall().once();
Expand Down Expand Up @@ -702,6 +688,10 @@ private void expectSubPresenterBindings()
expectLastCall().once();
mockNotificationPresenter.bind();
expectLastCall().once();
mockLayoutPresenter.bind();
expectLastCall().once();
mockLayoutPresenter.setLayoutListener(mockTranslationPresenter);
expectLastCall().once();

}

Expand Down Expand Up @@ -741,8 +731,6 @@ private void expectPresenterSetupActions()
{
mockWindow.setTitle(TEST_WINDOW_TITLE);
expectLastCall().once();
mockDisplay.setUserLabel(TEST_PERSON_NAME);
expectLastCall().anyTimes();
mockDisplay.setWorkspaceNameLabel(TEST_WORKSPACE_NAME, TEST_WORKSPACE_TITLE);
expectLastCall().anyTimes();
mockDisplay.setReadOnlyVisible(false);
Expand All @@ -763,24 +751,21 @@ private void expectPresenterSetupActions()
// due to this display beginning as concealed
mockSearchResultsPresenter.concealDisplay();
expectLastCall().once();

mockLeaveWorkspaceMenuItem.setCommand(and(capture(capturedLeaveWorkspaceLinkCommand), isA(Command.class)));
expectLastCall().once();

mockHelpMenuItem.setCommand(and(capture(capturedHelpLinkCommand), isA(Command.class)));
expectLastCall().once();

mockSignoutMenuItem.setCommand(and(capture(capturedSignoutLinkCommand), isA(Command.class)));

mockDisplay.initMenuList(isA(String.class), isA(Command.class), isA(Command.class), isA(Command.class), isA(Command.class));
expectLastCall().once();

mockDisplay.setLayoutMenuVisible(false);
expectLastCall().anyTimes();

mockDisplay.setLayoutMenuVisible(true);
expectLastCall().anyTimes();

expect(mockKeyShortcutPresenter.registerKeyShortcut(and(capture(capturedKeyShortcuts), isA(KeyShortcut.class)))).andReturn(null).anyTimes();
}

private void setupMockGetterReturnValues()
{
expect(mockDisplay.getSignOutMenuItem()).andReturn(mockSignoutMenuItem).anyTimes();
expect(mockDisplay.getHelpMenuItem()).andReturn(mockHelpMenuItem).anyTimes();
expect(mockDisplay.getLeaveWorkspaceMenuItem()).andReturn(mockLeaveWorkspaceMenuItem).anyTimes();
expect(mockDisplay.getDocumentsLink()).andReturn(mockDocumentsLink).anyTimes();
expect(mockDisplay.getNotificationBtn()).andReturn(mockErrorNotificationBtn).anyTimes();

Expand Down Expand Up @@ -811,9 +796,8 @@ private void resetAllMocks()
reset(mockEventBus, mockHistory, mockIdentity, mockKeyShortcutPresenter);
reset(mockMessages, mockPerson, mockSearchResultsPresenter);
reset(mockTranslationPresenter, mockWindow, mockWindowLocation, mockWorkspaceContext);
reset(mockNotificationPresenter);

reset(mockHelpMenuItem, mockLeaveWorkspaceMenuItem, mockSignoutMenuItem, mockSearchLink);
reset(mockNotificationPresenter, mockLayoutPresenter);
reset(mockSearchLink);
}

private void resetAllCaptures()
Expand All @@ -823,12 +807,9 @@ private void resetAllCaptures()
capturedDocumentStatsUpdatedEventHandler.reset();
capturedHistoryTokenString.reset();
capturedHistoryValueChangeHandler.reset();
capturedLeaveWorkspaceLinkCommand.reset();
capturedHelpLinkCommand.reset();
capturedKeyShortcuts.reset();
capturedProjectStatsUpdatedEventHandler.reset();
capturedSearchLinkClickHandler.reset();
capturedSignoutLinkCommand.reset();
capturedWorkspaceContextUpdatedEventHandler.reset();
capturedPresenterRevealedHandler.reset();
capturedErrorNotificationBtnHandler.reset();
Expand All @@ -840,9 +821,8 @@ private void replayAllMocks()
replay(mockEventBus, mockHistory, mockIdentity, mockKeyShortcutPresenter);
replay(mockMessages, mockPerson, mockSearchResultsPresenter);
replay(mockTranslationPresenter, mockWindow, mockWindowLocation, mockWorkspaceContext);
replay(mockNotificationPresenter);

replay(mockHelpMenuItem, mockLeaveWorkspaceMenuItem, mockSignoutMenuItem, mockSearchLink);
replay(mockNotificationPresenter, mockLayoutPresenter);
replay(mockSearchLink);
}

private void verifyAllMocks()
Expand All @@ -851,8 +831,7 @@ private void verifyAllMocks()
verify(mockEventBus, mockHistory, mockIdentity, mockKeyShortcutPresenter);
verify(mockMessages, mockPerson, mockSearchResultsPresenter);
verify(mockTranslationPresenter, mockWindow, mockWindowLocation, mockWorkspaceContext);
verify(mockNotificationPresenter);

verify(mockHelpMenuItem, mockLeaveWorkspaceMenuItem, mockSignoutMenuItem, mockSearchLink);
verify(mockNotificationPresenter, mockLayoutPresenter);
verify(mockSearchLink);
}
}

0 comments on commit 8a1a36a

Please sign in to comment.