This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit c6666eb1d9e71d5b6fa77b1c16e4fe4ddcabb35b
Author: Tran Tien Duc <dt...@linagora.com>
AuthorDate: Mon Jul 8 10:09:17 2019 +0700
JAMES-2806 use fixed bucket name in tests
---
.../apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSTest.java | 4 +---
.../apache/james/blob/objectstorage/ObjectStorageBlobsDAOTest.java | 3 +--
.../blob/objectstorage/aws/AwsS3ObjectStorageBlobsDAOBuilderTest.java | 4 +---
.../swift/SwiftKeystone2ObjectStorageBlobsDAOBuilderTest.java | 3 +--
.../swift/SwiftKeystone3ObjectStorageBlobsDAOBuilderTest.java | 3 +--
.../swift/SwiftTempAuthObjectStorageBlobsDAOBuilderTest.java | 3 +--
6 files changed, 6 insertions(+), 14 deletions(-)
diff --git
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSTest.java
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSTest.java
index b9f101b..209be69 100644
---
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSTest.java
+++
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOAWSTest.java
@@ -19,8 +19,6 @@
package org.apache.james.blob.objectstorage;
-import java.util.UUID;
-
import org.apache.james.blob.api.BlobId;
import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.BucketBlobStoreContract;
@@ -51,7 +49,7 @@ public class ObjectStorageBlobsDAOAWSTest implements
MetricableBlobStoreContract
@BeforeEach
void setUp(DockerAwsS3Container dockerAwsS3) {
awsS3ObjectStorage = new AwsS3ObjectStorage();
- defaultBucketName = BucketName.of(UUID.randomUUID().toString());
+ defaultBucketName =
BucketName.of("e7a929fe-2003-48d4-aaa9-a65d4954379d");
configuration = AwsS3AuthConfiguration.builder()
.endpoint(dockerAwsS3.getEndpoint())
.accessKeyId(DockerAwsS3Container.ACCESS_KEY_ID)
diff --git
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOTest.java
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOTest.java
index 9423ee8..18c6bf2 100644
---
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOTest.java
+++
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/ObjectStorageBlobsDAOTest.java
@@ -25,7 +25,6 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-import java.util.UUID;
import org.apache.commons.io.IOUtils;
import org.apache.james.blob.api.BlobId;
@@ -76,7 +75,7 @@ public class ObjectStorageBlobsDAOTest implements
MetricableBlobStoreContract, B
@BeforeEach
void setUp(DockerSwift dockerSwift) {
- defaultBucketName = BucketName.of(UUID.randomUUID().toString());
+ defaultBucketName =
BucketName.of("e4fc2427-f2aa-422a-a535-3df0d2a086c4");
testConfig = SwiftTempAuthObjectStorage.configBuilder()
.endpoint(dockerSwift.swiftEndpoint())
.identity(SWIFT_IDENTITY)
diff --git
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorageBlobsDAOBuilderTest.java
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorageBlobsDAOBuilderTest.java
index 1592c99..a81e930 100644
---
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorageBlobsDAOBuilderTest.java
+++
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorageBlobsDAOBuilderTest.java
@@ -21,8 +21,6 @@ package org.apache.james.blob.objectstorage.aws;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import java.util.UUID;
-
import org.apache.james.blob.api.BucketName;
import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.objectstorage.ObjectStorageBlobsDAO;
@@ -43,7 +41,7 @@ class AwsS3ObjectStorageBlobsDAOBuilderTest implements
ObjectStorageBlobsDAOCont
@BeforeEach
void setUp(DockerAwsS3Container dockerAwsS3Container) {
awsS3ObjectStorage = new AwsS3ObjectStorage();
- defaultBucketName = BucketName.of(UUID.randomUUID().toString());
+ defaultBucketName =
BucketName.of("d1953ef8-cfe8-460b-bc29-3977f5b6656f");
configuration = AwsS3AuthConfiguration.builder()
.endpoint(dockerAwsS3Container.getEndpoint())
.accessKeyId(DockerAwsS3Container.ACCESS_KEY_ID)
diff --git
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone2ObjectStorageBlobsDAOBuilderTest.java
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone2ObjectStorageBlobsDAOBuilderTest.java
index 38d2386..649bb91 100644
---
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone2ObjectStorageBlobsDAOBuilderTest.java
+++
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone2ObjectStorageBlobsDAOBuilderTest.java
@@ -22,7 +22,6 @@ package org.apache.james.blob.objectstorage.swift;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.net.URI;
-import java.util.UUID;
import org.apache.james.blob.api.BucketName;
import org.apache.james.blob.api.HashBlobId;
@@ -48,7 +47,7 @@ class SwiftKeystone2ObjectStorageBlobsDAOBuilderTest
implements ObjectStorageBlo
@BeforeEach
void setUp(DockerSwift dockerSwift) {
- defaultBucketName = BucketName.of(UUID.randomUUID().toString());
+ defaultBucketName =
BucketName.of("795d5ff2-510b-487b-a112-fb4b4ed9a9d5");
endpoint = dockerSwift.keystoneV2Endpoint();
testConfig = SwiftKeystone2ObjectStorage.configBuilder()
.endpoint(endpoint)
diff --git
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorageBlobsDAOBuilderTest.java
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorageBlobsDAOBuilderTest.java
index 246efae..dd5be4d 100644
---
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorageBlobsDAOBuilderTest.java
+++
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorageBlobsDAOBuilderTest.java
@@ -23,7 +23,6 @@ import static
org.assertj.core.api.Assertions.assertThatThrownBy;
import java.util.HashMap;
import java.util.Map;
-import java.util.UUID;
import org.apache.james.blob.api.BucketName;
import org.apache.james.blob.api.HashBlobId;
@@ -78,7 +77,7 @@ class SwiftKeystone3ObjectStorageBlobsDAOBuilderTest
implements ObjectStorageBlo
@BeforeEach
void setUp(DockerSwift dockerSwift) {
this.dockerSwift = dockerSwift;
- defaultBucketName = BucketName.of(UUID.randomUUID().toString());
+ defaultBucketName =
BucketName.of("4f75f792-205c-4279-a2ab-dbf2fba1c24d");
testConfig = PROJECT_CONFIG
.endpoint(dockerSwift.keystoneV3Endpoint())
.build();
diff --git
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorageBlobsDAOBuilderTest.java
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorageBlobsDAOBuilderTest.java
index 853b382..ba729a3 100644
---
a/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorageBlobsDAOBuilderTest.java
+++
b/server/blob/blob-objectstorage/src/test/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorageBlobsDAOBuilderTest.java
@@ -22,7 +22,6 @@ package org.apache.james.blob.objectstorage.swift;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.net.URI;
-import java.util.UUID;
import org.apache.james.blob.api.BucketName;
import org.apache.james.blob.api.HashBlobId;
@@ -48,7 +47,7 @@ class SwiftTempAuthObjectStorageBlobsDAOBuilderTest
implements ObjectStorageBlob
@BeforeEach
void setUp(DockerSwift dockerSwift) {
- defaultBucketName = BucketName.of(UUID.randomUUID().toString());
+ defaultBucketName =
BucketName.of("ea21582e-f6c1-4737-867a-b25d0b36eccc");
endpoint = dockerSwift.swiftEndpoint();
testConfig = SwiftTempAuthObjectStorage.configBuilder()
.endpoint(endpoint)
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
