From 87e4cc5d31f3ccdd0ca3ba45001124750c5799cd Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Fri, 1 Mar 2013 12:11:34 +1000 Subject: [PATCH] work in progress --- .../main/java/org/zanata/dao/DocumentDAO.java | 1 - .../presenter/DocumentListPresenter.java | 19 +++++++++++++----- .../client/view/DocumentListDisplay.java | 2 ++ .../client/view/DocumentListView.java | 10 ++++++++++ .../client/view/DocumentListView.ui.xml | 1 + .../server/rpc/RunValidationHandler.java | 3 +-- .../webtrans/shared/model/DocumentId.java | 8 ++++---- .../shared/rpc/RunValidationAction.java | 9 ++++++++- .../java/org/zanata/dao/TextFlowDAOTest.java | 2 +- .../search/FilterConstraintToQueryTest.java | 2 +- .../presenter/DocumentListPresenterTest.java | 5 ++++- .../presenter/GlossaryPresenterTest.java | 12 +++++------ .../presenter/TransMemoryPresenterTest.java | 12 +++++------ .../rpc/DummyActivateWorkspaceCommand.java | 2 +- .../client/rpc/DummyGetDocsListCommand.java | 20 +++++++++---------- .../rpc/DummyGetStatusCountCommand.java | 2 +- .../rpc/DummyUpdateTransUnitCommand.java | 2 +- .../GetTransUnitActionContextTest.java | 10 +++++----- .../HistoryEventHandlerServiceTest.java | 6 +++--- .../service/NavigationServiceUnitTest.java | 4 ++-- .../service/TransUnitSaveServiceTest.java | 2 +- .../rpc/GetDocumentListHandlerTest.java | 2 +- .../server/rpc/GetStatusCountHandlerTest.java | 2 +- .../rpc/GetTransUnitListHandlerTest.java | 2 +- .../GetTransUnitsNavigationServiceTest.java | 2 +- .../RevertTransUnitUpdatesHandlerTest.java | 2 +- 26 files changed, 87 insertions(+), 57 deletions(-) diff --git a/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java b/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java index a250c35850..21d4dce070 100644 --- a/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java @@ -1,6 +1,5 @@ package org.zanata.dao; -import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.List; diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java index c937e32459..58805a7318 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java @@ -433,23 +433,32 @@ public void onSuccess(DownloadAllFilesResult result) }); } + @Override public void runValidation() { - ArrayList idList = new ArrayList(); + ArrayList valIds = new ArrayList(); + ArrayList docIds = new ArrayList(); + for(DocumentNode node: display.getDocumentListTable().getVisibleItems()) + { + docIds.add(node.getDocInfo().getId().getId()); + } + for (ValidationAction valAction : validationService.getValidationMap().values()) { if (valAction.getValidationInfo().isEnabled()) { - idList.add(valAction.getValidationInfo().getId()); + valIds.add(valAction.getValidationInfo().getId()); } } + + Log.info("doc==========================" + docIds.size()); + Log.info("val=========================" + valIds.size()); - if (!idList.isEmpty()) + if (!valIds.isEmpty() && !docIds.isEmpty()) { - dispatcher.execute(new RunValidationAction(idList), new AsyncCallback() + dispatcher.execute(new RunValidationAction(valIds, docIds), new AsyncCallback() { - @Override public void onFailure(Throwable caught) { diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java index a2ac82ae2c..2cf195a8b3 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java @@ -81,6 +81,8 @@ interface Listener void onUploadFile(); void updateDownloadFileProgress(); + + void runValidation(); } void setLayout(String layout); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java index 5d21ac1000..4e4d649bec 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java @@ -76,6 +76,10 @@ public class DocumentListView extends Composite implements DocumentListDisplay @UiField PushButton downloadAllFiles; + + @UiField + PushButton runValidation; + @UiField(provided = true) DocumentListPager pager; @@ -189,6 +193,12 @@ public void onDownloadAllFilesClick(ClickEvent event) { confirmationBox.center(); } + + @UiHandler("runValidation") + public void onRunValidationClicked(ClickEvent event) + { + listener.runValidation(); + } @Override public void setStatsFilter(String option) diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml index 8174a6a788..103c59753f 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml @@ -70,6 +70,7 @@ + diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunValidationHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunValidationHandler.java index dee409ad61..4b5d750c59 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunValidationHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunValidationHandler.java @@ -20,13 +20,12 @@ import org.zanata.webtrans.shared.model.DocumentId; import org.zanata.webtrans.shared.model.TransUnit; import org.zanata.webtrans.shared.model.WorkspaceId; -import org.zanata.webtrans.shared.rpc.GetDocumentList; import org.zanata.webtrans.shared.rpc.RunValidationAction; import org.zanata.webtrans.shared.rpc.RunValidationResult; @Name("webtrans.gwt.RunValidationHandler") @Scope(ScopeType.STATELESS) -@ActionHandlerFor(GetDocumentList.class) +@ActionHandlerFor(RunValidationAction.class) public class RunValidationHandler extends AbstractActionHandler { @In diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java index e4cbdbef8a..51f6cc7f69 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentId.java @@ -4,7 +4,7 @@ public class DocumentId implements Identifier, IsSerializable { - private long id; + private Long id; private String docId; @@ -14,7 +14,7 @@ private DocumentId() { } - public DocumentId(long id, String docId) + public DocumentId(Long id, String docId) { this.id = id; this.docId = docId; @@ -29,7 +29,7 @@ public String toString() @Override public int hashCode() { - return (int) id; + return id.intValue(); } @Override @@ -38,7 +38,7 @@ public Long getValue() return id; } - public long getId() + public Long getId() { return id; } diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/RunValidationAction.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/RunValidationAction.java index c5141ef815..52be140ec8 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/RunValidationAction.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/RunValidationAction.java @@ -15,19 +15,26 @@ public class RunValidationAction extends AbstractWorkspaceAction validationIds; + private List docIds; @SuppressWarnings("unused") private RunValidationAction() { } - public RunValidationAction(List validationIds) + public RunValidationAction(List validationIds, List docIds) { this.validationIds = validationIds; + this.docIds = docIds; } public List getValidationIds() { return validationIds; } + + public List getDocIds() + { + return docIds; + } } diff --git a/zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java b/zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java index b8b3791cd0..5a190f06c8 100644 --- a/zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java +++ b/zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java @@ -156,7 +156,7 @@ public void testGetTextFlowByDocumentIdWithConstraint() { HLocale deLocale = getEm().find(HLocale.class, 3L); - List result = dao.getTextFlowByDocumentIdWithConstraint(new DocumentId(4, ""), deLocale, FilterConstraints.filterBy("mssg").excludeApproved().excludeFuzzy(), 0, 10); + List result = dao.getTextFlowByDocumentIdWithConstraint(new DocumentId(new Long(4), ""), deLocale, FilterConstraints.filterBy("mssg").excludeApproved().excludeFuzzy(), 0, 10); assertThat(result, Matchers.hasSize(1)); } diff --git a/zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java b/zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java index ff3770c482..59fe62d0ac 100644 --- a/zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java +++ b/zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java @@ -36,7 +36,7 @@ public class FilterConstraintToQueryTest private Query query; @Mock private HLocale hLocale; - private DocumentId documentId = new DocumentId(1, ""); + private DocumentId documentId = new DocumentId(new Long(1), ""); @BeforeMethod public void beforeMethod() diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java index daf7c0f17b..36f0d2bcb5 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java @@ -43,6 +43,7 @@ import org.zanata.webtrans.client.resources.WebTransMessages; import org.zanata.webtrans.client.rpc.CachingDispatchAsync; import org.zanata.webtrans.client.service.UserOptionsService; +import org.zanata.webtrans.client.service.ValidationService; import org.zanata.webtrans.client.ui.DocumentNode; import org.zanata.webtrans.client.view.DocumentListDisplay; import org.zanata.webtrans.shared.model.DocumentId; @@ -84,6 +85,8 @@ public class DocumentListPresenterTest @Mock private UserOptionsService mockUserOptionsService; @Mock + private ValidationService mockValidationService; + @Mock private CachingDispatchAsync mockDispatcher; private UserConfigHolder configHolder; @@ -113,7 +116,7 @@ public void beforeMethod() configHolder = new UserConfigHolder(); when(mockUserOptionsService.getConfigHolder()).thenReturn(configHolder); dataProviderList = new ArrayList(); - documentListPresenter = new DocumentListPresenter(mockDisplay, mockEventBus, mockDispatcher, mockUserWorkspaceContext, mockMessages, mockHistory, mockUserOptionsService); + documentListPresenter = new DocumentListPresenter(mockDisplay, mockEventBus, mockDispatcher, mockUserWorkspaceContext, mockMessages, mockHistory, mockUserOptionsService, mockValidationService); workspaceId = new WorkspaceId(new ProjectIterationId("projectSlug", "iterationSlug", ProjectType.Podir), LocaleId.EN_US); diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryPresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryPresenterTest.java index 6dff982086..251189bcbd 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryPresenterTest.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryPresenterTest.java @@ -190,7 +190,7 @@ public void fireCopyEvent() @Test public void fireSearchEvent() { - DocumentInfo docInfo = new DocumentInfo(new DocumentId(1, ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); userWorkspaceContext.setSelectedDoc(docInfo); when(messages.searchGlossary()).thenReturn("Search glossary"); @@ -213,7 +213,7 @@ public void fireSearchEvent() public void fireSearchEventInSequentialWillBlockSecondRequestUntilFirstReturn() { // Given: - DocumentInfo docInfo = new DocumentInfo(new DocumentId(1, ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); userWorkspaceContext.setSelectedDoc(docInfo); when(messages.searchGlossary()).thenReturn("Search glossary"); when(display.getGlossaryTextBox()).thenReturn(mockGlossaryTextBox); @@ -237,7 +237,7 @@ public void fireSearchEventInSequentialWillBlockSecondRequestUntilFirstReturn() @Test public void fireSearchEventOnSuccessCallbackWithGlossaryResults() { - DocumentInfo docInfo = new DocumentInfo(new DocumentId(1, ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); userWorkspaceContext.setSelectedDoc(docInfo); when(messages.searchGlossary()).thenReturn("Search glossary"); @@ -265,7 +265,7 @@ public void fireSearchEventOnSuccessCallbackWithGlossaryResults() @Test public void fireSearchEventOnSuccessCallbackButNoGlossaryFound() { - DocumentInfo docInfo = new DocumentInfo(new DocumentId(1, ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); userWorkspaceContext.setSelectedDoc(docInfo); when(messages.searchGlossary()).thenReturn("Search glossary"); @@ -291,7 +291,7 @@ public void fireSearchEventOnSuccessCallbackButNoGlossaryFound() @Test public void fireSearchEventOnFailureCallback() { - DocumentInfo docInfo = new DocumentInfo(new DocumentId(1, ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); userWorkspaceContext.setSelectedDoc(docInfo); when(messages.searchGlossary()).thenReturn("Search glossary"); @@ -315,7 +315,7 @@ public void fireSearchEventOnFailureCallback() @Test public void createGlossaryRequestForTransUnit() { - DocumentInfo docInfo = new DocumentInfo(new DocumentId(1, ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); userWorkspaceContext.setSelectedDoc(docInfo); when(messages.searchGlossary()).thenReturn("Search glossary"); when(display.getGlossaryTextBox()).thenReturn(mockGlossaryTextBox); diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java index 871b4dd977..1ed1420e1f 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java @@ -184,7 +184,7 @@ public void fireCopyEvent() public void createTMRequestForTransUnit() { WorkspaceId workspaceId = new WorkspaceId(new ProjectIterationId("projectSlug", "iterationSlug", ProjectType.Podir), LocaleId.EN_US); - DocumentInfo docInfo = new DocumentInfo(new DocumentId(1, ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); + DocumentInfo docInfo = new DocumentInfo(new DocumentId(new Long(1), ""), "test", "test/path", LocaleId.EN_US, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date()); when(display.getTmTextBox()).thenReturn(tMTextBox); when(tMTextBox.getText()).thenReturn("query"); @@ -209,7 +209,7 @@ public void willDoNothingIfAlreadyHaveSubmittedRequest() LocaleId localeId = new LocaleId("zh"); ProjectIterationId projectIterationId = new ProjectIterationId("project", "master", ProjectType.Podir); when(userWorkspaceContext.getWorkspaceContext()).thenReturn(new WorkspaceContext(new WorkspaceId(projectIterationId, localeId), "workspaceName", localeId.getId())); - when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(1, ""), "doc.txt", "/pot", new LocaleId("en-US"), new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())); + when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(new Long(1), ""), "doc.txt", "/pot", new LocaleId("en-US"), new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())); // When: presenter.createTMRequestForTransUnit(TestFixture.makeTransUnit(1)); @@ -254,7 +254,7 @@ public void canFireSearchEvent() ProjectIterationId projectIterationId = new ProjectIterationId("project", "master", ProjectType.Podir); when(userWorkspaceContext.getWorkspaceContext()).thenReturn(new WorkspaceContext(new WorkspaceId(projectIterationId, targetLocale), "workspaceName", targetLocale.getId())); LocaleId sourceLocale = new LocaleId("en-US"); - when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(1, ""), "doc.txt", "/pot", sourceLocale, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())); + when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(new Long(1), ""), "doc.txt", "/pot", sourceLocale, new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())); when(display.getTmTextBox()).thenReturn(tMTextBox); when(tMTextBox.getText()).thenReturn("search query"); when(display.getSearchType()).thenReturn(searchType); @@ -282,7 +282,7 @@ public void fireSearchEventCallbackOnFailure() LocaleId localeId = new LocaleId("zh"); ProjectIterationId projectIterationId = new ProjectIterationId("project", "master", ProjectType.Podir); when(userWorkspaceContext.getWorkspaceContext()).thenReturn(new WorkspaceContext(new WorkspaceId(projectIterationId, localeId), "workspaceName", localeId.getId())); - when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(1, ""), "doc.txt", "/pot", new LocaleId("en-US"), new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())); + when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(new Long(1), ""), "doc.txt", "/pot", new LocaleId("en-US"), new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())); when(display.getTmTextBox()).thenReturn(tMTextBox); when(display.getSearchType()).thenReturn(searchType); @@ -307,7 +307,7 @@ public void fireSearchEventCallbackOnSuccess() LocaleId localeId = new LocaleId("zh"); ProjectIterationId projectIterationId = new ProjectIterationId("project", "master", ProjectType.Podir); when(userWorkspaceContext.getWorkspaceContext()).thenReturn(new WorkspaceContext(new WorkspaceId(projectIterationId, localeId), "workspaceName", localeId.getId())); - when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(1, ""), "doc.txt", "/pot", new LocaleId("en-US"), new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())); + when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(new Long(1), ""), "doc.txt", "/pot", new LocaleId("en-US"), new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())); when(display.getTmTextBox()).thenReturn(tMTextBox); when(tMTextBox.getText()).thenReturn("search query"); when(display.getSearchType()).thenReturn(searchType); @@ -336,7 +336,7 @@ public void fireSearchEventCallbackOnSuccessButResultIsEmpty() LocaleId localeId = new LocaleId("zh"); ProjectIterationId projectIterationId = new ProjectIterationId("project", "master", ProjectType.Podir); when(userWorkspaceContext.getWorkspaceContext()).thenReturn(new WorkspaceContext(new WorkspaceId(projectIterationId, localeId), "workspaceName", localeId.getId())); - when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(1, ""), "doc.txt", "/pot", new LocaleId("en-US"), new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())); + when(userWorkspaceContext.getSelectedDoc()).thenReturn(new DocumentInfo(new DocumentId(new Long(1), ""), "doc.txt", "/pot", new LocaleId("en-US"), new TranslationStats(), "Translator", new Date(), new HashMap(), "last translator", new Date())); when(display.getTmTextBox()).thenReturn(tMTextBox); when(display.getSearchType()).thenReturn(searchType); when(searchType.getValue()).thenReturn(SearchType.FUZZY); diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java index d2ca5595cf..a6172d2bd8 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java @@ -44,7 +44,7 @@ public void execute() Log.info("ENTER DummyActivateWorkspaceCommand.execute()"); WorkspaceContext context = new WorkspaceContext(action.getWorkspaceId(), "Dummy Workspace", "Mock Sweedish"); UserWorkspaceContext userWorkspaceContext = new UserWorkspaceContext(context, true, true, true); - userWorkspaceContext.setSelectedDoc(new DocumentInfo(new DocumentId(1, "Dummy path/Dummy doc"), "Dummy doc", "Dummy path", LocaleId.EN_US, null, "Translator", new Date(), new HashMap(), "last translator", new Date())); + userWorkspaceContext.setSelectedDoc(new DocumentInfo(new DocumentId(new Long(1), "Dummy path/Dummy doc"), "Dummy doc", "Dummy path", LocaleId.EN_US, null, "Translator", new Date(), new HashMap(), "last translator", new Date())); Identity identity = new Identity(new EditorClientId("123456", 1), new Person(new PersonId("bob"), "Bob The Builder", "http://www.gravatar.com/avatar/bob@zanata.org?d=mm&s=16")); diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java index e51f2bdf23..98941a3925 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java @@ -49,19 +49,19 @@ private ArrayList generateTransUnitSampleData() extensions.put(".po", ""); ArrayList names = new ArrayList(); - names.add(new DocumentInfo(new DocumentId(0, ""), "name0", "", LocaleId.EN_US, newStats(0), "Translator", new Date(), extensions, "last translator", new Date())); - names.add(new DocumentInfo(new DocumentId(1, ""), "path1name1", "path/1", LocaleId.EN_US, newStats(1), "Translator", new Date(), extensions, "last translator", new Date())); - names.add(new DocumentInfo(new DocumentId(2, ""), "path1name2", "path/1", LocaleId.EN_US, newStats(2), "Translator", new Date(), extensions, "last translator", new Date())); - names.add(new DocumentInfo(new DocumentId(3, ""), "path2name1", "path/2", LocaleId.EN_US, newStats(3), "Translator", new Date(), extensions, "last translator", new Date())); - names.add(new DocumentInfo(new DocumentId(4, ""), "path2name2", "path/2", LocaleId.EN_US, newStats(4), "Translator", new Date(), extensions, "last translator", new Date())); - names.add(new DocumentInfo(new DocumentId(5, ""), "name2", "", LocaleId.EN_US, newStats(5), "Translator", new Date(), extensions, "last translator", new Date())); - names.add(new DocumentInfo(new DocumentId(6, ""), "name1", "", LocaleId.EN_US, newStats(6), "Translator", new Date(), extensions, "last translator", new Date())); - names.add(new DocumentInfo(new DocumentId(7, ""), "long name, a name which is really quite long, too wide to be displayed without scrolling (in most cases)", "", LocaleId.EN_US, newStats(7), "Translator", new Date(), extensions, "last translator", new Date())); - names.add(new DocumentInfo(new DocumentId(8, ""), "another long name, a name which is really quite long, too wide to be displayed without scrolling (in most cases)", "long path, a path which is, again, really quite long, and also too wide to be displayed without scrolling (in most cases)", LocaleId.EN_US, newStats(8), "Translator", new Date(), extensions, "last translator", new Date())); + names.add(new DocumentInfo(new DocumentId(new Long(0), ""), "name0", "", LocaleId.EN_US, newStats(0), "Translator", new Date(), extensions, "last translator", new Date())); + names.add(new DocumentInfo(new DocumentId(new Long(1), ""), "path1name1", "path/1", LocaleId.EN_US, newStats(1), "Translator", new Date(), extensions, "last translator", new Date())); + names.add(new DocumentInfo(new DocumentId(new Long(2), ""), "path1name2", "path/1", LocaleId.EN_US, newStats(2), "Translator", new Date(), extensions, "last translator", new Date())); + names.add(new DocumentInfo(new DocumentId(new Long(3), ""), "path2name1", "path/2", LocaleId.EN_US, newStats(3), "Translator", new Date(), extensions, "last translator", new Date())); + names.add(new DocumentInfo(new DocumentId(new Long(4), ""), "path2name2", "path/2", LocaleId.EN_US, newStats(4), "Translator", new Date(), extensions, "last translator", new Date())); + names.add(new DocumentInfo(new DocumentId(new Long(5), ""), "name2", "", LocaleId.EN_US, newStats(5), "Translator", new Date(), extensions, "last translator", new Date())); + names.add(new DocumentInfo(new DocumentId(new Long(6), ""), "name1", "", LocaleId.EN_US, newStats(6), "Translator", new Date(), extensions, "last translator", new Date())); + names.add(new DocumentInfo(new DocumentId(new Long(7), ""), "long name, a name which is really quite long, too wide to be displayed without scrolling (in most cases)", "", LocaleId.EN_US, newStats(7), "Translator", new Date(), extensions, "last translator", new Date())); + names.add(new DocumentInfo(new DocumentId(new Long(8), ""), "another long name, a name which is really quite long, too wide to be displayed without scrolling (in most cases)", "long path, a path which is, again, really quite long, and also too wide to be displayed without scrolling (in most cases)", LocaleId.EN_US, newStats(8), "Translator", new Date(), extensions, "last translator", new Date())); for (int n = 0; n < 100; n++) { // two digit numbers, to make sorting happier - names.add(new DocumentInfo(new DocumentId(n, ""), "multi" + n, "", + names.add(new DocumentInfo(new DocumentId(new Long(n), ""), "multi" + n, "", LocaleId.EN_US, newStats(n), "Translator", new Date(), extensions, "last translator", new Date())); } return names; diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetStatusCountCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetStatusCountCommand.java index e265c1ca8c..c57e79aa92 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetStatusCountCommand.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetStatusCountCommand.java @@ -27,7 +27,7 @@ public DummyGetStatusCountCommand(GetStatusCount action, AsyncCallback updatesToRevert = Lists.newArrayList(new TransUnitUpdateInfo(true, true, new DocumentId(1, ""), TestFixture.makeTransUnit(1), 0, 0, ContentState.Approved)); + List updatesToRevert = Lists.newArrayList(new TransUnitUpdateInfo(true, true, new DocumentId(new Long(1), ""), TestFixture.makeTransUnit(1), 0, 0, ContentState.Approved)); RevertTransUnitUpdates action = new RevertTransUnitUpdates(updatesToRevert); when(securityServiceImpl.checkPermission(action, SecurityService.TranslationAction.MODIFY)).thenReturn(checkResult); when(checkResult.getLocale()).thenReturn(new HLocale(LocaleId.EN_US));