You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2020/10/14 02:31:44 UTC
[james-project] 18/22: JAMES-3409 FIX CassandraMailboxMapperTest
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 4427954ba06dbf96f809e0f76a2128f6eea2f455
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Wed Aug 19 09:32:29 2020 +0700
JAMES-3409 FIX CassandraMailboxMapperTest
---
.../cassandra/mail/CassandraMailboxMapperTest.java | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
index 0066a40..c60c338 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxMapperTest.java
@@ -103,6 +103,11 @@ class CassandraMailboxMapperTest {
CassandraConfiguration.DEFAULT_CONFIGURATION,
cassandraCluster.getCassandraConsistenciesConfiguration());
versionDAO = new CassandraSchemaVersionDAO(cassandra.getConf());
+
+ versionDAO.truncateVersion()
+ .then(versionDAO.updateVersion(new SchemaVersion(7)))
+ .block();
+
testee = new CassandraMailboxMapper(
mailboxDAO,
mailboxPathDAO,
@@ -830,8 +835,6 @@ class CassandraMailboxMapperTest {
@Test
void findMailboxWithPathLikeShouldReturnMailboxesWhenExistsInV1Table() {
- versionDAO.updateVersion(new SchemaVersion(7)).block();
-
mailboxDAO.save(MAILBOX)
.block();
mailboxPathDAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -850,8 +853,6 @@ class CassandraMailboxMapperTest {
@Test
void findMailboxWithPathLikeShouldReturnMailboxesWhenExistsInBothTables() {
- versionDAO.updateVersion(new SchemaVersion(7)).block();
-
mailboxDAO.save(MAILBOX)
.block();
mailboxPathDAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -872,8 +873,6 @@ class CassandraMailboxMapperTest {
@Test
void findMailboxWithPathLikeShouldReturnMailboxesWhenExistsInV2Table() {
- versionDAO.updateVersion(new SchemaVersion(7)).block();
-
mailboxDAO.save(MAILBOX)
.block();
mailboxPathV2DAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -911,8 +910,6 @@ class CassandraMailboxMapperTest {
@Test
void hasChildrenShouldReturnChildWhenExistsInV1Table() {
- versionDAO.updateVersion(new SchemaVersion(7)).block();
-
mailboxDAO.save(MAILBOX)
.block();
mailboxPathDAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -932,8 +929,6 @@ class CassandraMailboxMapperTest {
@Test
void hasChildrenShouldReturnChildWhenExistsInBothTables() {
- versionDAO.updateVersion(new SchemaVersion(7)).block();
-
mailboxDAO.save(MAILBOX)
.block();
mailboxPathDAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -955,8 +950,6 @@ class CassandraMailboxMapperTest {
@Test
void hasChildrenShouldReturnChildWhenExistsInV2Table() {
- versionDAO.updateVersion(new SchemaVersion(7)).block();
-
mailboxDAO.save(MAILBOX)
.block();
mailboxPathV2DAO.save(MAILBOX_PATH, MAILBOX_ID)
@@ -995,8 +988,6 @@ class CassandraMailboxMapperTest {
@Test
void findMailboxWithPathLikeShouldRemoveDuplicatesAndKeepV3() {
- versionDAO.updateVersion(new SchemaVersion(7)).block();
-
mailboxDAO.save(MAILBOX).block();
mailboxPathV3DAO.save(MAILBOX).block();
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org