[zanata/zanata-server] 569e13: Add file tests, clean up and simplify
GitHub
noreply at github.com
Thu Nov 20 05:56:55 UTC 2014
Branch: refs/heads/admin-page
Home: https://github.com/zanata/zanata-server
Commit: 569e138801a41ede863fda55ccdd83d7fb9d1983
https://github.com/zanata/zanata-server/commit/569e138801a41ede863fda55ccdd83d7fb9d1983
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-11-10 (Mon, 10 Nov 2014)
Changed paths:
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/util/Constants.java
M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
R functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
A functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java
M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
M functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
M functional-test/src/test/resources/setup.properties
A functional-test/src/test/resources/upload-idml.idml
A functional-test/src/test/resources/upload-odg.odg
A functional-test/src/test/resources/upload-odp.odp
A functional-test/src/test/resources/upload-ods.ods
A functional-test/src/test/resources/upload-odt.odt
Log Message:
-----------
Add file tests, clean up and simplify
Squashed commit of the following:
commit 14710083caa38a3830271950233b8c86d12a48e1
Author: Damian Jansen <djansen at redhat.com>
Date: Mon Nov 10 12:35:03 2014 +1000
Move apikey to constant, and html file data to static var
commit 37edef8882204c2d6b6061fc95c5053ba299cae7
Author: Damian Jansen <djansen at redhat.com>
Date: Thu Sep 4 15:39:20 2014 +1000
Add file tests, clean up and simplify
- Test html, idml, dtd, odg/p/s/t File type upload
- Use ZanataRestCaller rather than manually creating projects, versions
- Remove unused imports
- Add a null pointer check on opening files
Commit: d5bf19fd634492c69765291c249b6813d6b08bb0
https://github.com/zanata/zanata-server/commit/d5bf19fd634492c69765291c249b6813d6b08bb0
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-11-10 (Mon, 10 Nov 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
Log Message:
-----------
Include original exception when SMTP send fails
Commit: f287f23d075ad4ce1c103afa56b04e93df21f28b
https://github.com/zanata/zanata-server/commit/f287f23d075ad4ce1c103afa56b04e93df21f28b
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-11-11 (Tue, 11 Nov 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
Log Message:
-----------
Fix broken usage of translator api key constant in tests
Also adds an after function to one of these tests, to reset it.
Commit: 1cbf94581a59656b4b7b45b20c43be0da9da6c77
https://github.com/zanata/zanata-server/commit/1cbf94581a59656b4b7b45b20c43be0da9da6c77
Author: Damian Jansen <djansen at redhat.com>
Date: 2014-11-11 (Tue, 11 Nov 2014)
Changed paths:
M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
Log Message:
-----------
Merge pull request #634 from zanata/fix-translator-api-test
Fix broken usage of translator api key constant in tests
Commit: a2efbb1ad63a79ce2a4b8a97f6857b2eb3e16998
https://github.com/zanata/zanata-server/commit/a2efbb1ad63a79ce2a4b8a97f6857b2eb3e16998
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-11-11 (Tue, 11 Nov 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
Log Message:
-----------
Merge pull request #632 from zanata/smtp-include-exception
Include original exception when SMTP send fails
Commit: 9e86c7da97d29111103c76a06c634545654a70d4
https://github.com/zanata/zanata-server/commit/9e86c7da97d29111103c76a06c634545654a70d4
Author: Alex Eng <aeng at redhat.com>
Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths:
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
Log Message:
-----------
Remove untranslated and total from contribution stats:
Squashed commit of the following:
commit fe3de61aa77aa127e799ded714c3ceaa4023df0d
Author: Alex Eng <aeng at redhat.com>
Date: Mon Nov 17 13:47:27 2014 +1000
Modify contribution stats to remove duplication count in single target
commit 617ef8253c0d7d8ebdb4b546e4bdee933c9f88e6
Merge: 1cbf945 d5bf19f
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Tue Nov 11 16:55:18 2014 +1000
Merge pull request #632 from zanata/smtp-include-exception
Include original exception when SMTP send fails
Commit: 0c357c5a91e80293d1054444d979e75f9933efb3
https://github.com/zanata/zanata-server/commit/0c357c5a91e80293d1054444d979e75f9933efb3
Author: Alex Eng <aeng at redhat.com>
Date: 2014-11-20 (Thu, 20 Nov 2014)
Changed paths:
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/util/Constants.java
M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
R functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
A functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java
M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
M functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
M functional-test/src/test/resources/setup.properties
A functional-test/src/test/resources/upload-idml.idml
A functional-test/src/test/resources/upload-odg.odg
A functional-test/src/test/resources/upload-odp.odp
A functional-test/src/test/resources/upload-ods.ods
A functional-test/src/test/resources/upload-odt.odt
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
Log Message:
-----------
Merge branch 'integration/master' into admin-page
Compare: https://github.com/zanata/zanata-server/compare/50abdf9be986...0c357c5a91e8
More information about the zanata-commits
mailing list