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

Commit

Permalink
refactor - rename enum names and message values to be consistent with…
Browse files Browse the repository at this point in the history 
… jsf copy tran values
  • Loading branch information
Patrick Huang committed Jun 29, 2012
1 parent 6baccfb commit 7979597
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 40 deletions.
12 changes: 6 additions & 6 deletions zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
View file
Expand Up @@ -36,12 +36,12 @@ public interface EnumMessages extends com.google.gwt.i18n.client.Messages
@DefaultMessage("Lucene")
String searchTypeRaw();

@DefaultMessage("Merge as need review")
String mergeAsFuzzy();
@DefaultMessage("Reject")
String rejectMerge();

@DefaultMessage("Merge as approved")
String mergeAsApproved();
@DefaultMessage("Don''t care, try next rule")
String ignoreDifference();

@DefaultMessage("Skip merge")
String skipMerge();
@DefaultMessage("Downgrade to Fuzzy, try next rule")
String downgradeToFuzzy();
}
10 changes: 5 additions & 5 deletions zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
View file
Expand Up @@ -46,11 +46,11 @@ public String render(MergeOption option)
switch (option)
{
case FUZZY:
return messages.mergeAsFuzzy();
case APPROVED:
return messages.mergeAsApproved();
case SKIP:
return messages.skipMerge();
return messages.downgradeToFuzzy();
case IGNORE_CHECK:
return messages.ignoreDifference();
case REJECT:
return messages.rejectMerge();
default:
return getEmptyValue();
}
Expand Down
8 changes: 4 additions & 4 deletions zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
View file
Expand Up @@ -72,7 +72,7 @@ else if (needReview)

