[zanata/zanata-server] f87051: Add unit test for merge translations

[GitHub]

  Branch: refs/heads/rhbz1133989
  Home:   https://github.com/zanata/zanata-server
  Commit: f8705176892deca12f548c33f47202eab9074dce
      https://github.com/zanata/zanata-server/commit/f8705176892deca12f548c33f47202eab9074dce
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
    A zanata-war/src/main/java/org/zanata/util/MessageGenerator.java
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    A zanata-war/src/test/resources/org/zanata/test/model/MergeTranslationsData.dbunit.xml

  Log Message:
  -----------
  Add unit test for merge translations


  Commit: b8065176d8d69f506cbe9ef0a7ef3a2c04a8c270
      https://github.com/zanata/zanata-server/commit/b8065176d8d69f506cbe9ef0a7ef3a2c04a8c270
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-06 (Fri, 06 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
    M zanata-war/src/main/java/org/zanata/util/MessageGenerator.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/MergeTranslationsData.dbunit.xml

  Log Message:
  -----------
  WIP: add unit test for merge translation


Compare: https://github.com/zanata/zanata-server/compare/fd06390f48f4...b8065176d8d6