rhbz916830 - False positive in validation warnings, comparing wrong e…

…ntries
zanata · Mar 5, 2013 · 75fc1f2 · 75fc1f2
1 parent 6d2fb62
commit 75fc1f2
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java b/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
@@ -190,7 +190,7 @@ public void onUserConfigChanged(UserConfigChangeEvent event)
    public void onTransUnitUpdated(TransUnitUpdatedEvent event)
    {
       SourceContentsDisplay sourceContentsView = Iterables.find(displayList, new FindByTransUnitIdPredicate(event.getUpdateInfo().getTransUnit().getId()));
-      sourceContentsView.setValue(event.getUpdateInfo().getTransUnit());
+      sourceContentsView.updateTransUnitDetails(event.getUpdateInfo().getTransUnit());
       sourceContentsView.refresh();
    }
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java b/zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
@@ -163,7 +163,7 @@ public void fireValidationWarningsEvent(List<String> errors, boolean fireNotific
     * Merge ValidationInfo from RPC result ValidationObject to all validation
     * actions from ValidationFactory
     * 
-    * @param validations
+    * @param validationInfoList
     */
    public void setValidationRules(List<ValidationInfo> validationInfoList)
    {

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsDisplay.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsDisplay.java
@@ -26,4 +26,6 @@ public interface SourceContentsDisplay extends IsWidget, HasTransUnitId
    void refresh();
 
    void toggleTransUnitDetails(boolean showTransUnitDetails);
+
+   void updateTransUnitDetails(TransUnit transUnit);
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java
@@ -147,6 +147,12 @@ public void toggleTransUnitDetails(boolean showTransUnitDetails)
       }
    }
 
+   @Override
+   public void updateTransUnitDetails(TransUnit transUnit)
+   {
+      transUnitDetailsPanel.setDetails(transUnit);
+   }
+
    @Override
    public TransUnitId getId()
    {

diff --git a/...a-war/src/test/java/org/zanata/webtrans/client/presenter/SourceContentsPresenterTest.java b/...a-war/src/test/java/org/zanata/webtrans/client/presenter/SourceContentsPresenterTest.java
@@ -13,6 +13,7 @@
 import org.zanata.model.TestFixture;
 import org.zanata.webtrans.client.events.RequestValidationEvent;
 import org.zanata.webtrans.client.events.TableRowSelectedEvent;
+import org.zanata.webtrans.client.events.TransUnitUpdatedEvent;
 import org.zanata.webtrans.client.events.UserConfigChangeEvent;
 import org.zanata.webtrans.client.ui.HasSelectableSource;
 import org.zanata.webtrans.client.view.SourceContentsDisplay;
@@ -191,4 +192,25 @@ public void withNoPriorSelectionGetCurrentTransUnitIdIsNull() throws Exception
       TransUnitId transUnitId = presenter.getCurrentTransUnitIdOrNull();
       assertThat(transUnitId, Matchers.nullValue());
    }
+
+   @Test
+   public void onTransUnitUpdated()
+   {
+      // Given: two display
+      List<TransUnit> transUnits = Lists.newArrayList(TestFixture.makeTransUnit(1), TestFixture.makeTransUnit(2));
+      when(displayProvider.get()).thenReturn(display1, display2);
+      when(display1.getId()).thenReturn(transUnits.get(0).getId());
+      when(display2.getId()).thenReturn(transUnits.get(1).getId());
+      presenter.showData(transUnits);
+
+      // When:
+      TransUnitUpdatedEvent event = mock(TransUnitUpdatedEvent.class, Mockito.RETURNS_DEEP_STUBS);
+      TransUnit updated = TestFixture.makeTransUnit(1);
+      when(event.getUpdateInfo().getTransUnit()).thenReturn(updated);
+
+      presenter.onTransUnitUpdated(event);
+
+      verify(display1).updateTransUnitDetails(updated);
+      verify(display1).refresh();
+   }
 }