From 9f030e52ffc494d5573c4dfb9634a422b8cb4c5b Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Fri, 30 Sep 2016 11:14:49 +1000 Subject: [PATCH] feat(TM details): Add editor url to TM results (#1301) https://zanata.atlassian.net/browse/ZNTA-448 --- .../eclipse/launch/webtrans-dummy.launch | 30 ---- .../impl/TranslationMemoryServiceImpl.java | 21 ++- .../TransMemoryDetailsPresenter.java | 4 +- .../view/TransMemoryDetailsDisplay.java | 2 + .../client/view/TransMemoryDetailsView.java | 14 ++ .../client/view/TransMemoryDetailsView.ui.xml | 7 +- .../shared/model/TransMemoryDetails.java | 9 +- zanata-war/src/main/webapp/WEB-INF/web.xml | 59 ------- ...CopyTransServiceImplParameterizedTest.java | 7 +- .../impl/CopyTransServiceImplTest.java | 4 + .../impl/TransMemoryMergeServiceImplTest.java | 2 +- .../service/impl/TranslationFinderTest.java | 8 + .../TranslationMemoryServiceImplTest.java | 8 + .../zanata/webtrans/ApplicationDummy.gwt.xml | 15 -- .../TransMemoryDetailsPresenterTest.java | 11 +- .../rpc/DummyActivateWorkspaceCommand.java | 77 --------- .../client/rpc/DummyDispatchAsync.java | 162 ------------------ .../rpc/DummyDownloadAllFilesCommand.java | 29 ---- .../DummyEventServiceConnectedCommand.java | 29 ---- .../client/rpc/DummyGetDocsListCommand.java | 128 -------------- ...mmyGetDownloadAllFilesProgressCommand.java | 31 ---- .../client/rpc/DummyGetGlossaryCommand.java | 40 ----- .../rpc/DummyGetGlossaryDetailsCommand.java | 47 ----- .../DummyGetTransMemoryDetailsCommand.java | 40 ----- .../client/rpc/DummyGetTransUnitCommand.java | 114 ------------ .../rpc/DummyGetTranslationMemoryCommand.java | 56 ------ .../rpc/DummyGetTranslatorListCommand.java | 43 ----- .../rpc/DummyPublishWorkspaceChatCommand.java | 25 --- .../rpc/DummyUpdateTransUnitCommand.java | 51 ------ .../rpc/GetTransMemoryDetailsHandlerTest.java | 3 + .../TransMemoryMergeStatusResolverTest.java | 2 +- 31 files changed, 87 insertions(+), 991 deletions(-) delete mode 100644 zanata-war/eclipse/launch/webtrans-dummy.launch delete mode 100644 zanata-war/src/main/webapp/WEB-INF/web.xml delete mode 100644 zanata-war/src/test/java/org/zanata/webtrans/ApplicationDummy.gwt.xml delete mode 100644 zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java delete mode 100644 zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java delete mode 100644 zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDownloadAllFilesCommand.java delete mode 100644 zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyEventServiceConnectedCommand.java delete mode 100644 zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java delete mode 100644 zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDownloadAllFilesProgressCommand.java delete mode 100644 zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryCommand.java delete mode 100644 zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryDetailsCommand.java delete mode 100644 zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java delete mode 100644 zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java delete mode 100644 zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java delete mode 100644 zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslatorListCommand.java delete mode 100644 zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyPublishWorkspaceChatCommand.java delete mode 100644 zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyUpdateTransUnitCommand.java diff --git a/zanata-war/eclipse/launch/webtrans-dummy.launch b/zanata-war/eclipse/launch/webtrans-dummy.launch deleted file mode 100644 index 84c1e7026a..0000000000 --- a/zanata-war/eclipse/launch/webtrans-dummy.launch +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java index e198e6fab8..f84452771c 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java @@ -68,6 +68,7 @@ import org.zanata.search.LevenshteinUtil; import org.zanata.service.TranslationMemoryService; import org.zanata.util.SysProperties; +import org.zanata.util.UrlUtil; import org.zanata.webtrans.shared.model.TransMemoryDetails; import org.zanata.webtrans.shared.model.TransMemoryQuery; import org.zanata.webtrans.shared.model.TransMemoryResultItem; @@ -131,6 +132,9 @@ public class TranslationMemoryServiceImpl implements TranslationMemoryService { @Inject @FullText private FullTextEntityManager entityManager; + @Inject + private UrlUtil urlUtil; + // sort desc by lastChanged of HTextFlowTarget private final Sort lastChangedSort = new Sort( SortField.FIELD_SCORE, @@ -153,9 +157,10 @@ public class TranslationMemoryServiceImpl implements TranslationMemoryService { getTransMemoryDetail(HLocale hLocale, HTextFlow tf) { HTextFlowTarget tft = tf.getTargets().get(hLocale.getId()); - String iterationName = tf.getDocument().getProjectIteration().getSlug(); - String projectName = - tf.getDocument().getProjectIteration().getProject().getName(); + HDocument document = tf.getDocument(); + HProjectIteration version = document.getProjectIteration(); + HProject project = version.getProject(); + String msgContext = (tf.getPotEntryData() == null) ? null : tf.getPotEntryData() .getContext(); @@ -164,10 +169,14 @@ public class TranslationMemoryServiceImpl implements TranslationMemoryService { && tft.getLastModifiedBy().hasAccount()) { username = tft.getLastModifiedBy().getAccount().getUsername(); } + String url = urlUtil.editorTransUnitUrl(project.getSlug(), + version.getSlug(), hLocale.getLocaleId(), + document.getSourceLocaleId(), document.getDocId(), tf.getId()); + return new TransMemoryDetails(HSimpleComment.toString(tf.getComment()), - HSimpleComment.toString(tft.getComment()), projectName, - iterationName, tf.getDocument().getDocId(), tf.getResId(), - msgContext, tft.getState(), username, tft.getLastChanged()); + HSimpleComment.toString(tft.getComment()), project.getName(), + version.getSlug(), tf.getDocument().getDocId(), tf.getResId(), + msgContext, tft.getState(), username, tft.getLastChanged(), url); } /** diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java index e3b978dd3f..2a7906cdc6 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java @@ -87,6 +87,7 @@ protected void selectDoc(int selected) { String iteration = ""; String doc = ""; String lastModifiedBy = ""; + String url = ""; Date lastModifiedDate = null; if (selected >= 0) { @@ -98,6 +99,7 @@ protected void selectDoc(int selected) { doc = item.getDocId(); lastModifiedBy = item.getLastModifiedBy(); lastModifiedDate = item.getLastModifiedDate(); + url = item.getUrl(); display.setState(item.getState()); } @@ -106,7 +108,7 @@ protected void selectDoc(int selected) { display.setProjectName(project); display.setVersionName(iteration); display.setDocumentName(doc); - + display.setUrl(url); display.setLastModified(lastModifiedBy, lastModifiedDate); } diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsDisplay.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsDisplay.java index 8552aef838..8913fe7077 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsDisplay.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsDisplay.java @@ -34,6 +34,8 @@ public interface TransMemoryDetailsDisplay extends WidgetDisplay { void setLastModified(String lastModifiedBy, Date lastModifiedDate); + void setUrl(String url); + void clearSourceAndTarget(); void setSource(List sourceContents); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java index ff167a0608..2f8fab464d 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java @@ -18,6 +18,7 @@ import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.uibinder.client.UiHandler; +import com.google.gwt.user.client.ui.Anchor; import com.google.gwt.user.client.ui.DialogBox; import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.InlineHTML; @@ -48,6 +49,9 @@ interface TMIUiBinder extends UiBinder { @UiField(provided = true) DialogBoxCloseButton closeButton; + @UiField + Anchor urlLink; + @UiField ListBox documentListBox; @UiField @@ -117,6 +121,16 @@ public void setLastModified(String lastModifiedBy, Date lastModifiedDate) { } } + @Override + public void setUrl(String url) { + urlLink.setHref(url); + if (Strings.isNullOrEmpty(url)) { + urlLink.addStyleName("is-hidden"); + } else { + urlLink.removeStyleName("is-hidden"); + } + } + @Override public void clearSourceAndTarget() { sourceTextContainer.clear(); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml index b6597067f9..448047e119 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml +++ b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml @@ -47,7 +47,12 @@ - + + Link to translation + + + diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java index 9e09de7859..4da5a1ace1 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java @@ -19,6 +19,7 @@ public class TransMemoryDetails implements IsSerializable { private ContentState state; private String lastModifiedBy; private Date lastModifiedDate; + private String url; @SuppressWarnings("unused") private TransMemoryDetails() { @@ -27,7 +28,7 @@ private TransMemoryDetails() { public TransMemoryDetails(String sourceComment, String targetComment, String projectName, String iterationName, String docId, String resId, String msgContext, ContentState state, - String lastModifiedBy, Date lastModifiedDate) { + String lastModifiedBy, Date lastModifiedDate, String url) { this.sourceComment = sourceComment; this.targetComment = targetComment; this.projectName = projectName; @@ -38,6 +39,7 @@ public TransMemoryDetails(String sourceComment, String targetComment, this.state = state; this.lastModifiedBy = lastModifiedBy; this.lastModifiedDate = lastModifiedDate; + this.url = url; } public String getSourceComment() { @@ -80,6 +82,10 @@ public Date getLastModifiedDate() { return lastModifiedDate; } + public String getUrl() { + return url; + } + @Override public String toString() { // @formatter:off @@ -94,6 +100,7 @@ public String toString() { add("state", state). add("lastModifiedBy", lastModifiedBy). add("lastModifiedDate", lastModifiedDate). + add("url", url). toString(); // @formatter:on } diff --git a/zanata-war/src/main/webapp/WEB-INF/web.xml b/zanata-war/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 2f74c8eb72..0000000000 --- a/zanata-war/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - Zanata WebTrans GWT Application (dummy mode) - - - MDCInsertingServletFilter - /* - - - - EventService - - de.novanic.eventservice.service.EventServiceImpl - - - - - EventService - /webtrans/gwteventservice - - - - remoteLoggerServiceImpl - com.allen_sauer.gwt.log.server.RemoteLoggerServiceImpl - - - remoteLoggerServiceImpl - /webtrans/gwt-log - - - - jUnitHostImpl - com.google.gwt.junit.server.JUnitHostImpl - - - jUnitHostImpl - /webtrans/junithost/* - - - - remoteLoggingService - com.google.gwt.logging.server.RemoteLoggingServiceImpl - - - remoteLoggingService - /webtrans/logging - - - - - /webtrans/Application.html - - - diff --git a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java index 663084cb48..8b5b5b2caa 100644 --- a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java +++ b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java @@ -71,6 +71,7 @@ import org.zanata.transaction.TransactionUtil; import org.zanata.ui.model.statistic.WordStatistic; import org.zanata.util.IServiceLocator; +import org.zanata.util.UrlUtil; import org.zanata.util.Zanata; import org.zanata.webtrans.shared.model.DocumentStatus; import org.zanata.webtrans.shared.model.ValidationId; @@ -112,7 +113,8 @@ VersionStateCacheImpl.class, TranslationStateCacheImpl.class, ValidationServiceImpl.class, - TransactionUtil.class + TransactionUtil.class, + UrlUtil.class }) public class CopyTransServiceImplParameterizedTest { @@ -136,6 +138,9 @@ public class CopyTransServiceImplParameterizedTest { @Produces @Mock @FullText FullTextEntityManager fullTextEntityManager; + @Produces @Mock + private UrlUtil urlUtil; + @Produces @Mock private CacheLoader documentStatisticLoader; diff --git a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java index f891eff010..dde9b89dbb 100644 --- a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java +++ b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java @@ -54,6 +54,7 @@ import org.zanata.test.CdiUnitRunner; import org.zanata.ui.model.statistic.WordStatistic; import org.zanata.util.IServiceLocator; +import org.zanata.util.UrlUtil; import org.zanata.util.Zanata; import org.zanata.webtrans.shared.model.DocumentStatus; import org.zanata.webtrans.shared.model.ValidationId; @@ -92,6 +93,9 @@ public class CopyTransServiceImplTest extends ZanataDbunitJpaTest { @Inject DocumentDAO documentDAO; @Inject CopyTransServiceImpl copyTransService; + @Produces @Mock + private UrlUtil urlUtil; + @Produces @Mock IServiceLocator serviceLocator; @Produces @Mock @FullText FullTextEntityManager fullTextEntityManager; diff --git a/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java index e8bdcc7a3c..57212ac657 100644 --- a/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java +++ b/zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java @@ -169,7 +169,7 @@ private static TransMemoryResultItem importedTmResult(Long sourceId, private static TransMemoryDetails tmDetail() { return new TransMemoryDetails("", "", "project a", "master", - "pot/msg.pot", "resId", null, null, null, null); + "pot/msg.pot", "resId", null, null, null, null, null); } private TransMemoryQuery diff --git a/zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java b/zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java index 65d81452c2..a269dc14a4 100644 --- a/zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java +++ b/zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java @@ -16,6 +16,7 @@ import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.mockito.Mock; import org.zanata.common.ContentType; import org.zanata.common.LocaleId; import org.zanata.dao.LocaleDAO; @@ -35,6 +36,7 @@ import org.zanata.test.ParamTestCdiExtension; import org.zanata.test.rule.DataSetOperation; import org.zanata.test.rule.JpaRule; +import org.zanata.util.UrlUtil; import org.zanata.util.Zanata; import javax.enterprise.inject.Produces; @@ -104,6 +106,9 @@ public static class TranslationFinderParameterizedTest { @Inject TranslationMemoryServiceImpl translationMemoryService; + @Produces @Mock + private UrlUtil urlUtil; + @Parameterized.Parameter(0) Execution execution; @@ -308,6 +313,9 @@ FullTextEntityManager getFullTextEntityManager() { return Search.getFullTextEntityManager(jpaRule.getEntityManager()); } + @Produces @Mock + private UrlUtil urlUtil; + @Produces @Zanata EntityManagerFactory getEntityManagerFactory() { return jpaRule.getEntityManagerFactory(); diff --git a/zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java index b0f475d64d..ae8594368f 100644 --- a/zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java +++ b/zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java @@ -19,6 +19,7 @@ import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.mockito.Mock; import org.zanata.common.LocaleId; import org.zanata.dao.LocaleDAO; import org.zanata.dao.TextFlowDAO; @@ -38,6 +39,7 @@ import org.zanata.test.ParamTestCdiExtension; import org.zanata.test.rule.DataSetOperation; import org.zanata.test.rule.JpaRule; +import org.zanata.util.UrlUtil; import org.zanata.util.Zanata; import org.zanata.webtrans.shared.model.TransMemoryDetails; import org.zanata.webtrans.shared.model.TransMemoryQuery; @@ -84,6 +86,9 @@ public static class TranslationMemoryServiceNonParameterizedTest { @Inject LocaleDAO localeDAO; + @Produces @Mock + private UrlUtil urlUtil; + @Produces @Zanata EntityManagerFactory getEntityManagerFactory() { return jpaRule.getEntityManagerFactory(); @@ -266,6 +271,9 @@ public static class TranslationMemoryServiceImplParameterizedTest { @Inject LocaleDAO localeDAO; + @Produces @Mock + private UrlUtil urlUtil; + @Produces @Zanata EntityManagerFactory getEntityManagerFactory() { return jpaRule.getEntityManagerFactory(); diff --git a/zanata-war/src/test/java/org/zanata/webtrans/ApplicationDummy.gwt.xml b/zanata-war/src/test/java/org/zanata/webtrans/ApplicationDummy.gwt.xml deleted file mode 100644 index 6e0a9591bd..0000000000 --- a/zanata-war/src/test/java/org/zanata/webtrans/ApplicationDummy.gwt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenterTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenterTest.java index 37205a1348..19e3fca6d0 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenterTest.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenterTest.java @@ -73,12 +73,13 @@ public void testShow() throws Exception { AbstractAsyncCallback callback = resultCaptor.getValue(); + String url = "http://localhost:8080"; Date lastModifiedDate = new Date(); // testing on callback success TransMemoryDetails details = new TransMemoryDetails("source comment", "target comment", "project", "iteration", "docId", "resId", "msgContext", - ContentState.Approved, "admin", lastModifiedDate); + ContentState.Approved, "admin", lastModifiedDate, url); callback.onSuccess(new TransMemoryDetailsList(Lists .newArrayList(details))); @@ -97,6 +98,7 @@ public void testShow() throws Exception { verify(display).setVersionName("iteration"); verify(display).setDocumentName("docId"); verify(display).setLastModified("admin", lastModifiedDate); + verify(display).setUrl(url); inOrder.verify(display).center(); } @@ -111,15 +113,17 @@ public void testDismissTransMemoryDetails() throws Exception { @Test public void testOnDocumentListBoxChanged() throws Exception { Date lastModifiedDate = new Date(); + String url = "http://localhost:8080/zanta"; + // Given: two details TransMemoryDetails details1 = new TransMemoryDetails("source comment1", "target comment1", "project", "1", "docId1", "resId", "msgContext", - ContentState.Approved, "admin", lastModifiedDate); + ContentState.Approved, "admin", lastModifiedDate, url); TransMemoryDetails details2 = new TransMemoryDetails("source comment2", "target comment2", "project", "2", "docId2", "resId", "msgContext", - ContentState.Approved, null, lastModifiedDate); + ContentState.Approved, null, lastModifiedDate, url); presenter.setStatForTesting(new TransMemoryDetailsList(Lists .newArrayList(details1, details2))); @@ -134,5 +138,6 @@ public void testOnDocumentListBoxChanged() throws Exception { verify(display).setVersionName("2"); verify(display).setDocumentName("docId2"); verify(display).setLastModified(null, lastModifiedDate); + verify(display).setUrl(url); } } 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 deleted file mode 100644 index 503aba7bc6..0000000000 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.zanata.webtrans.client.rpc; - -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - -import org.zanata.common.LocaleId; -import org.zanata.webtrans.client.presenter.UserConfigHolder; -import org.zanata.webtrans.shared.auth.EditorClientId; -import org.zanata.webtrans.shared.auth.Identity; -import org.zanata.webtrans.shared.model.AuditInfo; -import org.zanata.webtrans.shared.model.DocumentId; -import org.zanata.webtrans.shared.model.DocumentInfo; -import org.zanata.webtrans.shared.model.Person; -import org.zanata.webtrans.shared.model.PersonId; -import org.zanata.webtrans.shared.model.UserWorkspaceContext; -import org.zanata.webtrans.shared.model.ValidationAction; -import org.zanata.webtrans.shared.model.ValidationAction.State; -import org.zanata.webtrans.shared.model.ValidationId; -import org.zanata.webtrans.shared.model.WorkspaceContext; -import org.zanata.webtrans.shared.model.WorkspaceRestrictions; -import org.zanata.webtrans.shared.rpc.ActivateWorkspaceAction; -import org.zanata.webtrans.shared.rpc.ActivateWorkspaceResult; -import org.zanata.webtrans.shared.validation.ValidationFactory; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.rpc.AsyncCallback; - -public class DummyActivateWorkspaceCommand implements Command { - - private final ActivateWorkspaceAction action; - private final AsyncCallback callback; - - public DummyActivateWorkspaceCommand(ActivateWorkspaceAction gwcAction, - AsyncCallback gwcCallback) { - this.action = gwcAction; - this.callback = gwcCallback; - } - - @Override - public void execute() { - Log.info("ENTER DummyActivateWorkspaceCommand.execute()"); - WorkspaceContext context = - new WorkspaceContext(action.getWorkspaceId(), - "Dummy Workspace", "Mock Sweedish"); - WorkspaceRestrictions workspaceRestrictions = - new WorkspaceRestrictions(true, false, true, true, true); - UserWorkspaceContext userWorkspaceContext = - new UserWorkspaceContext(context, workspaceRestrictions); - userWorkspaceContext.setSelectedDoc(new DocumentInfo(new DocumentId( - new Long(1), "Dummy path/Dummy doc"), "Dummy doc", - "Dummy path", LocaleId.EN_US, null, new AuditInfo(new Date(), - "Translator"), new HashMap(), - new AuditInfo(new Date(), "last translator"))); - - 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")); - - ValidationFactory validationFactory = new ValidationFactory(null); - Map validationMap = - validationFactory.getAllValidationActions(); - Map validationStates = - new HashMap(); - - for (ValidationAction action : validationMap.values()) { - validationStates.put(action.getId(), action.getState()); - } - - callback.onSuccess(new ActivateWorkspaceResult(userWorkspaceContext, - identity, new UserConfigHolder().getState(), validationStates)); - Log.info("EXIT DummyActivateWorkspaceCommand.execute()"); - } -} diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java deleted file mode 100644 index 1451be538a..0000000000 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java +++ /dev/null @@ -1,162 +0,0 @@ -package org.zanata.webtrans.client.rpc; - -import net.customware.gwt.dispatch.shared.Action; -import net.customware.gwt.dispatch.shared.Result; - -import org.zanata.webtrans.shared.auth.AuthorizationError; -import org.zanata.webtrans.shared.rpc.AbstractWorkspaceAction; -import org.zanata.webtrans.shared.rpc.ActivateWorkspaceAction; -import org.zanata.webtrans.shared.rpc.ActivateWorkspaceResult; -import org.zanata.webtrans.shared.rpc.DownloadAllFilesAction; -import org.zanata.webtrans.shared.rpc.DownloadAllFilesResult; -import org.zanata.webtrans.shared.rpc.EventServiceConnectedAction; -import org.zanata.webtrans.shared.rpc.GetDocumentList; -import org.zanata.webtrans.shared.rpc.GetDocumentListResult; -import org.zanata.webtrans.shared.rpc.GetDownloadAllFilesProgress; -import org.zanata.webtrans.shared.rpc.GetDownloadAllFilesProgressResult; -import org.zanata.webtrans.shared.rpc.GetGlossary; -import org.zanata.webtrans.shared.rpc.GetGlossaryDetailsAction; -import org.zanata.webtrans.shared.rpc.GetGlossaryDetailsResult; -import org.zanata.webtrans.shared.rpc.GetGlossaryResult; -import org.zanata.webtrans.shared.rpc.GetTransMemoryDetailsAction; -import org.zanata.webtrans.shared.rpc.GetTransUnitList; -import org.zanata.webtrans.shared.rpc.GetTransUnitListResult; -import org.zanata.webtrans.shared.rpc.GetTranslationMemory; -import org.zanata.webtrans.shared.rpc.GetTranslationMemoryResult; -import org.zanata.webtrans.shared.rpc.GetTranslatorList; -import org.zanata.webtrans.shared.rpc.GetTranslatorListResult; -import org.zanata.webtrans.shared.rpc.NoOpResult; -import org.zanata.webtrans.shared.rpc.TransMemoryDetailsList; -import org.zanata.webtrans.shared.rpc.UpdateTransUnit; -import org.zanata.webtrans.shared.rpc.UpdateTransUnitResult; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.core.client.Scheduler; -import com.google.gwt.user.client.rpc.AsyncCallback; - -public class DummyDispatchAsync extends SeamDispatchAsync { - public DummyDispatchAsync() { - Log.info("DummyDispatchAsync()"); - } - - @SuppressWarnings("unchecked") - @Override - public , R extends Result> void execute(A action, - AsyncCallback callback) { - - if (action instanceof AbstractWorkspaceAction) { - if (this.userWorkspaceContext == null || this.identity == null) { - callback.onFailure(new AuthorizationError( - "Dispatcher not initialized for WorkspaceActions")); - return; - } - AbstractWorkspaceAction wsAction = - (AbstractWorkspaceAction) action; - wsAction.setWorkspaceId(this.userWorkspaceContext - .getWorkspaceContext().getWorkspaceId()); - wsAction.setEditorClientId(this.identity.getEditorClientId()); - } - - if (action instanceof GetTransUnitList) { - GetTransUnitList gtuAction = (GetTransUnitList) action; - AsyncCallback gtuCallback = - (AsyncCallback) callback; - Scheduler.get().scheduleDeferred( - new DummyGetTransUnitCommand(gtuAction, gtuCallback)); - } else if (action instanceof GetDocumentList) { - final GetDocumentList gdlAction = (GetDocumentList) action; - AsyncCallback gdlCallback = - (AsyncCallback) callback; - Scheduler.get().scheduleDeferred( - new DummyGetDocsListCommand(gdlAction, gdlCallback)); - } else if (action instanceof ActivateWorkspaceAction) { - final ActivateWorkspaceAction gwcAction = - (ActivateWorkspaceAction) action; - AsyncCallback gwcCallback = - (AsyncCallback) callback; - Scheduler.get().scheduleDeferred( - new DummyActivateWorkspaceCommand(gwcAction, gwcCallback)); - } else if (action instanceof GetTranslatorList) { - final GetTranslatorList _action = (GetTranslatorList) action; - AsyncCallback _callback = - (AsyncCallback) callback; - Scheduler.get().scheduleDeferred( - new DummyGetTranslatorListCommand(_action, _callback)); - } else if (action instanceof GetTranslationMemory) { - final GetTranslationMemory _action = (GetTranslationMemory) action; - AsyncCallback _callback = - (AsyncCallback) callback; - Scheduler.get().scheduleDeferred( - new DummyGetTranslationMemoryCommand(_action, _callback)); - } else if (action instanceof GetGlossary) { - final GetGlossary _action = (GetGlossary) action; - AsyncCallback _callback = - (AsyncCallback) callback; - Scheduler.get().scheduleDeferred( - new DummyGetGlossaryCommand(_action, _callback)); - } else if (action instanceof UpdateTransUnit) { - final UpdateTransUnit _action = (UpdateTransUnit) action; - AsyncCallback _callback = - (AsyncCallback) callback; - Scheduler.get().scheduleDeferred( - new DummyUpdateTransUnitCommand(_action, _callback)); - } else if (action instanceof GetTransMemoryDetailsAction) { - final GetTransMemoryDetailsAction _action = - (GetTransMemoryDetailsAction) action; - AsyncCallback _callback = - (AsyncCallback) callback; - Scheduler.get().scheduleDeferred( - new DummyGetTransMemoryDetailsCommand(_action, _callback)); - } else if (action instanceof GetGlossaryDetailsAction) { - final GetGlossaryDetailsAction _action = - (GetGlossaryDetailsAction) action; - AsyncCallback _callback = - (AsyncCallback) callback; - Scheduler.get().scheduleDeferred( - new DummyGetGlossaryDetailsCommand(_action, _callback)); - } else if (action instanceof NoOpResult) { - final NoOpResult _action = (NoOpResult) action; - AsyncCallback _callback = - (AsyncCallback) callback; - Scheduler.get().scheduleDeferred( - new DummyPublishWorkspaceChatCommand(_callback)); - } else if (action instanceof EventServiceConnectedAction) { - final EventServiceConnectedAction _action = - (EventServiceConnectedAction) action; - AsyncCallback _callback = - (AsyncCallback) callback; - Scheduler.get().scheduleDeferred( - new DummyEventServiceConnectedCommand(_action, _callback)); - } else if (action instanceof DownloadAllFilesAction) { - final DownloadAllFilesAction _action = - (DownloadAllFilesAction) action; - AsyncCallback _callback = - (AsyncCallback) callback; - Scheduler.get().scheduleDeferred( - new DummyDownloadAllFilesCommand(_action, _callback)); - } else if (action instanceof GetDownloadAllFilesProgress) { - final GetDownloadAllFilesProgress _action = - (GetDownloadAllFilesProgress) action; - AsyncCallback _callback = - (AsyncCallback) callback; - Scheduler.get().scheduleDeferred( - new DummyGetDownloadAllFilesProgressCommand(_action, - _callback)); - - // else if (action instanceof GetTransUnitsNavigation) - // { - // final GetTransUnitsNavigation _action = (GetTransUnitsNavigation) - // action; - // AsyncCallback _callback = - // (AsyncCallback) callback; - // Scheduler.get().scheduleDeferred(new - // DummyGetTransUnitsNavigationCommand(_action, _callback)); - // } - } else { - Log.warn("DummyDispatchAsync: ignoring action of " - + action.getClass()); - // callback.onFailure(new RuntimeException()); - } - } - -} diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDownloadAllFilesCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDownloadAllFilesCommand.java deleted file mode 100644 index d9c47308b1..0000000000 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDownloadAllFilesCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.zanata.webtrans.client.rpc; - -import org.zanata.webtrans.shared.rpc.DownloadAllFilesAction; -import org.zanata.webtrans.shared.rpc.DownloadAllFilesResult; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.rpc.AsyncCallback; - -public class DummyDownloadAllFilesCommand implements Command { - - private final DownloadAllFilesAction action; - private final AsyncCallback callback; - - public DummyDownloadAllFilesCommand(DownloadAllFilesAction gwcAction, - AsyncCallback gwcCallback) { - this.action = gwcAction; - this.callback = gwcCallback; - } - - @Override - public void execute() { - Log.info("ENTER DummyDownloadAllFilesCommand.execute()"); - - callback.onSuccess(new DownloadAllFilesResult(true, "dummyId")); - Log.info("EXIT DummyDownloadAllFilesCommand.execute()"); - } - -} diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyEventServiceConnectedCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyEventServiceConnectedCommand.java deleted file mode 100644 index 30aa1a4ea8..0000000000 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyEventServiceConnectedCommand.java +++ /dev/null @@ -1,29 +0,0 @@ -/** - * - */ -package org.zanata.webtrans.client.rpc; - -import org.zanata.webtrans.shared.rpc.EventServiceConnectedAction; -import org.zanata.webtrans.shared.rpc.NoOpResult; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.rpc.AsyncCallback; - -final class DummyEventServiceConnectedCommand implements Command { - private final EventServiceConnectedAction action; - private final AsyncCallback callback; - - DummyEventServiceConnectedCommand(EventServiceConnectedAction gtuAction, - AsyncCallback callback) { - this.action = gtuAction; - this.callback = callback; - } - - @Override - public void execute() { - Log.info("ENTER DummyEventServiceConnectedCommand.execute()"); - callback.onSuccess(new NoOpResult()); - Log.info("EXIT DummyEventServiceConnectedCommand.execute()"); - } -} 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 deleted file mode 100644 index bba56c1f38..0000000000 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java +++ /dev/null @@ -1,128 +0,0 @@ -/** - * - */ -package org.zanata.webtrans.client.rpc; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; - -import org.zanata.common.ContentState; -import org.zanata.common.LocaleId; -import org.zanata.common.TransUnitCount; -import org.zanata.common.TransUnitWords; -import org.zanata.rest.dto.stats.ContainerTranslationStatistics; -import org.zanata.rest.dto.stats.TranslationStatistics; -import org.zanata.webtrans.shared.model.AuditInfo; -import org.zanata.webtrans.shared.model.DocumentId; -import org.zanata.webtrans.shared.model.DocumentInfo; -import org.zanata.webtrans.shared.model.ProjectIterationId; -import org.zanata.webtrans.shared.rpc.GetDocumentList; -import org.zanata.webtrans.shared.rpc.GetDocumentListResult; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.rpc.AsyncCallback; - -final class DummyGetDocsListCommand implements Command { - private final GetDocumentList action; - private final AsyncCallback callback; - - DummyGetDocsListCommand(GetDocumentList gtuAction, - AsyncCallback callback) { - this.action = gtuAction; - this.callback = callback; - } - - @Override - public void execute() { - Log.info("ENTER DummyGetDocsListCommand.execute()"); - ProjectIterationId projectIterationId = - action.getWorkspaceId().getProjectIterationId(); - GetDocumentListResult result = - new GetDocumentListResult(projectIterationId, - generateTransUnitSampleData()); - callback.onSuccess(result); - Log.info("EXIT DummyGetDocsListCommand.execute()"); - } - - private ArrayList generateTransUnitSampleData() { - HashMap extensions = new HashMap(); - extensions.put(".po", ""); - - ArrayList names = new ArrayList(); - names.add(new DocumentInfo(new DocumentId(new Long(0), ""), "name0", - "", LocaleId.EN_US, newStats(0), new AuditInfo(new Date(), - "Translator"), extensions, new AuditInfo(new Date(), - "last translator"))); - names.add(new DocumentInfo(new DocumentId(new Long(1), ""), - "path1name1", "path/1", LocaleId.EN_US, newStats(1), - new AuditInfo(new Date(), "Translator"), extensions, - new AuditInfo(new Date(), "last translator"))); - names.add(new DocumentInfo(new DocumentId(new Long(2), ""), - "path1name2", "path/1", LocaleId.EN_US, newStats(2), - new AuditInfo(new Date(), "Translator"), extensions, - new AuditInfo(new Date(), "last translator"))); - names.add(new DocumentInfo(new DocumentId(new Long(3), ""), - "path2name1", "path/2", LocaleId.EN_US, newStats(3), - new AuditInfo(new Date(), "Translator"), extensions, - new AuditInfo(new Date(), "last translator"))); - names.add(new DocumentInfo(new DocumentId(new Long(4), ""), - "path2name2", "path/2", LocaleId.EN_US, newStats(4), - new AuditInfo(new Date(), "Translator"), extensions, - new AuditInfo(new Date(), "last translator"))); - names.add(new DocumentInfo(new DocumentId(new Long(5), ""), "name2", - "", LocaleId.EN_US, newStats(5), new AuditInfo(new Date(), - "Translator"), extensions, new AuditInfo(new Date(), - "last translator"))); - names.add(new DocumentInfo(new DocumentId(new Long(6), ""), "name1", - "", LocaleId.EN_US, newStats(6), new AuditInfo(new Date(), - "Translator"), extensions, new AuditInfo(new Date(), - "last translator"))); - 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), new AuditInfo(new Date(), - "Translator"), extensions, new AuditInfo(new Date(), - "last translator"))); - 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), new AuditInfo(new Date(), - "Translator"), extensions, new AuditInfo(new Date(), - "last translator"))); - for (int n = 0; n < 100; n++) { - // two digit numbers, to make sorting happier - names.add(new DocumentInfo(new DocumentId(new Long(n), ""), "multi" - + n, "", LocaleId.EN_US, newStats(n), new AuditInfo( - new Date(), "Translator"), extensions, new AuditInfo( - new Date(), "last translator"))); - } - return names; - } - - private ContainerTranslationStatistics newStats(int docID) { - TransUnitCount count = new TransUnitCount(); - count.set(ContentState.Approved, 34 * docID); - count.set(ContentState.NeedReview, 23 * docID); - count.set(ContentState.New, 43 * docID); - - TransUnitWords words = new TransUnitWords(); - words.set(ContentState.Approved, 70 * docID); - words.set(ContentState.NeedReview, 40 * docID); - words.set(ContentState.New, 90 * docID); - - TranslationStatistics msgStats = - new TranslationStatistics(count, LocaleId.EN_US.toString()); - TranslationStatistics wordStats = - new TranslationStatistics(words, LocaleId.EN_US.toString()); - - ContainerTranslationStatistics result = - new ContainerTranslationStatistics(); - result.addStats(msgStats); - result.addStats(wordStats); - return result; - } - -} diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDownloadAllFilesProgressCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDownloadAllFilesProgressCommand.java deleted file mode 100644 index c3136da180..0000000000 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDownloadAllFilesProgressCommand.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.zanata.webtrans.client.rpc; - -import org.zanata.webtrans.shared.rpc.GetDownloadAllFilesProgress; -import org.zanata.webtrans.shared.rpc.GetDownloadAllFilesProgressResult; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.rpc.AsyncCallback; - -public class DummyGetDownloadAllFilesProgressCommand implements Command { - - private final GetDownloadAllFilesProgress action; - private final AsyncCallback callback; - - public DummyGetDownloadAllFilesProgressCommand( - GetDownloadAllFilesProgress gwcAction, - AsyncCallback gwcCallback) { - this.action = gwcAction; - this.callback = gwcCallback; - } - - @Override - public void execute() { - Log.info("ENTER DummyGetDownloadAllFilesProgressCommand.execute()"); - - callback.onSuccess(new GetDownloadAllFilesProgressResult(100, 100, - "dummyId")); - Log.info("EXIT DummyGetDownloadAllFilesProgressCommand.execute()"); - } - -} diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryCommand.java deleted file mode 100644 index a145dfa655..0000000000 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryCommand.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.zanata.webtrans.client.rpc; - -import java.util.ArrayList; - -import org.zanata.webtrans.shared.model.GlossaryResultItem; -import org.zanata.webtrans.shared.rpc.GetGlossary; -import org.zanata.webtrans.shared.rpc.GetGlossaryResult; -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.rpc.AsyncCallback; - -public class DummyGetGlossaryCommand implements Command { - - private final GetGlossary action; - private final AsyncCallback callback; - - public DummyGetGlossaryCommand(GetGlossary action, - AsyncCallback callback) { - this.action = action; - this.callback = callback; - } - - @Override - public void execute() { - Log.info("ENTER DummyGetGlossaryCommand.execute()"); - ArrayList matches = - new ArrayList(); - matches.add(new GlossaryResultItem("qualifiedName", "source1", - " <suggestion 3", 3, 100)); - matches.add(new GlossaryResultItem("qualifiedName", "source1", - " <suggestion 3", 3, 100)); - matches.add(new GlossaryResultItem("qualifiedName", "source1", - " <suggestion 3", 3, 100)); - matches.add(new GlossaryResultItem("qualifiedName", "source1", - " <suggestion 3", 3, 100)); - callback.onSuccess(new GetGlossaryResult(action, matches)); - Log.info("EXIT DummyGetGlossaryCommand.execute()"); - } - -} diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryDetailsCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryDetailsCommand.java deleted file mode 100644 index c74e2313d8..0000000000 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryDetailsCommand.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.zanata.webtrans.client.rpc; - -import java.util.ArrayList; -import java.util.Date; - -import org.zanata.common.LocaleId; -import org.zanata.webtrans.shared.model.GlossaryDetails; -import org.zanata.webtrans.shared.rpc.GetGlossaryDetailsAction; -import org.zanata.webtrans.shared.rpc.GetGlossaryDetailsResult; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.rpc.AsyncCallback; - -public class DummyGetGlossaryDetailsCommand implements Command { - - private final AsyncCallback callback; - private final GetGlossaryDetailsAction action; - - DummyGetGlossaryDetailsCommand(GetGlossaryDetailsAction action, - AsyncCallback callback) { - this.callback = callback; - this.action = action; - } - - @Override - public void execute() { - Log.info("ENTER DummyGetGlossaryDetailsCommand.execute()"); - ArrayList items = new ArrayList(); - for (int i = 0; i < 4; i++) { - String description = "Description " + i; - String targetComment = "Target comment " + i; - GlossaryDetails details = - new GlossaryDetails(1L, "source content:" + (i + 1), - "target content:" + (i + 1), description, "pos", - targetComment, "Dummy source ref " + (i + 1), - new LocaleId("en-us"), action.getWorkspaceId() - .getLocaleId(), - "url", i, new Date()); - items.add(details); - } - - callback.onSuccess(new GetGlossaryDetailsResult(items)); - Log.info("EXIT DummyGetGlossaryDetailsCommand.execute()"); - - } -} diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java deleted file mode 100644 index 9246fd6c52..0000000000 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.zanata.webtrans.client.rpc; - -import java.util.ArrayList; -import java.util.Date; - -import org.zanata.common.ContentState; -import org.zanata.webtrans.shared.model.TransMemoryDetails; -import org.zanata.webtrans.shared.rpc.GetTransMemoryDetailsAction; -import org.zanata.webtrans.shared.rpc.TransMemoryDetailsList; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.rpc.AsyncCallback; - -public class DummyGetTransMemoryDetailsCommand implements Command { - - private final AsyncCallback callback; - - DummyGetTransMemoryDetailsCommand(GetTransMemoryDetailsAction action, - AsyncCallback callback) { - this.callback = callback; - } - - @Override - public void execute() { - Log.info("ENTER DummyGetTransMemoryDetailsCommand.execute()"); - ArrayList items = - new ArrayList(); - for (int i = 0; i < 4; i++) { - items.add(new TransMemoryDetails("source " + i + " comment", - "target " + i + " comment", "workspace " + i, "iteration " - + i, "doc id:" + +i, "resId", "msgContext", - ContentState.Approved, "Bob", new Date())); - } - - callback.onSuccess(new TransMemoryDetailsList(items)); - Log.info("EXIT DummyGetTransMemoryDetailsCommand.execute()"); - - } -} diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java deleted file mode 100644 index 1db9f860e8..0000000000 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java +++ /dev/null @@ -1,114 +0,0 @@ -/** - * - */ -package org.zanata.webtrans.client.rpc; - -import java.util.ArrayList; -import java.util.HashMap; - -import org.zanata.common.ContentState; -import org.zanata.common.LocaleId; -import org.zanata.webtrans.shared.model.DocumentId; -import org.zanata.webtrans.shared.model.TransUnit; -import org.zanata.webtrans.shared.model.TransUnitId; -import org.zanata.webtrans.shared.rpc.GetTransUnitList; -import org.zanata.webtrans.shared.rpc.GetTransUnitListResult; -import org.zanata.webtrans.shared.rpc.GetTransUnitsNavigationResult; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.Random; -import com.google.gwt.user.client.rpc.AsyncCallback; - -final class DummyGetTransUnitCommand implements Command { - private final GetTransUnitList action; - private final AsyncCallback callback; - - DummyGetTransUnitCommand(GetTransUnitList gtuAction, - AsyncCallback callback) { - this.action = gtuAction; - this.callback = callback; - } - - @Override - public void execute() { - Log.info("ENTER DummyGetTransUnitCommand.execute()"); - DocumentId documentId = action.getDocumentId(); - int count = action.getCount(); - int offset = action.getOffset(); - int totalCount = count * 5; - - ArrayList data = - generateTransUnitSampleData(action.getWorkspaceId() - .getLocaleId(), count, offset); - GetTransUnitListResult result = - new GetTransUnitListResult(documentId, data, 1, offset, offset - / count); - - ArrayList idIndexList = new ArrayList(); - HashMap transIdStateMap = - new HashMap(); - - for (TransUnit tu : data) { - idIndexList.add(tu.getId()); - transIdStateMap.put(tu.getId(), tu.getStatus()); - } - - result.setNavigationIndex(new GetTransUnitsNavigationResult( - idIndexList, transIdStateMap)); - - callback.onSuccess(result); - Log.info("EXIT DummyGetTransUnitCommand.execute()"); - } - - private ArrayList generateTransUnitSampleData(LocaleId localeId, - int numRows, int start) { - ArrayList units = new ArrayList(); - for (int i = start; i < start + numRows; i++) { - boolean plural = (i % 5 == 0); - int stateNum = Random.nextInt(ContentState.values().length); - ContentState state = ContentState.values()[stateNum]; - ArrayList sources = new ArrayList(); - ArrayList targets = new ArrayList(); - - sources.add(i % 2 == 0 ? "\n %s\n" - : "\n %s & &RHEL; "looooooooooooooooooooooooooooooooooooooonggggggggggggggggggggggggggggggggggggstringgggggggggggggggggggggggggggggggggggggg"); - if (plural) { - sources.add(i % 2 == 0 ? "\n %s\n" - : "\n %s & &RHEL; "looooooooooooooooooooooooooooooooooooooonggggggggggggggggggggggggggggggggggggstringgggggggggggggggggggggggggggggggggggggg"); - } - String sourceComment = "comment " + (i + 1); - - if (state != ContentState.New) { - targets.add(" \"" + (i + 1) + "\""); - if (plural) { - targets.add(" \"" + (i + 2) + "\""); - } - } - - TransUnitId tuid = new TransUnitId(i + 1); - TransUnit.Builder builder = - TransUnit.Builder.newTransUnitBuilder().setId(tuid) - .setResId(tuid.toString()).setLocaleId(localeId) - .setPlural(plural).setSources(sources) - .setSourceComment(sourceComment) - .setTargets(targets).setStatus(state) - .setLastModifiedBy("peter") - .setMsgContext("msgContext") - .setSourceRefs("srcRef") - .setSourceFlags("srcFlag") - .setRowIndex(i) - .setVerNum(1); - - units.add(builder.build()); - } - return units; - } - -} diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java deleted file mode 100644 index 80bb5bd7e8..0000000000 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.zanata.webtrans.client.rpc; - -import java.util.ArrayList; - -import org.zanata.webtrans.shared.model.TransMemoryResultItem; -import org.zanata.webtrans.shared.rpc.GetTranslationMemory; -import org.zanata.webtrans.shared.rpc.GetTranslationMemoryResult; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.rpc.AsyncCallback; - -import static org.zanata.webtrans.shared.model.TransMemoryResultItem.MatchType.ApprovedInternal; -import static org.zanata.webtrans.shared.model.TransMemoryResultItem.MatchType.TranslatedInternal; - -public class DummyGetTranslationMemoryCommand implements Command { - - private final GetTranslationMemory action; - private final AsyncCallback callback; - - public DummyGetTranslationMemoryCommand(GetTranslationMemory action, - AsyncCallback callback) { - this.action = action; - this.callback = callback; - } - - @Override - public void execute() { - Log.info("ENTER DummyGetTranslationMemoryCommand.execute()"); - ArrayList matches = - new ArrayList(); - ArrayList source = new ArrayList(); - source.add("source1"); - source.add("source2"); - ArrayList target1 = new ArrayList(); - target1.add(" <target1"); - target1.add(" <target1-1"); - ArrayList target2 = new ArrayList(); - target2.add(" <target2"); - ArrayList target3 = new ArrayList(); - target3.add(" <target3"); - ArrayList target4 = new ArrayList(); - target4.add(" <target4"); - matches.add(new TransMemoryResultItem(source, target1, - ApprovedInternal, 3, 85)); - matches.add(new TransMemoryResultItem(source, target2, - ApprovedInternal, 3, 85)); - matches.add(new TransMemoryResultItem(source, target3, - TranslatedInternal, 3, 85)); - matches.add(new TransMemoryResultItem(source, target4, - TranslatedInternal, 3, 85)); - callback.onSuccess(new GetTranslationMemoryResult(action, matches)); - Log.info("EXIT DummyGetTranslationMemoryCommand.execute()"); - } - -} diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslatorListCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslatorListCommand.java deleted file mode 100644 index ef015f6933..0000000000 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslatorListCommand.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.zanata.webtrans.client.rpc; - -import java.util.HashMap; - -import org.zanata.webtrans.shared.auth.EditorClientId; -import org.zanata.webtrans.shared.model.Person; -import org.zanata.webtrans.shared.model.PersonId; -import org.zanata.webtrans.shared.model.PersonSessionDetails; -import org.zanata.webtrans.shared.rpc.GetTranslatorList; -import org.zanata.webtrans.shared.rpc.GetTranslatorListResult; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.rpc.AsyncCallback; - -public class DummyGetTranslatorListCommand implements Command { - private final AsyncCallback callback; - - public DummyGetTranslatorListCommand(GetTranslatorList action, - AsyncCallback callback) { - this.callback = callback; - } - - @Override - public void execute() { - Log.info("ENTER DummyGetTranslatorListCommand.execute()"); - - HashMap translator = - new HashMap(); - translator - .put(new EditorClientId("dummySession", 1), - new PersonSessionDetails( - new Person( - new PersonId("personID"), - "Some Person with an Incredibly Long Name", - "http://www.gravatar.com/avatar/longname@zanata.org?d=mm&s=16"), - null)); - callback.onSuccess(new GetTranslatorListResult(translator, translator - .size())); - Log.info("EXIT DummyGetTranslatorListCommand.execute()"); - } - -} diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyPublishWorkspaceChatCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyPublishWorkspaceChatCommand.java deleted file mode 100644 index 8741a1be77..0000000000 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyPublishWorkspaceChatCommand.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.zanata.webtrans.client.rpc; - -import org.zanata.webtrans.shared.rpc.NoOpResult; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.rpc.AsyncCallback; - -public class DummyPublishWorkspaceChatCommand implements Command { - - private final AsyncCallback callback; - - DummyPublishWorkspaceChatCommand(AsyncCallback callback) { - this.callback = callback; - } - - @Override - public void execute() { - Log.info("ENTER DummyPublishWorkspaceChatCommand.execute()"); - - callback.onSuccess(new NoOpResult()); - Log.info("EXIT PublishWorkspaceChatResult.execute()"); - - } -} diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyUpdateTransUnitCommand.java b/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyUpdateTransUnitCommand.java deleted file mode 100644 index 1ec6853529..0000000000 --- a/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyUpdateTransUnitCommand.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * - */ -package org.zanata.webtrans.client.rpc; - -import java.util.ArrayList; - -import org.zanata.common.ContentState; -import org.zanata.common.LocaleId; -import org.zanata.webtrans.shared.model.DocumentId; -import org.zanata.webtrans.shared.model.TransUnit; -import org.zanata.webtrans.shared.model.TransUnitUpdateInfo; -import org.zanata.webtrans.shared.model.TransUnitUpdateRequest; -import org.zanata.webtrans.shared.rpc.UpdateTransUnit; -import org.zanata.webtrans.shared.rpc.UpdateTransUnitResult; - -import com.allen_sauer.gwt.log.client.Log; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.rpc.AsyncCallback; - -final class DummyUpdateTransUnitCommand implements Command { - private final UpdateTransUnit action; - private final AsyncCallback callback; - - DummyUpdateTransUnitCommand(UpdateTransUnit action, - AsyncCallback callback) { - this.action = action; - this.callback = callback; - } - - @Override - public void execute() { - Log.info("ENTER DummyUpdateTransUnitCommand.execute()"); - - TransUnitUpdateRequest firstTu = action.getUpdateRequests().get(0); - TransUnit tu = - TransUnit.Builder.newTransUnitBuilder() - .setId(firstTu.getTransUnitId().getId()) - .setVerNum(firstTu.getBaseTranslationVersion() + 1) - .setResId("dummyRestId").setLocaleId(LocaleId.EN_US) - .setSources(firstTu.getNewContents()).build(); - TransUnitUpdateInfo updateInfo = - new TransUnitUpdateInfo(true, true, new DocumentId(new Long(0), - ""), tu, 5, firstTu.getBaseTranslationVersion(), - ContentState.NeedReview); - UpdateTransUnitResult result = new UpdateTransUnitResult(updateInfo); - callback.onSuccess(result); - Log.info("EXIT DummyUpdateTransUnitCommand.execute()"); - } - -} diff --git a/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java b/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java index 7a59f3bcee..c303773ebc 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java @@ -27,6 +27,7 @@ import org.zanata.service.LocaleService; import org.zanata.service.impl.TranslationMemoryServiceImpl; import org.zanata.test.CdiUnitRunner; +import org.zanata.util.UrlUtil; import org.zanata.webtrans.shared.model.ProjectIterationId; import org.zanata.webtrans.shared.model.WorkspaceId; import org.zanata.webtrans.shared.rpc.GetTransMemoryDetailsAction; @@ -60,6 +61,8 @@ public class GetTransMemoryDetailsHandlerTest extends ZanataTest { private TextFlowDAO textFlowDAO; @Produces @Mock private LocaleService localeServiceImpl; + @Produces @Mock + private UrlUtil urlUtil; @Produces @Mock @FullText private FullTextEntityManager fullTextEntityManager; diff --git a/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java b/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java index 9f48def015..85532a8af8 100644 --- a/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java +++ b/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java @@ -94,7 +94,7 @@ private static TransMemoryResultItem tmResultWithSimilarity(double percent) { private static TransMemoryDetails tmDetail(String projectName, String docId, String resId, String msgContext) { return new TransMemoryDetails(null, null, projectName, null, docId, - resId, msgContext, null, null, null); + resId, msgContext, null, null, null, null); } private static TransMemoryMerge mergeTMAction(MergeOptions mergeOptions) {