rhbz844820 - fix post merge compile error

zanata · Aug 23, 2012 · 5a5048c · 5a5048c
1 parent 7cefd3f
commit 5a5048c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
@@ -43,6 +43,8 @@
 import org.zanata.webtrans.shared.rpc.GetTransUnitList;
 import org.zanata.webtrans.shared.rpc.GetTransUnitListResult;
 
+import com.google.common.base.Strings;
+
 import lombok.extern.slf4j.Slf4j;
 import net.customware.gwt.dispatch.server.ExecutionContext;
 import net.customware.gwt.dispatch.shared.ActionException;

diff --git a/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationControllerTest.java b/zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationControllerTest.java
@@ -42,6 +42,7 @@
 import org.zanata.seam.SeamAutowire;
 import org.zanata.security.ZanataIdentity;
 import org.zanata.service.LocaleService;
+import org.zanata.service.TextFlowSearchService;
 import org.zanata.webtrans.client.editor.table.GetTransUnitActionContext;
 import org.zanata.webtrans.client.presenter.UserConfigHolder;
 import org.zanata.webtrans.client.rpc.AbstractAsyncCallback;
@@ -129,6 +130,8 @@ public class NavigationControllerTest
    private ResourceUtils resourceUtils;
    @Mock
    private ZanataIdentity identity;
+   @Mock
+   private TextFlowSearchService textFlowSearchServiceImpl;
 
    private GetTransUnitListHandler getTransUnitListHandler;
    private GetTransUnitsNavigationHandler getTransUnitsNavigationHandler;
@@ -182,11 +185,12 @@ private void setupGetTransUnitListHandler()
       getTransUnitListHandler = SeamAutowire.instance()
             .use("identity", identity)
             .use("textFlowDAO", textFlowDAO)
+            .use("textFlowSearchServiceImpl", textFlowSearchServiceImpl)
             .use("localeServiceImpl", localeServiceImpl)
             .use("resourceUtils", resourceUtils)
             .autowire(GetTransUnitListHandler.class);
       // @formatter:on
-      when(textFlowDAO.getTransUnitList(documentId.getId())).thenReturn(hTextFlows);
+      when(textFlowDAO.getTextFlows(documentId.getId())).thenReturn(hTextFlows);
       when(localeServiceImpl.validateLocaleByProjectIteration(any(LocaleId.class), anyString(), anyString())).thenReturn(hLocale);
       when(resourceUtils.getNumPlurals(any(HDocument.class), any(HLocale.class))).thenReturn(1);
    }