This is an automated email from the ASF dual-hosted git repository. rouazana pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 86c001037a6e1f783c33b406b0e4e3969a29736c Author: Tran Tien Duc <[email protected]> AuthorDate: Tue Jul 16 11:46:16 2019 +0700 JAMES-2812 use default MailRepository(File) for memory vault integration tests I don't see the need for having MemoryMailRepository for those tests, and FileMailRepository is the default one we use in memory integration tests --- .../james/jmap/memory/MemoryBlobStoreDeletedMessagesVaultTest.java | 4 ---- .../org/apache/james/jmap/memory/MemoryDeletedMessagesVaultTest.java | 4 ---- .../jmap/memory/MemoryLinshareBlobExportMechanismIntegrationTest.java | 4 ---- 3 files changed, 12 deletions(-) diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryBlobStoreDeletedMessagesVaultTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryBlobStoreDeletedMessagesVaultTest.java index 0e0ca36..296d05a 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryBlobStoreDeletedMessagesVaultTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryBlobStoreDeletedMessagesVaultTest.java @@ -26,10 +26,8 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.jmap.methods.integration.DeletedMessagesVaultTest; -import org.apache.james.mailrepository.api.MailRepositoryUrl; import org.apache.james.modules.mailbox.MemoryDeletedMessageVaultModule; import org.apache.james.modules.vault.TestDeleteMessageVaultPreDeletionHookModule; -import org.apache.james.vault.MailRepositoryDeletedMessageVault; import org.apache.james.webadmin.WebAdminConfiguration; import org.junit.Ignore; import org.junit.Rule; @@ -45,8 +43,6 @@ public class MemoryBlobStoreDeletedMessagesVaultTest extends DeletedMessagesVaul new MemoryDeletedMessageVaultModule(), new TestDeleteMessageVaultPreDeletionHookModule(), binder -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION), - binder -> binder.bind(MailRepositoryDeletedMessageVault.Configuration.class) - .toInstance(new MailRepositoryDeletedMessageVault.Configuration(MailRepositoryUrl.from("memory://var/deletedMessages/user"))), binder -> binder.bind(FileSystem.class).toInstance(fileSystem), binder -> binder.bind(Clock.class).toInstance(clock)); } diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryDeletedMessagesVaultTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryDeletedMessagesVaultTest.java index ce73c2a..ae1fd0c 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryDeletedMessagesVaultTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryDeletedMessagesVaultTest.java @@ -26,9 +26,7 @@ import org.apache.james.GuiceJamesServer; import org.apache.james.MemoryJmapTestRule; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.jmap.methods.integration.DeletedMessagesVaultTest; -import org.apache.james.mailrepository.api.MailRepositoryUrl; import org.apache.james.modules.vault.TestDeleteMessageVaultPreDeletionHookModule; -import org.apache.james.vault.MailRepositoryDeletedMessageVault; import org.apache.james.webadmin.WebAdminConfiguration; import org.junit.Rule; @@ -41,8 +39,6 @@ public class MemoryDeletedMessagesVaultTest extends DeletedMessagesVaultTest { return memoryJmap.jmapServer( new TestDeleteMessageVaultPreDeletionHookModule(), binder -> binder.bind(WebAdminConfiguration.class).toInstance(WebAdminConfiguration.TEST_CONFIGURATION), - binder -> binder.bind(MailRepositoryDeletedMessageVault.Configuration.class) - .toInstance(new MailRepositoryDeletedMessageVault.Configuration(MailRepositoryUrl.from("memory://var/deletedMessages/user"))), binder -> binder.bind(FileSystem.class).toInstance(fileSystem), binder -> binder.bind(Clock.class).toInstance(clock)); } diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryLinshareBlobExportMechanismIntegrationTest.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryLinshareBlobExportMechanismIntegrationTest.java index ea38e40..7787c32 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryLinshareBlobExportMechanismIntegrationTest.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryLinshareBlobExportMechanismIntegrationTest.java @@ -24,11 +24,9 @@ import org.apache.james.JamesServerBuilder; import org.apache.james.JamesServerExtension; import org.apache.james.MemoryJamesServerMain; import org.apache.james.jmap.methods.integration.LinshareBlobExportMechanismIntegrationTest; -import org.apache.james.mailrepository.api.MailRepositoryUrl; import org.apache.james.modules.LinshareGuiceExtension; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.modules.vault.TestDeleteMessageVaultPreDeletionHookModule; -import org.apache.james.vault.MailRepositoryDeletedMessageVault; import org.apache.james.webadmin.WebAdminConfiguration; import org.junit.jupiter.api.extension.RegisterExtension; @@ -48,8 +46,6 @@ class MemoryLinshareBlobExportMechanismIntegrationTest extends LinshareBlobExpor .overrideWith(binder -> { binder.bind(WebAdminConfiguration.class) .toInstance(WebAdminConfiguration.TEST_CONFIGURATION); - binder.bind(MailRepositoryDeletedMessageVault.Configuration.class) - .toInstance(new MailRepositoryDeletedMessageVault.Configuration(MailRepositoryUrl.from("memory://var/deletedMessages/user"))); })) .build(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
