rhbz872384 - make textarea editor work

zanata · Nov 9, 2012 · 9c96e58 · 9c96e58
1 parent eb6d784
commit 9c96e58
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
@@ -239,6 +239,10 @@ else if (event == RefreshPageEvent.REDRAW_PAGE_EVENT)
       {
          List<TransUnit> currentPageValues = navigationService.getCurrentPageValues();
          targetContentsPresenter.showData(currentPageValues);
+         if (targetContentsPresenter.getCurrentTransUnitIdOrNull() != null)
+         {
+            targetContentsPresenter.setSelected(targetContentsPresenter.getCurrentTransUnitIdOrNull());
+         }
          display.buildTable(sourceContentsPresenter.getDisplays(), targetContentsPresenter.getDisplays());
       }
    }

diff --git a/...-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java b/...-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
@@ -1,6 +1,7 @@
 package org.zanata.webtrans.client.presenter;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
@@ -459,10 +460,41 @@ public void canRefreshViewWithNoSearch()
    }
 
    @Test
-   public void onRefreshPageEvent()
+   public void onCodeMirrorRefreshPageEvent()
    {
       presenter.onRefreshPage(RefreshPageEvent.REFRESH_CODEMIRROR_EVENT);
 
       verify(display).delayRefresh();
+      verifyNoMoreInteractions(display);
+      verifyZeroInteractions(targetContentsPresenter);
+   }
+
+   @Test
+   public void onRedrawPageEventWithSelectedTransUnit()
+   {
+      List<TransUnit> transUnits = Lists.newArrayList(TestFixture.makeTransUnit(1));
+      when(navigationService.getCurrentPageValues()).thenReturn(transUnits);
+      when(targetContentsPresenter.getCurrentTransUnitIdOrNull()).thenReturn(transUnits.get(0).getId());
+
+      presenter.onRefreshPage(RefreshPageEvent.REDRAW_PAGE_EVENT);
+
+      verify(targetContentsPresenter).showData(transUnits);
+      verify(targetContentsPresenter).setSelected(transUnits.get(0).getId());
+      verify(display).buildTable(sourceContentsPresenter.getDisplays(), targetContentsPresenter.getDisplays());
+   }
+
+   @Test
+   public void onRedrawPageEventWithoutSelectedTransUnit()
+   {
+      List<TransUnit> transUnits = Lists.newArrayList(TestFixture.makeTransUnit(1));
+      when(navigationService.getCurrentPageValues()).thenReturn(transUnits);
+      when(targetContentsPresenter.getCurrentTransUnitIdOrNull()).thenReturn(null);
+
+      presenter.onRefreshPage(RefreshPageEvent.REDRAW_PAGE_EVENT);
+
+      verify(targetContentsPresenter).showData(transUnits);
+      verify(targetContentsPresenter).getCurrentTransUnitIdOrNull();
+      verify(display).buildTable(sourceContentsPresenter.getDisplays(), targetContentsPresenter.getDisplays());
+      verify(targetContentsPresenter, never()).setSelected(any(TransUnitId.class));
    }
 }