Merge remote-tracking branch 'mine/JAMES-1925'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a4d8c8e0 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a4d8c8e0 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a4d8c8e0 Branch: refs/heads/master Commit: a4d8c8e00f87e315050ec666e1b8767a6e773f60 Parents: ff3c951 0e104c2 Author: Antoine Duprat <[email protected]> Authored: Thu Feb 9 14:00:52 2017 +0100 Committer: Antoine Duprat <[email protected]> Committed: Thu Feb 9 14:00:52 2017 +0100 ---------------------------------------------------------------------- .../backends/es/ElasticSearchIndexerTest.java | 1 - .../modules/CassandraMailboxRecentsModule.java | 1 - .../elasticsearch/MailboxMappingFactory.java | 1 - .../elasticsearch/query/SortConverter.java | 1 - .../store/AbstractCombinationManagerTest.java | 1 - mpt/impl/imap-mailbox/elasticsearch/pom.xml | 7 - mpt/pom.xml | 6 +- .../org/apache/james/utils/JmapGuiceProbe.java | 5 + .../james/jmap/VacationIntegrationTest.java | 16 +- .../integration/GetMailboxesMethodTest.java | 94 ++++--- .../integration/GetMessageListMethodTest.java | 23 +- .../integration/SetMailboxesMethodTest.java | 233 ++++++++-------- .../integration/SetMessagesMethodTest.java | 165 +++++------ .../cucumber/GetMessagesMethodStepdefs.java | 3 +- .../test/resources/cucumber/DownloadGet.feature | 10 +- .../resources/cucumber/DownloadPost.feature | 4 +- .../test/resources/cucumber/GetMessages.feature | 44 +-- .../protocols/jmap-integration-testing/pom.xml | 1 - .../org/apache/james/jmap/DefaultMailboxes.java | 36 +++ .../DefaultMailboxesProvisioningFilter.java | 106 ++++++++ .../james/jmap/FirstUserConnectionFilter.java | 127 --------- .../java/org/apache/james/jmap/JMAPServer.java | 5 +- .../james/jmap/UserProvisioningFilter.java | 97 +++++++ .../methods/SetMessagesUpdateProcessor.java | 6 +- ...ltMailboxesProvisioningFilterThreadTest.java | 268 ++++++++++++++++++ .../jmap/FirstUserConnectionFilterTest.java | 59 ---- .../FirstUserConnectionFilterThreadTest.java | 271 ------------------- .../james/jmap/UserProvisioningFilterTest.java | 57 ++++ .../jmap/UserProvisioningFilterThreadTest.java | 66 +++++ .../methods/SetMessagesUpdateProcessorTest.java | 4 +- 30 files changed, 922 insertions(+), 796 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/a4d8c8e0/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/resources/cucumber/GetMessages.feature ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