private void compareTextFlowResId(TransMemoryMerge action, HTextFlow tfToBeFilled, TransMemoryDetails tmDetail)
{
if (action.getDifferentResIdOption() != MergeOption.APPROVED
if (action.getDifferentResIdOption() != MergeOption.IGNORE_CHECK
&& notEqual(tfToBeFilled.getResId(), tmDetail.getResId()))
{
setFlagsBasedOnOption(action.getDifferentResIdOption());
Expand All @@ -81,7 +81,7 @@ && notEqual(tfToBeFilled.getResId(), tmDetail.getResId()))

private void compareDocId(TransMemoryMerge action, HTextFlow tfToBeFilled, TransMemoryDetails tmDetail)
{
if (action.getDifferentDocumentOption() != MergeOption.APPROVED
if (action.getDifferentDocumentOption() != MergeOption.IGNORE_CHECK
&& notEqual(tfToBeFilled.getDocument().getDocId(), tmDetail.getDocId()))
{
setFlagsBasedOnOption(action.getDifferentDocumentOption());
Expand All @@ -90,7 +90,7 @@ && notEqual(tfToBeFilled.getDocument().getDocId(), tmDetail.getDocId()))

private void compareProjectName(TransMemoryMerge action, HTextFlow tfToBeFilled, TransMemoryDetails tmDetail)
{
if (action.getDifferentProjectOption() != MergeOption.APPROVED
if (action.getDifferentProjectOption() != MergeOption.IGNORE_CHECK
&& notEqual(tfToBeFilled.getDocument().getProjectIteration().getProject().getName(), tmDetail.getProjectName()))
{
setFlagsBasedOnOption(action.getDifferentProjectOption());
Expand All @@ -99,7 +99,7 @@ && notEqual(tfToBeFilled.getDocument().getProjectIteration().getProject().getNam

private void setFlagsBasedOnOption(MergeOption mergeOption)
{
if (mergeOption == MergeOption.SKIP)
if (mergeOption == MergeOption.REJECT)
{
needSkip = true;
}
Expand Down
2 changes: 1 addition & 1 deletion zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
View file
Expand Up @@ -23,5 +23,5 @@

public enum MergeOption
{
FUZZY, SKIP, APPROVED
FUZZY, REJECT, IGNORE_CHECK
}
19 changes: 7 additions & 12 deletions ...war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
View file
Expand Up @@ -31,29 +31,24 @@

import java.util.List;

import javax.annotation.Nullable;

import net.customware.gwt.presenter.client.EventBus;

import org.hamcrest.Matchers;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.zanata.common.ContentState;
import org.zanata.model.TestFixture;
import org.zanata.webtrans.client.editor.table.TableEditorPresenter;
import org.zanata.webtrans.client.events.NotificationEvent;
import org.zanata.webtrans.client.resources.UiMessages;
import org.zanata.webtrans.client.rpc.CachingDispatchAsync;
import org.zanata.webtrans.client.ui.InlineLink;
import org.zanata.webtrans.client.ui.TransMemoryMergePopupPanelDisplay;
import org.zanata.webtrans.client.ui.UndoLink;
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;
Expand Down Expand Up @@ -135,7 +130,7 @@ public void willIgnoreIfNoUntranslatedTextFlow() {
mockCurrentPageToReturn(currentPageRows);

// When:
presenter.proceedToMergeTM(80, MergeOption.APPROVED, MergeOption.SKIP, MergeOption.FUZZY);
presenter.proceedToMergeTM(80, MergeOption.IGNORE_CHECK, MergeOption.REJECT, MergeOption.FUZZY);

// Then:
verify(eventBus).fireEvent(notificationEventCaptor.capture());
Expand Down Expand Up @@ -168,7 +163,7 @@ public void canRequestTMMerge()
mockCurrentPageToReturn(currentPageRows);

// When:
presenter.proceedToMergeTM(80, MergeOption.APPROVED, MergeOption.SKIP, MergeOption.FUZZY);
presenter.proceedToMergeTM(80, MergeOption.IGNORE_CHECK, MergeOption.REJECT, MergeOption.FUZZY);

// Then:
InOrder inOrder = inOrder(display, dispatcher);
Expand All @@ -179,8 +174,8 @@ public void canRequestTMMerge()
List<TransUnitUpdateRequest> updateRequests = action.getUpdateRequests();
assertThat(updateRequests, Matchers.hasSize(3));
assertThat(getIds(updateRequests), Matchers.contains(1L, 4L, 5L));
assertThat(action.getDifferentProjectOption(), Matchers.equalTo(MergeOption.APPROVED));
assertThat(action.getDifferentDocumentOption(), Matchers.equalTo(MergeOption.SKIP));
assertThat(action.getDifferentProjectOption(), Matchers.equalTo(MergeOption.IGNORE_CHECK));
assertThat(action.getDifferentDocumentOption(), Matchers.equalTo(MergeOption.REJECT));
assertThat(action.getDifferentResIdOption(), Matchers.equalTo(MergeOption.FUZZY));
}

Expand All @@ -192,7 +187,7 @@ public void onRequestTMMergeFailureWillHideFormAndNotify() {
mockCurrentPageToReturn(currentPageRows);

// When:
presenter.proceedToMergeTM(100, MergeOption.SKIP, MergeOption.APPROVED, MergeOption.FUZZY);
presenter.proceedToMergeTM(100, MergeOption.REJECT, MergeOption.IGNORE_CHECK, MergeOption.FUZZY);
verify(dispatcher).execute(transMemoryMergeCaptor.capture(), callbackCaptor.capture());
AsyncCallback<UpdateTransUnitResult> callback = callbackCaptor.getValue();
// rpc call failed
Expand All @@ -217,7 +212,7 @@ public void onRequestTMMergeSuccessWithTranslationWillCreateUndoLinkAndNotify()
when(undoLinkProvider.get()).thenReturn(undoLink);

// When:
presenter.proceedToMergeTM(100, MergeOption.SKIP, MergeOption.APPROVED, MergeOption.FUZZY);
presenter.proceedToMergeTM(100, MergeOption.REJECT, MergeOption.IGNORE_CHECK, MergeOption.FUZZY);
verify(dispatcher).execute(transMemoryMergeCaptor.capture(), callbackCaptor.capture());
AsyncCallback<UpdateTransUnitResult> callback = callbackCaptor.getValue();
// rpc call success and result has some updated info
Expand Down Expand Up @@ -245,7 +240,7 @@ public void onRequestTMMergeSuccessWithoutTranslationWillJustNotify() {
when(undoLinkProvider.get()).thenReturn(undoLink);

// When:
presenter.proceedToMergeTM(100, MergeOption.SKIP, MergeOption.APPROVED, MergeOption.FUZZY);
presenter.proceedToMergeTM(100, MergeOption.REJECT, MergeOption.IGNORE_CHECK, MergeOption.FUZZY);
verify(dispatcher).execute(transMemoryMergeCaptor.capture(), callbackCaptor.capture());
AsyncCallback<UpdateTransUnitResult> callback = callbackCaptor.getValue();
// rpc call success but result has no updated info
Expand Down
4 changes: 2 additions & 2 deletions zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
View file
Expand Up @@ -118,7 +118,7 @@ private TransMemoryMerge prepareActionAndMockSecurityService(int threshold, long
requests.add(new TransUnitUpdateRequest(new TransUnitId(tranUnitId), null, null, 0));
}
// we have TransMemoryMergeStatusResolverTest to cover various different merge options so here we don't test that
TransMemoryMerge action = new TransMemoryMerge(threshold, requests, MergeOption.APPROVED, MergeOption.APPROVED, MergeOption.APPROVED);
TransMemoryMerge action = new TransMemoryMerge(threshold, requests, MergeOption.IGNORE_CHECK, MergeOption.IGNORE_CHECK, MergeOption.IGNORE_CHECK);
mockSecurityService(action);
return action;
}
Expand Down Expand Up @@ -274,7 +274,7 @@ public void willNotTranslateIfDifferentMetaDataOptionSetToSkip() throws ActionEx
// Given: an action with threshold 80% and trans unit id is 1, with different doc id option set to skip
final long transUnitId = 1L;
ArrayList<TransUnitUpdateRequest> requests = Lists.newArrayList(new TransUnitUpdateRequest(new TransUnitId(1L), null, null, 0));
TransMemoryMerge action = new TransMemoryMerge(80, requests, MergeOption.APPROVED, MergeOption.SKIP, MergeOption.APPROVED);
TransMemoryMerge action = new TransMemoryMerge(80, requests, MergeOption.IGNORE_CHECK, MergeOption.REJECT, MergeOption.IGNORE_CHECK);
mockSecurityService(action);

HTextFlow hTextFlow = TestFixture.makeHTextFlow(transUnitId, hLocale, ContentState.New, "pot/a.po");
Expand Down
20 changes: 10 additions & 10 deletions ...-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
View file
Expand Up @@ -93,22 +93,22 @@ private static TransMemoryMerge mergeTMAction(MergeOption differentProjectOption

private static TransMemoryMerge mergeTMActionWhenResIdIsDifferent(MergeOption resIdOption)
{
return mergeTMAction(MergeOption.APPROVED, MergeOption.APPROVED, resIdOption);
return mergeTMAction(MergeOption.IGNORE_CHECK, MergeOption.IGNORE_CHECK, resIdOption);
}

private static TransMemoryMerge mergeTMActionWhenDocIdIsDifferent(MergeOption documentOption)
{
return mergeTMAction(MergeOption.APPROVED, documentOption, MergeOption.APPROVED);
return mergeTMAction(MergeOption.IGNORE_CHECK, documentOption, MergeOption.IGNORE_CHECK);
}

private TransMemoryMerge mergeTMActionWhenProjectNameIsDifferent(MergeOption projectOption)
{
return mergeTMAction(projectOption, MergeOption.APPROVED, MergeOption.APPROVED);
return mergeTMAction(projectOption, MergeOption.IGNORE_CHECK, MergeOption.IGNORE_CHECK);
}

@Test
public void notOneHundredMatchWillBeSetAsFuzzy() {
action = mergeTMAction(MergeOption.APPROVED, MergeOption.APPROVED, MergeOption.APPROVED);
action = mergeTMAction(MergeOption.IGNORE_CHECK, MergeOption.IGNORE_CHECK, MergeOption.IGNORE_CHECK);
ContentState result = resolver.workOutStatus(action, textFlow, tmDetail, tmResultWithSimilarity(90));

assertThat(result, equalTo(ContentState.NeedReview));
Expand All @@ -125,14 +125,14 @@ public void differentResIdAndOptionIsFuzzy() {
public void differentResIdAndOptionIsApproved() {
TransMemoryDetails tmDetail = tmDetail(projectName, docId, "different res id");

action = mergeTMActionWhenResIdIsDifferent(MergeOption.APPROVED);
action = mergeTMActionWhenResIdIsDifferent(MergeOption.IGNORE_CHECK);
assertThat(resolver.workOutStatus(action, textFlow, tmDetail, tmResultWithSimilarity(100)), equalTo(ContentState.Approved));
}

@Test
public void differentResIdAndOptionIsSkip() {
TransMemoryDetails tmDetail = tmDetail(projectName, docId, "different res id");
action = mergeTMActionWhenResIdIsDifferent(MergeOption.SKIP);
action = mergeTMActionWhenResIdIsDifferent(MergeOption.REJECT);
assertThat(resolver.workOutStatus(action, textFlow, tmDetail, tmResultWithSimilarity(80)), is(nullValue()));
}

Expand All @@ -146,14 +146,14 @@ public void differentDocIdAndOptionIsFuzzy() {
@Test
public void differentDocIdAndOptionIsApproved() {
TransMemoryDetails tmDetail = tmDetail(projectName, "different doc id", resId);
action = mergeTMActionWhenDocIdIsDifferent(MergeOption.APPROVED);
action = mergeTMActionWhenDocIdIsDifferent(MergeOption.IGNORE_CHECK);
assertThat(resolver.workOutStatus(action, textFlow, tmDetail, tmResultWithSimilarity(100)), equalTo(ContentState.Approved));
}

@Test
public void differentDocIdAndOptionIsSkip() {
TransMemoryDetails tmDetail = tmDetail(projectName, "different doc id", resId);
action = mergeTMActionWhenDocIdIsDifferent(MergeOption.SKIP);
action = mergeTMActionWhenDocIdIsDifferent(MergeOption.REJECT);
assertThat(resolver.workOutStatus(action, textFlow, tmDetail, tmResultWithSimilarity(100)), is(nullValue()));
}

Expand All @@ -167,14 +167,14 @@ public void differentProjectNameAndOptionIsFuzzy() {
@Test
public void differentProjectNameAndOptionIsApproved() {
TransMemoryDetails tmDetail = tmDetail("different project name", docId, resId);
action = mergeTMActionWhenProjectNameIsDifferent(MergeOption.APPROVED);
action = mergeTMActionWhenProjectNameIsDifferent(MergeOption.IGNORE_CHECK);
assertThat(resolver.workOutStatus(action, textFlow, tmDetail, tmResultWithSimilarity(100)), equalTo(ContentState.Approved));
}

@Test
public void differentProjectNameAndOptionIsSkip() {
TransMemoryDetails tmDetail = tmDetail("different project name", docId, resId);
action = mergeTMActionWhenProjectNameIsDifferent(MergeOption.SKIP);
action = mergeTMActionWhenProjectNameIsDifferent(MergeOption.REJECT);
assertThat(resolver.workOutStatus(action, textFlow, tmDetail, tmResultWithSimilarity(100)), is(nullValue()));
}

Expand Down

0 comments on commit 7979597

Please sign in to comment.