You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by jh...@apache.org on 2024/07/31 04:40:48 UTC
(james-project) 01/11: JAMES-3763 Use arbitrary BlobIds in tests
This is an automated email from the ASF dual-hosted git repository.
jhelou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 908ea6e45ea324f59358b1f943cbd98a38d726d4
Author: Jean Helou <je...@xn--gml-cma.com>
AuthorDate: Thu Jul 18 18:29:22 2024 +0200
JAMES-3763 Use arbitrary BlobIds in tests
In these tests the actual value of the BlobId doesn't matter, since we want to get rid of BlobId#forPayload, we first clean unneeded usages in tests.
Co-Authored-By: Matthieu Baechler <ma...@apache.org>
---
.../cassandra/mail/CassandraMessageIdDAOTest.java | 2 +-
.../mail/CassandraMessageIdToImapUidDAOTest.java | 2 +-
.../cassandra/search/AllSearchOverrideTest.java | 2 +-
.../search/NotDeletedWithRangeSearchOverrideTest.java | 2 +-
.../cassandra/search/UidSearchOverrideTest.java | 2 +-
.../apache/james/blob/api/DeleteBlobStoreContract.java | 4 ++--
.../export/file/LocalFileBlobExportMechanismTest.java | 2 +-
.../blob/deduplication/GenerationAwareBlobIdTest.java | 18 +++++++++---------
.../apache/james/blob/mail/MimeMessageStoreTest.java | 4 ++--
.../task/MetaDataFixInconsistenciesServiceTest.java | 2 +-
.../Pop3MetaDataFixInconsistenciesRoutesTest.java | 2 +-
.../linshare/LinshareBlobExportMechanismTest.java | 2 +-
12 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAOTest.java
index 6505ce4ea1..e48102b730 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdDAOTest.java
@@ -50,7 +50,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import reactor.core.publisher.Flux;
class CassandraMessageIdDAOTest {
- private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().forPayload("abc".getBytes());
+ private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().of("abc");
private static final CassandraModule MODULE = CassandraModule.aggregateModules(
CassandraMessageModule.MODULE,
CassandraSchemaVersionModule.MODULE);
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAOTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAOTest.java
index d61d184147..c0819ef2c1 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAOTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMessageIdToImapUidDAOTest.java
@@ -51,7 +51,7 @@ import com.datastax.oss.driver.api.core.uuid.Uuids;
import reactor.core.publisher.Flux;
class CassandraMessageIdToImapUidDAOTest {
- private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().forPayload("abc".getBytes());
+ private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().of("abc");
private static final CassandraModule MODULE = CassandraModule.aggregateModules(
CassandraSchemaVersionModule.MODULE,
CassandraMessageModule.MODULE);
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/AllSearchOverrideTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/AllSearchOverrideTest.java
index 7b4ed6a45f..6c843d1d53 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/AllSearchOverrideTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/AllSearchOverrideTest.java
@@ -56,7 +56,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class AllSearchOverrideTest {
private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(Username.of("benwa"));
private static final Mailbox MAILBOX = new Mailbox(MailboxPath.inbox(MAILBOX_SESSION), UidValidity.of(12), CassandraId.timeBased());
- private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().forPayload("abc".getBytes());
+ private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().of("abc");
private static final CassandraModule MODULE = CassandraModule.aggregateModules(
CassandraMessageModule.MODULE,
CassandraSchemaVersionModule.MODULE);
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/NotDeletedWithRangeSearchOverrideTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/NotDeletedWithRangeSearchOverrideTest.java
index 309fad22c0..2d8b47c8d8 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/NotDeletedWithRangeSearchOverrideTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/NotDeletedWithRangeSearchOverrideTest.java
@@ -58,7 +58,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class NotDeletedWithRangeSearchOverrideTest {
private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(Username.of("benwa"));
private static final Mailbox MAILBOX = new Mailbox(MailboxPath.inbox(MAILBOX_SESSION), UidValidity.of(12), CassandraId.timeBased());
- private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().forPayload("abc".getBytes());
+ private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().of("abc");
private static final CassandraModule MODULE = CassandraModule.aggregateModules(
CassandraMessageModule.MODULE,
CassandraSchemaVersionModule.MODULE);
diff --git a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/UidSearchOverrideTest.java b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/UidSearchOverrideTest.java
index c0d82632b5..b9acfc55ab 100644
--- a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/UidSearchOverrideTest.java
+++ b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/search/UidSearchOverrideTest.java
@@ -57,7 +57,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
class UidSearchOverrideTest {
private static final MailboxSession MAILBOX_SESSION = MailboxSessionUtil.create(Username.of("benwa"));
private static final Mailbox MAILBOX = new Mailbox(MailboxPath.inbox(MAILBOX_SESSION), UidValidity.of(12), CassandraId.timeBased());
- private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().forPayload("abc".getBytes());
+ private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().of("abc");
private static final CassandraModule MODULE = CassandraModule.aggregateModules(
CassandraMessageModule.MODULE,
CassandraSchemaVersionModule.MODULE);
diff --git a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/DeleteBlobStoreContract.java b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/DeleteBlobStoreContract.java
index afc65f5989..618ed2d5db 100644
--- a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/DeleteBlobStoreContract.java
+++ b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/DeleteBlobStoreContract.java
@@ -55,7 +55,7 @@ public interface DeleteBlobStoreContract {
BlobStore store = testee();
BucketName defaultBucketName = store.getDefaultBucketName();
- assertThatCode(() -> Mono.from(store.delete(defaultBucketName, blobIdFactory().randomId())).block())
+ assertThatCode(() -> Mono.from(store.delete(defaultBucketName, blobIdFactory().of("NOT_EXISTING_BLOB_ID"))).block())
.doesNotThrowAnyException();
}
@@ -115,7 +115,7 @@ public interface DeleteBlobStoreContract {
@Test
default void deleteShouldThrowWhenNullBucketName() {
BlobStore store = testee();
- assertThatThrownBy(() -> Mono.from(store.delete(null, blobIdFactory().randomId())).block())
+ assertThatThrownBy(() -> Mono.from(store.delete(null, blobIdFactory().of("ANY_BLOB_ID"))).block())
.isInstanceOf(NullPointerException.class);
}
diff --git a/server/blob/blob-export-file/src/test/java/org/apache/james/blob/export/file/LocalFileBlobExportMechanismTest.java b/server/blob/blob-export-file/src/test/java/org/apache/james/blob/export/file/LocalFileBlobExportMechanismTest.java
index 9465a9278f..fd93f8aafc 100644
--- a/server/blob/blob-export-file/src/test/java/org/apache/james/blob/export/file/LocalFileBlobExportMechanismTest.java
+++ b/server/blob/blob-export-file/src/test/java/org/apache/james/blob/export/file/LocalFileBlobExportMechanismTest.java
@@ -140,7 +140,7 @@ class LocalFileBlobExportMechanismTest {
@Test
void shareShouldFailWhenBlobDoesNotExist() {
- BlobId blobId = new HashBlobId.Factory().forPayload("not existing".getBytes(StandardCharsets.UTF_8));
+ BlobId blobId = new HashBlobId.Factory().of("NOT_EXISTING_BLOB_ID");
assertThatThrownBy(() ->
testee.blobId(blobId)
diff --git a/server/blob/blob-storage-strategy/src/test/java/org/apache/james/server/blob/deduplication/GenerationAwareBlobIdTest.java b/server/blob/blob-storage-strategy/src/test/java/org/apache/james/server/blob/deduplication/GenerationAwareBlobIdTest.java
index d08c755dd8..5bca36a3ac 100644
--- a/server/blob/blob-storage-strategy/src/test/java/org/apache/james/server/blob/deduplication/GenerationAwareBlobIdTest.java
+++ b/server/blob/blob-storage-strategy/src/test/java/org/apache/james/server/blob/deduplication/GenerationAwareBlobIdTest.java
@@ -106,7 +106,7 @@ class GenerationAwareBlobIdTest {
class BlobIdParsing {
@Test
void previousBlobIdsShouldBeParsable() {
- String blobIdString = delegate.forPayload("abc".getBytes()).asString();
+ String blobIdString = delegate.of("abc").asString();
GenerationAwareBlobId actual = testee.from(blobIdString);
@@ -119,27 +119,27 @@ class GenerationAwareBlobIdTest {
@Test
void noFamilyShouldBeParsable() {
- String blobIdString = "0_0_" + delegate.forPayload("abc".getBytes()).asString();
+ String blobIdString = "0_0_" + delegate.of("abc").asString();
GenerationAwareBlobId actual = testee.from(blobIdString);
SoftAssertions.assertSoftly(soft -> {
soft.assertThat(actual.getFamily()).isEqualTo(0);
soft.assertThat(actual.getGeneration()).isEqualTo(0L);
- soft.assertThat(actual.getDelegate()).isEqualTo(delegate.forPayload("abc".getBytes()));
+ soft.assertThat(actual.getDelegate()).isEqualTo(delegate.of("abc"));
});
}
@Test
void generationBlobIdShouldBeParsable() {
- String blobIdString = "12_126_" + delegate.forPayload("abc".getBytes()).asString();
+ String blobIdString = "12_126_" + delegate.of("abc").asString();
GenerationAwareBlobId actual = testee.from(blobIdString);
SoftAssertions.assertSoftly(soft -> {
soft.assertThat(actual.getFamily()).isEqualTo(12);
soft.assertThat(actual.getGeneration()).isEqualTo(126L);
- soft.assertThat(actual.getDelegate()).isEqualTo(delegate.forPayload("abc".getBytes()));
+ soft.assertThat(actual.getDelegate()).isEqualTo(delegate.of("abc"));
});
}
@@ -248,14 +248,14 @@ class GenerationAwareBlobIdTest {
@Test
void inActiveGenerationShouldReturnTrueWhenSameDate() {
- GenerationAwareBlobId blobId = testee.forPayload("abc".getBytes());
+ GenerationAwareBlobId blobId = testee.of("abc");
assertThat(blobId.inActiveGeneration(GenerationAwareBlobId.Configuration.DEFAULT, NOW)).isTrue();
}
@Test
void inActiveGenerationShouldReturnTrueWhenInTheFuture() {
- GenerationAwareBlobId blobId = testee.forPayload("abc".getBytes());
+ GenerationAwareBlobId blobId = testee.of("abc");
assertThat(blobId.inActiveGeneration(GenerationAwareBlobId.Configuration.DEFAULT, NOW.minus(60, ChronoUnit.DAYS)))
.isTrue();
@@ -263,7 +263,7 @@ class GenerationAwareBlobIdTest {
@Test
void inActiveGenerationShouldReturnTrueForAtLeastOneMoreMonth() {
- GenerationAwareBlobId blobId = testee.forPayload("abc".getBytes());
+ GenerationAwareBlobId blobId = testee.of("abc");
assertThat(blobId.inActiveGeneration(GenerationAwareBlobId.Configuration.DEFAULT, NOW.plus(30, ChronoUnit.DAYS)))
.isTrue();
@@ -271,7 +271,7 @@ class GenerationAwareBlobIdTest {
@Test
void inActiveGenerationShouldReturnFalseAfterTwoMonth() {
- GenerationAwareBlobId blobId = testee.forPayload("abc".getBytes());
+ GenerationAwareBlobId blobId = testee.of("abc");
assertThat(blobId.inActiveGeneration(GenerationAwareBlobId.Configuration.DEFAULT, NOW.plus(60, ChronoUnit.DAYS)))
.isFalse();
diff --git a/server/blob/mail-store/src/test/java/org/apache/james/blob/mail/MimeMessageStoreTest.java b/server/blob/mail-store/src/test/java/org/apache/james/blob/mail/MimeMessageStoreTest.java
index c913ec7fe5..c297f168b8 100644
--- a/server/blob/mail-store/src/test/java/org/apache/james/blob/mail/MimeMessageStoreTest.java
+++ b/server/blob/mail-store/src/test/java/org/apache/james/blob/mail/MimeMessageStoreTest.java
@@ -105,8 +105,8 @@ class MimeMessageStoreTest {
@Test
void deleteShouldNotThrowWhenCalledOnNonExistingData() throws Exception {
MimeMessagePartsId parts = MimeMessagePartsId.builder()
- .headerBlobId(BLOB_ID_FACTORY.randomId())
- .bodyBlobId(BLOB_ID_FACTORY.randomId())
+ .headerBlobId(BLOB_ID_FACTORY.of("NON_EXISTING_HEADER_BLOB_ID"))
+ .bodyBlobId(BLOB_ID_FACTORY.of("NON_EXISTING_BODY_BLOB_ID"))
.build();
assertThatCode(() -> Mono.from(testee.delete(parts)).block())
diff --git a/server/protocols/protocols-pop3-distributed/src/test/java/org/apache/james/pop3server/mailbox/task/MetaDataFixInconsistenciesServiceTest.java b/server/protocols/protocols-pop3-distributed/src/test/java/org/apache/james/pop3server/mailbox/task/MetaDataFixInconsistenciesServiceTest.java
index 1ae46f2794..072286d9c1 100644
--- a/server/protocols/protocols-pop3-distributed/src/test/java/org/apache/james/pop3server/mailbox/task/MetaDataFixInconsistenciesServiceTest.java
+++ b/server/protocols/protocols-pop3-distributed/src/test/java/org/apache/james/pop3server/mailbox/task/MetaDataFixInconsistenciesServiceTest.java
@@ -78,7 +78,7 @@ public class MetaDataFixInconsistenciesServiceTest {
private static final ModSeq MOD_SEQ_2 = ModSeq.of(2L);
private static final String CONTENT_MESSAGE = "CONTENT 123 BLA BLA";
- private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().forPayload("abc".getBytes());
+ private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().of("abc");
private static final CassandraMessageMetadata MESSAGE_1 = CassandraMessageMetadata.builder()
.ids(ComposedMessageIdWithMetaData.builder()
.composedMessageId(new ComposedMessageId(MAILBOX_ID, MESSAGE_ID_1, MESSAGE_UID_1))
diff --git a/server/protocols/webadmin/webadmin-pop3/src/test/java/org/apache/james/pop3/webadmin/Pop3MetaDataFixInconsistenciesRoutesTest.java b/server/protocols/webadmin/webadmin-pop3/src/test/java/org/apache/james/pop3/webadmin/Pop3MetaDataFixInconsistenciesRoutesTest.java
index 28dd28a486..34f0aec4a8 100644
--- a/server/protocols/webadmin/webadmin-pop3/src/test/java/org/apache/james/pop3/webadmin/Pop3MetaDataFixInconsistenciesRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-pop3/src/test/java/org/apache/james/pop3/webadmin/Pop3MetaDataFixInconsistenciesRoutesTest.java
@@ -119,7 +119,7 @@ class Pop3MetaDataFixInconsistenciesRoutesTest {
private static final String CONTENT_MESSAGE = "CONTENT 123 BLA BLA";
private static final ModSeq MOD_SEQ_1 = ModSeq.of(1L);
private static final ModSeq MOD_SEQ_2 = ModSeq.of(2L);
- private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().forPayload("abc".getBytes());
+ private static final HashBlobId HEADER_BLOB_ID_1 = new HashBlobId.Factory().of("abc");
private static final CassandraMessageMetadata MESSAGE_1 = CassandraMessageMetadata.builder()
.ids(ComposedMessageIdWithMetaData.builder()
.composedMessageId(new ComposedMessageId(MAILBOX_ID, MESSAGE_ID_1, MESSAGE_UID_1))
diff --git a/third-party/linshare/src/test/java/org/apache/james/linshare/LinshareBlobExportMechanismTest.java b/third-party/linshare/src/test/java/org/apache/james/linshare/LinshareBlobExportMechanismTest.java
index e05caa4fc0..8923d3c3b2 100644
--- a/third-party/linshare/src/test/java/org/apache/james/linshare/LinshareBlobExportMechanismTest.java
+++ b/third-party/linshare/src/test/java/org/apache/james/linshare/LinshareBlobExportMechanismTest.java
@@ -109,7 +109,7 @@ class LinshareBlobExportMechanismTest {
@Test
void exportShouldFailWhenBlobDoesNotExist() {
- BlobId blobId = blobIdFactory.randomId();
+ BlobId blobId = blobIdFactory.of("NOT_EXISTING_BLOB_ID");
assertThatThrownBy(
() -> testee.blobId(blobId)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org