[zanata/zanata-server] 596784: fix(functional test): fix broken functional test

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 5967840991e142d4f3e3da5961aa92c1aa247e39
      https://github.com/zanata/zanata-server/commit/5967840991e142d4f3e3da5961aa92c1aa247e39
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java

  Log Message:
  -----------
  fix(functional test): fix broken functional test


  Commit: a1da4b2315ecd8a7cbe9f916f1c9bebf96d9081d
      https://github.com/zanata/zanata-server/commit/a1da4b2315ecd8a7cbe9f916f1c9bebf96d9081d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java

  Log Message:
  -----------
  Merge pull request #1129 from zanata/functional-test

fix(functional test): fix broken functional test


  Commit: 218421be027fa08f7b8a686c966ff1265be36207
      https://github.com/zanata/zanata-server/commit/218421be027fa08f7b8a686c966ff1265be36207
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2016-04-06 (Wed, 06 Apr 2016)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/src/main/java/org/zanata/service/TranslationMergeService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAuto.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeFirstTran.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImport.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  fix(ZNTA-987): track deleted HTextFlowTargets by ID

The equals method for HTextFlowTargets won't recognise the object if
any fields have changed, so tracking by ID is safer (unless we implement
business key equality).

Fixes the bug where merge-type=import sets state of HTextFlowTargets
to New.


  Commit: fe3d2dfdd04f10750e6431e876f2c75abcd64513
      https://github.com/zanata/zanata-server/commit/fe3d2dfdd04f10750e6431e876f2c75abcd64513
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2016-04-06 (Wed, 06 Apr 2016)

  Changed paths:
    M functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/src/main/java/org/zanata/service/TranslationMergeService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeAuto.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeFirstTran.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeImport.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  Merge commit '218421be027fa08f7b8a686c966ff1265be36207' into HEAD


Compare: https://github.com/zanata/zanata-server/compare/2fb3393a29c7...fe3d2dfdd04f