From e83665aa9219ff06f29467ce69da4ebf050f48a7 Mon Sep 17 00:00:00 2001 From: AssahBismarkabah Date: Thu, 11 Apr 2024 15:39:39 +0100 Subject: [PATCH] fix: updated datasafe-test-storage Test File --- .../business/impl/e2e/BaseE2ETest.java | 6 ++--- .../impl/e2e/BasicFunctionalityTest.java | 20 ++++++++--------- .../impl/e2e/BasicFunctionalityUtf8Test.java | 12 +++++----- ...icFunctionalityWithConcurrencyTestIT.java} | 8 +++---- ...unctionalityWithPasswordChangeTestIT.java} | 14 ++++++------ .../impl/e2e/KeyStoreTypeCompareTest.java | 6 ++--- .../impl/e2e/SchemeDelegationTest.java | 6 ++--- ...java => SchemeDelegationWithDbTestIT.java} | 4 ++-- ...java => StorageBasedVersioningTestIT.java} | 8 +++---- ...st.java => UserProfileWithUtf8TestIT.java} | 4 ++-- .../business/impl/e2e/VersionedDataTest.java | 20 ++++++++--------- .../framework/BaseRandomActions.java | 4 ++-- .../simple/adapter/impl/CleanupDbTest.java | 8 +++---- .../impl/DFSRelativeToRootProfileTest.java | 6 ++--- .../impl/DFSTestCredentialsFactory.java | 4 ++-- .../adapter/impl/InitFromStorageProvider.java | 4 ++-- .../impl/SimpleDatasafeAdapterTest.java | 22 +++++++++---------- .../adapter/spring/InjectionForMinioTest.java | 4 ++-- .../simple/adapter/spring/InjectionTest.java | 4 ++-- ...ithoutPathEncryptionForFilesystemTest.java | 4 ++-- ...tionWithoutPathEncryptionForMinioTest.java | 6 ++--- ...ovider.java => WithStorageProviderIT.java} | 6 ++--- 22 files changed, 90 insertions(+), 90 deletions(-) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{BasicFunctionalityWithConcurrencyTest.java => BasicFunctionalityWithConcurrencyTestIT.java} (97%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{BasicFunctionalityWithPasswordChangeTest.java => BasicFunctionalityWithPasswordChangeTestIT.java} (94%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{SchemeDelegationWithDbTest.java => SchemeDelegationWithDbTestIT.java} (97%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{StorageBasedVersioningTest.java => StorageBasedVersioningTestIT.java} (93%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{UserProfileWithUtf8Test.java => UserProfileWithUtf8TestIT.java} (97%) rename datasafe-test-storages/src/test/java/de/adorsys/datasafe/teststorage/{WithStorageProvider.java => WithStorageProviderIT.java} (98%) diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2ETest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2ETest.java index d544e2842..fc4984af0 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2ETest.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2ETest.java @@ -19,7 +19,7 @@ import de.adorsys.datasafe.privatestore.api.actions.RemoveFromPrivate; import de.adorsys.datasafe.privatestore.api.actions.WriteToPrivate; import de.adorsys.datasafe.storage.impl.fs.FileSystemStorageService; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import de.adorsys.datasafe.types.api.actions.ListRequest; import de.adorsys.datasafe.types.api.actions.ReadRequest; import de.adorsys.datasafe.types.api.actions.RemoveRequest; @@ -52,7 +52,7 @@ @Slf4j @RequiredArgsConstructor -public abstract class BaseE2ETest extends WithStorageProvider { +public abstract class BaseE2ETest extends WithStorageProviderIT { protected static final String PRIVATE_COMPONENT = "private"; protected static final String PRIVATE_FILES_COMPONENT = PRIVATE_COMPONENT + "/files"; @@ -252,7 +252,7 @@ protected void assertInboxSpaceList(UserIDAuth user, String root, String... expe } @SneakyThrows - protected void assertRootDirIsEmpty(WithStorageProvider.StorageDescriptor descriptor) { + protected void assertRootDirIsEmpty(WithStorageProviderIT.StorageDescriptor descriptor) { try (Stream> ls = descriptor.getStorageService().get() .list( new AbsoluteLocation<>(BasePrivateResource.forPrivate(descriptor.getLocation()))) diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityTest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityTest.java index 8ee49c217..a20f2132b 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityTest.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityTest.java @@ -4,7 +4,7 @@ import de.adorsys.datasafe.encrypiton.api.types.UserID; import de.adorsys.datasafe.encrypiton.api.types.UserIDAuth; import de.adorsys.datasafe.storage.api.StorageService; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import de.adorsys.datasafe.types.api.actions.ListRequest; import de.adorsys.datasafe.types.api.actions.ReadRequest; import de.adorsys.datasafe.types.api.actions.RemoveRequest; @@ -65,7 +65,7 @@ class BasicFunctionalityTest extends BaseE2ETest { @SneakyThrows @ParameterizedTest @MethodSource("fsOnly") - void testDFSPasswordClearance(WithStorageProvider.StorageDescriptor descriptor) { + void testDFSPasswordClearance(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); UserID userJohn = new UserID("john"); assertThat(profileRetrievalService.userExists(userJohn)).isFalse(); @@ -154,7 +154,7 @@ void testDFSPasswordClearance(WithStorageProvider.StorageDescriptor descriptor) @ParameterizedTest @MethodSource("allStorages") - void testDFSBasedProfileStorage(WithStorageProvider.StorageDescriptor descriptor) { + void testDFSBasedProfileStorage(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); UserID userJohn = new UserID("john"); assertThat(profileRetrievalService.userExists(userJohn)).isFalse(); @@ -173,7 +173,7 @@ void testDFSBasedProfileStorage(WithStorageProvider.StorageDescriptor descriptor @SneakyThrows @ParameterizedTest @MethodSource("fsOnly") - void testUserIsRemovedWithFiles(WithStorageProvider.StorageDescriptor descriptor) { + void testUserIsRemovedWithFiles(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); UserID userJohn = new UserID("john"); john = registerUser(userJohn.getValue()); @@ -191,7 +191,7 @@ void testUserIsRemovedWithFiles(WithStorageProvider.StorageDescriptor descriptor @SneakyThrows @ParameterizedTest @MethodSource("allStorages") - void testMultipleRecipientsSharing(WithStorageProvider.StorageDescriptor descriptor) { + void testMultipleRecipientsSharing(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); UserIDAuth john = registerUser("john"); @@ -214,7 +214,7 @@ void testMultipleRecipientsSharing(WithStorageProvider.StorageDescriptor descrip @SneakyThrows @ParameterizedTest @MethodSource("allStorages") - void testMultipleRecipientsSharingLargeChunk(WithStorageProvider.StorageDescriptor descriptor) { + void testMultipleRecipientsSharingLargeChunk(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); UserIDAuth john = registerUser("john"); @@ -242,7 +242,7 @@ void testMultipleRecipientsSharingLargeChunk(WithStorageProvider.StorageDescript @ParameterizedTest @MethodSource("allStorages") void testWriteToPrivateListPrivateReadPrivateAndSendToAndReadFromInbox( - WithStorageProvider.StorageDescriptor descriptor) { + WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); registerJohnAndJane(); @@ -273,7 +273,7 @@ void testWriteToPrivateListPrivateReadPrivateAndSendToAndReadFromInbox( @ParameterizedTest @MethodSource("allStorages") - void listingValidation(WithStorageProvider.StorageDescriptor descriptor) { + void listingValidation(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); registerJohnAndJane(); @@ -303,7 +303,7 @@ void listingValidation(WithStorageProvider.StorageDescriptor descriptor) { @ParameterizedTest @MethodSource("allStorages") - void listingInboxValidation(WithStorageProvider.StorageDescriptor descriptor) { + void listingInboxValidation(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); registerJohnAndJane(); @@ -372,7 +372,7 @@ private List> listFiles(Predicate pat } } - private void init(WithStorageProvider.StorageDescriptor descriptor) { + private void init(WithStorageProviderIT.StorageDescriptor descriptor) { DefaultDatasafeServices datasafeServices = DatasafeServicesProvider .defaultDatasafeServices(descriptor.getStorageService().get(), descriptor.getLocation()); initialize(DatasafeServicesProvider.dfsConfig(descriptor.getLocation()), datasafeServices); diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8Test.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8Test.java index 7d9c233c1..c74478fa0 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8Test.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8Test.java @@ -1,7 +1,7 @@ package de.adorsys.datasafe.business.impl.e2e; import de.adorsys.datasafe.business.impl.service.DefaultDatasafeServices; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import de.adorsys.datasafe.types.api.resource.AbsoluteLocation; import de.adorsys.datasafe.types.api.resource.BasePrivateResource; import de.adorsys.datasafe.types.api.resource.ResolvedResource; @@ -24,7 +24,7 @@ class BasicFunctionalityUtf8Test extends BaseE2ETest { @ParameterizedTest @MethodSource("allStorages") - void readPrivateContentWithUnicode(WithStorageProvider.StorageDescriptor descriptor) { + void readPrivateContentWithUnicode(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); jane = registerUser("jane"); @@ -41,7 +41,7 @@ void readPrivateContentWithUnicode(WithStorageProvider.StorageDescriptor descrip @ParameterizedTest @MethodSource("allStorages") - void readPrivateContentWithUnicodeUsingUnicodePath(WithStorageProvider.StorageDescriptor descriptor) { + void readPrivateContentWithUnicodeUsingUnicodePath(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); jane = registerUser("jane"); @@ -59,7 +59,7 @@ void readPrivateContentWithUnicodeUsingUnicodePath(WithStorageProvider.StorageDe @ParameterizedTest @MethodSource("allStorages") - void listingPrivatePathWithUnicode(WithStorageProvider.StorageDescriptor descriptor) { + void listingPrivatePathWithUnicode(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); registerJohnAndJane(); @@ -83,7 +83,7 @@ void listingPrivatePathWithUnicode(WithStorageProvider.StorageDescriptor descrip @ParameterizedTest @MethodSource("allStorages") - void readInboxContentWithUnicodeUsingUnicodePath(WithStorageProvider.StorageDescriptor descriptor) { + void readInboxContentWithUnicodeUsingUnicodePath(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); jane = registerUser("jane"); @@ -102,7 +102,7 @@ void readInboxContentWithUnicodeUsingUnicodePath(WithStorageProvider.StorageDesc @ParameterizedTest @MethodSource("allStorages") - void listingInboxPathWithUnicode(WithStorageProvider.StorageDescriptor descriptor) { + void listingInboxPathWithUnicode(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); registerJohnAndJane(); diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyTest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyTestIT.java similarity index 97% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyTest.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyTestIT.java index 7a219bf06..82d317f33 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyTest.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyTestIT.java @@ -6,7 +6,7 @@ import de.adorsys.datasafe.business.impl.service.DefaultDatasafeServices; import de.adorsys.datasafe.encrypiton.api.types.UserIDAuth; import de.adorsys.datasafe.storage.api.StorageService; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import de.adorsys.datasafe.types.api.actions.ReadRequest; import de.adorsys.datasafe.types.api.actions.WriteRequest; import de.adorsys.datasafe.types.api.resource.AbsoluteLocation; @@ -56,7 +56,7 @@ * Multithreaded test of basic operations. */ @Slf4j -class BasicFunctionalityWithConcurrencyTest extends BaseE2ETest { +class BasicFunctionalityWithConcurrencyTestIT extends BaseE2ETest { private static final int TIMEOUT_S = 30; @@ -98,7 +98,7 @@ class BasicFunctionalityWithConcurrencyTest extends BaseE2ETest { @SneakyThrows @ParameterizedTest(name = "Run #{index} service storage: {0} with data size: {1} bytes and {2} threads.") @MethodSource("differentThreadsTestOptions") - void writeToPrivateListPrivateInDifferentThreads(WithStorageProvider.StorageDescriptor descriptor, int size, int poolSize) { + void writeToPrivateListPrivateInDifferentThreads(WithStorageProviderIT.StorageDescriptor descriptor, int size, int poolSize) { init(descriptor); Path testFile = tempTestFileFolder.resolve(UUID.randomUUID().toString()); @@ -287,7 +287,7 @@ protected static Stream differentThreadsTestOptions() { return arguments.stream(); } - private void init(WithStorageProvider.StorageDescriptor descriptor) { + private void init(WithStorageProviderIT.StorageDescriptor descriptor) { DefaultDatasafeServices datasafeServices = DatasafeServicesProvider .defaultDatasafeServices(descriptor.getStorageService().get(), descriptor.getLocation()); initialize(DatasafeServicesProvider.dfsConfig(descriptor.getLocation()), datasafeServices); diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeTest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeTestIT.java similarity index 94% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeTest.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeTestIT.java index e970bcd3c..766dd93b1 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeTest.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeTestIT.java @@ -3,7 +3,7 @@ import de.adorsys.datasafe.business.impl.service.DefaultDatasafeServices; import de.adorsys.datasafe.encrypiton.api.types.UserID; import de.adorsys.datasafe.encrypiton.api.types.UserIDAuth; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import de.adorsys.datasafe.types.api.actions.ReadRequest; import de.adorsys.datasafe.types.api.actions.WriteRequest; import de.adorsys.datasafe.types.api.resource.AbsoluteLocation; @@ -28,12 +28,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -class BasicFunctionalityWithPasswordChangeTest extends BaseE2ETest { +class BasicFunctionalityWithPasswordChangeTestIT extends BaseE2ETest { @SneakyThrows @ParameterizedTest @MethodSource("allStorages") - void testUserIsRemovedWithFiles(WithStorageProvider.StorageDescriptor descriptor) { + void testUserIsRemovedWithFiles(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); UserID userJohn = new UserID("john"); john = registerUser(userJohn.getValue()); @@ -57,7 +57,7 @@ void testUserIsRemovedWithFiles(WithStorageProvider.StorageDescriptor descriptor @SneakyThrows @ParameterizedTest @MethodSource("allStorages") - void testMultipleRecipientsSharing(WithStorageProvider.StorageDescriptor descriptor) { + void testMultipleRecipientsSharing(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); UserIDAuth john = registerUser("john"); @@ -79,7 +79,7 @@ void testMultipleRecipientsSharing(WithStorageProvider.StorageDescriptor descrip @ParameterizedTest @MethodSource("allStorages") void testWriteToPrivateListPrivateReadPrivateAndSendToAndReadFromInbox( - WithStorageProvider.StorageDescriptor descriptor) { + WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); registerJohnAndJane(); @@ -124,7 +124,7 @@ void testWriteToPrivateListPrivateReadPrivateAndSendToAndReadFromInbox( @ParameterizedTest @MethodSource("allStorages") - void listingValidation(WithStorageProvider.StorageDescriptor descriptor) { + void listingValidation(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); registerJohnAndJane(); @@ -207,7 +207,7 @@ private UserIDAuth checkUpdatedCredsWorkAndOldDont(UserIDAuth auth, return newAuth; } - private void init(WithStorageProvider.StorageDescriptor descriptor) { + private void init(WithStorageProviderIT.StorageDescriptor descriptor) { DefaultDatasafeServices datasafeServices = DatasafeServicesProvider .defaultDatasafeServices(descriptor.getStorageService().get(), descriptor.getLocation()); initialize(DatasafeServicesProvider.dfsConfig(descriptor.getLocation()), datasafeServices); diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareTest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareTest.java index 76e75fcc4..80a180a01 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareTest.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareTest.java @@ -5,7 +5,7 @@ import de.adorsys.datasafe.directory.impl.profile.config.DefaultDFSConfig; import de.adorsys.datasafe.encrypiton.api.types.UserID; import de.adorsys.datasafe.encrypiton.api.types.encryption.EncryptionConfig; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import de.adorsys.datasafe.types.api.actions.ReadRequest; import de.adorsys.datasafe.types.api.actions.WriteRequest; import de.adorsys.datasafe.types.api.types.ReadStorePassword; @@ -31,7 +31,7 @@ public class KeyStoreTypeCompareTest extends BaseE2ETest { @SneakyThrows @ParameterizedTest @MethodSource("fsOnly") - void compareKeyStoreTypes(WithStorageProvider.StorageDescriptor descriptor) { + void compareKeyStoreTypes(WithStorageProviderIT.StorageDescriptor descriptor) { long tUBER = test(descriptor, "johnUber", "UBER"); long tBCFKS = test(descriptor, "johnBCFKS", "BCFKS"); log.info("UBER test took: {}", tUBER); @@ -42,7 +42,7 @@ void compareKeyStoreTypes(WithStorageProvider.StorageDescriptor descriptor) { @SneakyThrows - long test(WithStorageProvider.StorageDescriptor descriptor, String userName, String keystoreType) { + long test(WithStorageProviderIT.StorageDescriptor descriptor, String userName, String keystoreType) { init(descriptor, keystoreType); UserID user = new UserID(userName); assertThat(profileRetrievalService.userExists(user)).isFalse(); diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationTest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationTest.java index f6396957e..6a83daa11 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationTest.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationTest.java @@ -8,7 +8,7 @@ import de.adorsys.datasafe.storage.api.SchemeDelegatingStorage; import de.adorsys.datasafe.storage.api.StorageService; import de.adorsys.datasafe.storage.impl.fs.FileSystemStorageService; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import de.adorsys.datasafe.types.api.actions.WriteRequest; import de.adorsys.datasafe.types.api.resource.AbsoluteLocation; import de.adorsys.datasafe.types.api.resource.BasePrivateResource; @@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat; -class SchemeDelegationTest extends WithStorageProvider { +class SchemeDelegationTest extends WithStorageProviderIT { private Path fsPath; private Uri minioPath; @@ -42,7 +42,7 @@ class SchemeDelegationTest extends WithStorageProvider { @BeforeEach void initialize(@TempDir Path tempDir) { - WithStorageProvider.StorageDescriptor minioDescriptor = minio(); + WithStorageProviderIT.StorageDescriptor minioDescriptor = minio(); this.fsPath = tempDir; this.minio = minioDescriptor.getStorageService().get(); this.filesystem = new FileSystemStorageService(tempDir); diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationWithDbTest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationWithDbTestIT.java similarity index 97% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationWithDbTest.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationWithDbTestIT.java index 21a0b0397..a4ebcde48 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationWithDbTest.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationWithDbTestIT.java @@ -13,7 +13,7 @@ import de.adorsys.datasafe.storage.impl.db.DatabaseCredentials; import de.adorsys.datasafe.storage.impl.db.DatabaseStorageService; import de.adorsys.datasafe.storage.impl.fs.FileSystemStorageService; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import de.adorsys.datasafe.types.api.actions.WriteRequest; import de.adorsys.datasafe.types.api.resource.AbsoluteLocation; import de.adorsys.datasafe.types.api.resource.BasePrivateResource; @@ -38,7 +38,7 @@ import static de.adorsys.datasafe.types.api.global.PathEncryptionId.AES_SIV; import static org.assertj.core.api.Assertions.assertThat; -class SchemeDelegationWithDbTest extends WithStorageProvider { +class SchemeDelegationWithDbTestIT extends WithStorageProviderIT { private static final Set ALLOWED_TABLES = ImmutableSet.of("users", "private_profiles", "public_profiles"); diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningTest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningTestIT.java similarity index 93% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningTest.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningTestIT.java index f82960a16..b5081058e 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningTest.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningTestIT.java @@ -4,7 +4,7 @@ import com.google.common.io.ByteStreams; import de.adorsys.datasafe.business.impl.service.DefaultDatasafeServices; import de.adorsys.datasafe.encrypiton.api.types.UserIDAuth; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import de.adorsys.datasafe.types.api.actions.ReadRequest; import de.adorsys.datasafe.types.api.actions.RemoveRequest; import de.adorsys.datasafe.types.api.actions.WriteRequest; @@ -24,8 +24,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -@DisabledIfSystemProperty(named = WithStorageProvider.SKIP_CEPH, matches = "true") -class StorageBasedVersioningTest extends BaseE2ETest { +@DisabledIfSystemProperty(named = WithStorageProviderIT.SKIP_CEPH, matches = "true") +class StorageBasedVersioningTestIT extends BaseE2ETest { private static final String FILE = "file.txt"; @@ -107,7 +107,7 @@ private String readByVersion(UserIDAuth user, String path, StorageVersion versio return new String(os.toByteArray(), StandardCharsets.UTF_8); } - private void init(WithStorageProvider.StorageDescriptor descriptor) { + private void init(WithStorageProviderIT.StorageDescriptor descriptor) { DefaultDatasafeServices datasafeServices = DatasafeServicesProvider .defaultDatasafeServices(descriptor.getStorageService().get(), descriptor.getLocation()); initialize(DatasafeServicesProvider.dfsConfig(descriptor.getLocation()), datasafeServices); diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/UserProfileWithUtf8Test.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/UserProfileWithUtf8TestIT.java similarity index 97% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/UserProfileWithUtf8Test.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/UserProfileWithUtf8TestIT.java index eebdc6f71..0b44abd0f 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/UserProfileWithUtf8Test.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/UserProfileWithUtf8TestIT.java @@ -8,7 +8,7 @@ import de.adorsys.datasafe.storage.api.SchemeDelegatingStorage; import de.adorsys.datasafe.storage.api.StorageService; import de.adorsys.datasafe.storage.impl.fs.FileSystemStorageService; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import de.adorsys.datasafe.types.api.actions.WriteRequest; import de.adorsys.datasafe.types.api.resource.AbsoluteLocation; import de.adorsys.datasafe.types.api.resource.BasePrivateResource; @@ -32,7 +32,7 @@ import static de.adorsys.datasafe.types.api.shared.Dirs.computeRelativePreventingDoubleUrlEncode; import static org.assertj.core.api.Assertions.assertThat; -class UserProfileWithUtf8Test extends WithStorageProvider { +class UserProfileWithUtf8TestIT extends WithStorageProviderIT { private Path fsPath; private Uri minioPath; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataTest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataTest.java index d331737e1..24dbade73 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataTest.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataTest.java @@ -5,7 +5,7 @@ import de.adorsys.datasafe.encrypiton.api.types.UserID; import de.adorsys.datasafe.encrypiton.api.types.UserIDAuth; import de.adorsys.datasafe.metainfo.version.impl.version.types.DFSVersion; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import de.adorsys.datasafe.types.api.actions.ListRequest; import de.adorsys.datasafe.types.api.actions.ReadRequest; import de.adorsys.datasafe.types.api.actions.RemoveRequest; @@ -50,7 +50,7 @@ public class VersionedDataTest extends BaseE2ETest { @ParameterizedTest @MethodSource("allLocalDefaultStorages") - void testVersionedWriteTopLevel(WithStorageProvider.StorageDescriptor descriptor) { + void testVersionedWriteTopLevel(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); registerAndDoWritesWithDiffMessageInSameLocation(); @@ -64,7 +64,7 @@ void testVersionedWriteTopLevel(WithStorageProvider.StorageDescriptor descriptor @SneakyThrows @ParameterizedTest @MethodSource("allLocalDefaultStorages") - void testUserIsRemovedWithFiles(WithStorageProvider.StorageDescriptor descriptor) { + void testUserIsRemovedWithFiles(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); UserID userJohn = new UserID("john"); john = registerUser(userJohn.getValue()); @@ -79,7 +79,7 @@ void testUserIsRemovedWithFiles(WithStorageProvider.StorageDescriptor descriptor @ParameterizedTest @MethodSource("allLocalDefaultStorages") - void testVersionedWriteUsingAbsoluteAccess(WithStorageProvider.StorageDescriptor descriptor) { + void testVersionedWriteUsingAbsoluteAccess(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); registerAndDoWritesWithDiffMessageInSameLocation(); Versioned, ResolvedResource, Version> first = firstOfVersionedListRoot(jane); @@ -91,7 +91,7 @@ void testVersionedWriteUsingAbsoluteAccess(WithStorageProvider.StorageDescriptor @ParameterizedTest @MethodSource("allLocalDefaultStorages") - void testVersionedRemove(WithStorageProvider.StorageDescriptor descriptor) { + void testVersionedRemove(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); registerAndDoWritesWithDiffMessageInSameLocation(); @@ -107,7 +107,7 @@ void testVersionedRemove(WithStorageProvider.StorageDescriptor descriptor) { @ParameterizedTest @MethodSource("allLocalDefaultStorages") - void testVersionsOf(WithStorageProvider.StorageDescriptor descriptor) { + void testVersionsOf(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); registerAndDoWritesWithDiffMessageInSameLocation(); @@ -127,7 +127,7 @@ void testVersionsOf(WithStorageProvider.StorageDescriptor descriptor) { @ParameterizedTest @MethodSource("allLocalDefaultStorages") - void testVersionsOfDirectPath(WithStorageProvider.StorageDescriptor descriptor) { + void testVersionsOfDirectPath(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); registerAndDoWritesWithDiffMessageInSameLocation(); @@ -148,7 +148,7 @@ void testVersionsOfDirectPath(WithStorageProvider.StorageDescriptor descriptor) // this test imitates removal of old file versions @ParameterizedTest @MethodSource("allLocalDefaultStorages") - void testOldRemoval(WithStorageProvider.StorageDescriptor descriptor) { + void testOldRemoval(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); registerAndDoWritesWithDiffMessageInSameLocation(); @@ -177,7 +177,7 @@ void testOldRemoval(WithStorageProvider.StorageDescriptor descriptor) { @ParameterizedTest @MethodSource("allLocalDefaultStorages") - void listingValidation(WithStorageProvider.StorageDescriptor descriptor) { + void listingValidation(WithStorageProviderIT.StorageDescriptor descriptor) { init(descriptor); registerJohnAndJane(); @@ -258,7 +258,7 @@ private Stream, ResolvedResource, Ve return versionedDocusafeServices.latestPrivate().listWithDetails(ListRequest.forDefaultPrivate(owner, "./")); } - private void init(WithStorageProvider.StorageDescriptor descriptor) { + private void init(WithStorageProviderIT.StorageDescriptor descriptor) { VersionedDatasafeServices datasafeServices = DatasafeServicesProvider .versionedDatasafeServices(descriptor.getStorageService().get(), descriptor.getLocation()); diff --git a/datasafe-long-run-tests/datasafe-business-tests-random-actions/src/test/java/de/adorsys/datasafe/business/impl/e2e/randomactions/framework/BaseRandomActions.java b/datasafe-long-run-tests/datasafe-business-tests-random-actions/src/test/java/de/adorsys/datasafe/business/impl/e2e/randomactions/framework/BaseRandomActions.java index 367eaeb10..dfa190c19 100644 --- a/datasafe-long-run-tests/datasafe-business-tests-random-actions/src/test/java/de/adorsys/datasafe/business/impl/e2e/randomactions/framework/BaseRandomActions.java +++ b/datasafe-long-run-tests/datasafe-business-tests-random-actions/src/test/java/de/adorsys/datasafe/business/impl/e2e/randomactions/framework/BaseRandomActions.java @@ -14,7 +14,7 @@ import de.adorsys.datasafe.directory.api.profile.operations.ProfileRegistrationService; import de.adorsys.datasafe.inbox.api.InboxService; import de.adorsys.datasafe.privatestore.api.PrivateSpaceService; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.provider.Arguments; @@ -50,7 +50,7 @@ * Execution2 [Action1,Action2,Action3] -- Action1 - Thread pool - Execute [Action3,Action1,Action1] on shared user set * Execution3 [Action1,Action2,Action3] -- Action1 / */ -public abstract class BaseRandomActions extends WithStorageProvider { +public abstract class BaseRandomActions extends WithStorageProviderIT { public static final String DISABLE_RANDOM_ACTIONS_TEST = "DISABLE_RANDOM_ACTIONS_TEST"; public static final String ENABLE_MULTI_BUCKET_TEST = "ENABLE_MULTI_BUCKET_TEST"; diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/CleanupDbTest.java b/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/CleanupDbTest.java index 45cce5494..d056678d5 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/CleanupDbTest.java +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/CleanupDbTest.java @@ -8,7 +8,7 @@ import de.adorsys.datasafe.simple.adapter.api.types.DocumentContent; import de.adorsys.datasafe.simple.adapter.api.types.DocumentFQN; import de.adorsys.datasafe.simple.adapter.impl.config.PathEncryptionConfig; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import de.adorsys.datasafe.types.api.resource.AbsoluteLocation; import de.adorsys.datasafe.types.api.resource.BasePrivateResource; import de.adorsys.datasafe.types.api.resource.ResolvedResource; @@ -20,13 +20,13 @@ import static org.assertj.core.api.Assertions.assertThat; -class CleanupDbTest extends WithStorageProvider { +class CleanupDbTest extends WithStorageProviderIT { private SimpleDatasafeService simpleDatasafeService; private DFSCredentials dfsCredentials; private PathEncryptionConfig pathEncryptionConfig = new PathEncryptionConfig(true); - private void createSimpleService(WithStorageProvider.StorageDescriptor descriptor) { + private void createSimpleService(WithStorageProviderIT.StorageDescriptor descriptor) { dfsCredentials = InitFromStorageProvider.dfsFromDescriptor(descriptor); if (dfsCredentials != null) { simpleDatasafeService = new SimpleDatasafeServiceImpl(dfsCredentials, new MutableEncryptionConfig(), pathEncryptionConfig); @@ -37,7 +37,7 @@ private void createSimpleService(WithStorageProvider.StorageDescriptor descripto @ParameterizedTest @MethodSource("allDefaultStorages") - void cleanupDb(WithStorageProvider.StorageDescriptor descriptor) { + void cleanupDb(WithStorageProviderIT.StorageDescriptor descriptor) { createSimpleService(descriptor); String content = "content of document"; diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/DFSRelativeToRootProfileTest.java b/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/DFSRelativeToRootProfileTest.java index 4833e6bcd..7c471682f 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/DFSRelativeToRootProfileTest.java +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/DFSRelativeToRootProfileTest.java @@ -9,7 +9,7 @@ import de.adorsys.datasafe.simple.adapter.api.types.DocumentContent; import de.adorsys.datasafe.simple.adapter.api.types.DocumentFQN; import de.adorsys.datasafe.simple.adapter.impl.config.PathEncryptionConfig; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import de.adorsys.datasafe.types.api.resource.AbsoluteLocation; import de.adorsys.datasafe.types.api.resource.BasePrivateResource; import de.adorsys.datasafe.types.api.resource.ResolvedResource; @@ -22,7 +22,7 @@ import static org.assertj.core.api.Assertions.assertThat; -class DFSRelativeToRootProfileTest extends WithStorageProvider { +class DFSRelativeToRootProfileTest extends WithStorageProviderIT { private SimpleDatasafeService simpleDatasafeService; private UserIDAuth userIDAuth; @@ -44,7 +44,7 @@ void createDatasafeAdapter(StorageDescriptor descriptor) { @ParameterizedTest @MethodSource("allDefaultStorages") @SneakyThrows - void createWriteAndDeleteUserCleansAllNeeded(WithStorageProvider.StorageDescriptor descriptor) { + void createWriteAndDeleteUserCleansAllNeeded(WithStorageProviderIT.StorageDescriptor descriptor) { createDatasafeAdapter(descriptor); DSDocument document = new DSDocument(new DocumentFQN("c.txt"), new DocumentContent("Hello".getBytes())); diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/DFSTestCredentialsFactory.java b/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/DFSTestCredentialsFactory.java index 8f0f431aa..dc8708162 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/DFSTestCredentialsFactory.java +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/DFSTestCredentialsFactory.java @@ -4,7 +4,7 @@ import de.adorsys.datasafe.simple.adapter.api.types.AmazonS3DFSCredentials; import de.adorsys.datasafe.simple.adapter.api.types.DFSCredentials; import de.adorsys.datasafe.simple.adapter.api.types.FilesystemDFSCredentials; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; @@ -12,7 +12,7 @@ @UtilityClass public class DFSTestCredentialsFactory { - public DFSCredentials credentials(WithStorageProvider.StorageDescriptor descriptor) { + public DFSCredentials credentials(WithStorageProviderIT.StorageDescriptor descriptor) { switch (descriptor.getName()) { case FILESYSTEM: { log.info("uri:" + descriptor.getRootBucket()); diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/InitFromStorageProvider.java b/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/InitFromStorageProvider.java index cd3fdcf25..3ebdd20e1 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/InitFromStorageProvider.java +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/InitFromStorageProvider.java @@ -4,7 +4,7 @@ import de.adorsys.datasafe.simple.adapter.api.types.AmazonS3DFSCredentials; import de.adorsys.datasafe.simple.adapter.api.types.DFSCredentials; import de.adorsys.datasafe.simple.adapter.api.types.FilesystemDFSCredentials; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; @@ -12,7 +12,7 @@ @UtilityClass public class InitFromStorageProvider { - public DFSCredentials dfsFromDescriptor(WithStorageProvider.StorageDescriptor descriptor) { + public DFSCredentials dfsFromDescriptor(WithStorageProviderIT.StorageDescriptor descriptor) { if (descriptor == null) { return null; } diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/SimpleDatasafeAdapterTest.java b/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/SimpleDatasafeAdapterTest.java index 2fb8aa818..a36ab3e76 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/SimpleDatasafeAdapterTest.java +++ b/datasafe-simple-adapter/datasafe-simple-adapter-impl/src/test/java/de/adorsys/datasafe/simple/adapter/impl/SimpleDatasafeAdapterTest.java @@ -15,7 +15,7 @@ import de.adorsys.datasafe.simple.adapter.api.types.ListRecursiveFlag; import de.adorsys.datasafe.simple.adapter.impl.config.PathEncryptionConfig; import de.adorsys.datasafe.storage.impl.fs.FileSystemStorageService; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import de.adorsys.datasafe.types.api.resource.AbsoluteLocation; import de.adorsys.datasafe.types.api.resource.BasePrivateResource; import de.adorsys.datasafe.types.api.resource.ResolvedResource; @@ -42,7 +42,7 @@ import static org.junit.jupiter.api.Assertions.*; @Slf4j -class SimpleDatasafeAdapterTest extends WithStorageProvider { +class SimpleDatasafeAdapterTest extends WithStorageProviderIT { private SimpleDatasafeService simpleDatasafeService; private UserIDAuth userIDAuth; @@ -75,7 +75,7 @@ void myafter() { @ParameterizedTest @MethodSource("minioOnly") @SneakyThrows - void justCreateAndDeleteUserForMinioOnly(WithStorageProvider.StorageDescriptor descriptor) { + void justCreateAndDeleteUserForMinioOnly(WithStorageProviderIT.StorageDescriptor descriptor) { myinit(descriptor); mystart(); @@ -95,7 +95,7 @@ void justCreateAndDeleteUserForMinioOnly(WithStorageProvider.StorageDescriptor d @ParameterizedTest @MethodSource("allStorages") @SneakyThrows - void justCreateAndDeleteUser(WithStorageProvider.StorageDescriptor descriptor) { + void justCreateAndDeleteUser(WithStorageProviderIT.StorageDescriptor descriptor) { myinit(descriptor); mystart(); @@ -114,7 +114,7 @@ void justCreateAndDeleteUser(WithStorageProvider.StorageDescriptor descriptor) { @ParameterizedTest @MethodSource("storages") - void writeAndReadFile(WithStorageProvider.StorageDescriptor descriptor) { + void writeAndReadFile(WithStorageProviderIT.StorageDescriptor descriptor) { myinit(descriptor); mystart(); String content = "content of document"; @@ -132,7 +132,7 @@ void writeAndReadFile(WithStorageProvider.StorageDescriptor descriptor) { @ParameterizedTest @MethodSource("storages") - void writeAndReadFileWithPasswordChange(WithStorageProvider.StorageDescriptor descriptor) { + void writeAndReadFileWithPasswordChange(WithStorageProviderIT.StorageDescriptor descriptor) { myinit(descriptor); mystart(); String content = "content of document"; @@ -158,7 +158,7 @@ void writeAndReadFileWithPasswordChange(WithStorageProvider.StorageDescriptor de @ParameterizedTest @MethodSource("storages") - void writeAndReadFileWithSlash(WithStorageProvider.StorageDescriptor descriptor) { + void writeAndReadFileWithSlash(WithStorageProviderIT.StorageDescriptor descriptor) { myinit(descriptor); mystart(); String content = "content of document"; @@ -177,7 +177,7 @@ void writeAndReadFileWithSlash(WithStorageProvider.StorageDescriptor descriptor) @ParameterizedTest @MethodSource("storages") - void writeAndReadFiles(WithStorageProvider.StorageDescriptor descriptor) { + void writeAndReadFiles(WithStorageProviderIT.StorageDescriptor descriptor) { myinit(descriptor); mystart(); DocumentDirectoryFQN root = new DocumentDirectoryFQN("affe"); @@ -225,7 +225,7 @@ void writeAndReadFiles(WithStorageProvider.StorageDescriptor descriptor) { @SneakyThrows @ParameterizedTest @MethodSource("storages") - void writeAndReadFilesAsStream(WithStorageProvider.StorageDescriptor descriptor) { + void writeAndReadFilesAsStream(WithStorageProviderIT.StorageDescriptor descriptor) { myinit(descriptor); mystart(); @@ -250,7 +250,7 @@ void writeAndReadFilesAsStream(WithStorageProvider.StorageDescriptor descriptor) @ParameterizedTest @MethodSource("storages") - void testTwoUsers(WithStorageProvider.StorageDescriptor descriptor) { + void testTwoUsers(WithStorageProviderIT.StorageDescriptor descriptor) { myinit(descriptor); mystart(); UserIDAuth userIDAuth2 = new UserIDAuth(new UserID("peter2"), ReadKeyPasswordTestFactory.getForString("password2")); @@ -302,7 +302,7 @@ void testTwoUsers(WithStorageProvider.StorageDescriptor descriptor) { @ParameterizedTest @MethodSource("minioOnly") @SneakyThrows - void testExhaustedInputStream(WithStorageProvider.StorageDescriptor descriptor) { + void testExhaustedInputStream(WithStorageProviderIT.StorageDescriptor descriptor) { myinit(descriptor); if (!(dfsCredentials instanceof AmazonS3DFSCredentials)) { diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionForMinioTest.java b/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionForMinioTest.java index 0a4f14085..30218d986 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionForMinioTest.java +++ b/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionForMinioTest.java @@ -5,7 +5,7 @@ import de.adorsys.datasafe.simple.adapter.spring.factory.SpringSimpleDatasafeServiceFactory; import de.adorsys.datasafe.simple.adapter.spring.properties.SpringDFSCredentialProperties; import de.adorsys.datasafe.simple.adapter.spring.properties.SpringDatasafeEncryptionProperties; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; @@ -39,7 +39,7 @@ private static Stream minioonly() { @ParameterizedTest @MethodSource("minioonly") - public void plainService(WithStorageProvider.StorageDescriptor descriptor) { + public void plainService(WithStorageProviderIT.StorageDescriptor descriptor) { log.info("descriptor is " + descriptor.getName()); SpringSimpleDatasafeServiceFactory springSimpleDatasafeServiceFactory = new SpringSimpleDatasafeServiceFactory(SpringPropertiesToDFSCredentialsUtil.dfsCredentials(dfsCredentialProperties), encryptionProperties); SimpleDatasafeService service = springSimpleDatasafeServiceFactory.getSimpleDataSafeServiceWithSubdir("subdir"); diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionTest.java b/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionTest.java index e10f39431..17eb22581 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionTest.java +++ b/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionTest.java @@ -11,7 +11,7 @@ import de.adorsys.datasafe.simple.adapter.api.types.FilesystemDFSCredentials; import de.adorsys.datasafe.simple.adapter.impl.SimpleDatasafeServiceImpl; import de.adorsys.datasafe.simple.adapter.spring.annotations.UseDatasafeSpringConfiguration; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import de.adorsys.datasafe.types.api.resource.AbsoluteLocation; import de.adorsys.datasafe.types.api.resource.BasePrivateResource; import de.adorsys.datasafe.types.api.resource.PrivateResource; @@ -47,7 +47,7 @@ @ContextConfiguration @SpringBootConfiguration @UseDatasafeSpringConfiguration -public class InjectionTest extends WithStorageProvider { +public class InjectionTest extends WithStorageProviderIT { public void testCreateUser(SimpleDatasafeService datasafeService) { assertThat(datasafeService).isNotNull(); diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionWithoutPathEncryptionForFilesystemTest.java b/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionWithoutPathEncryptionForFilesystemTest.java index 52b6636ea..4d1088356 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionWithoutPathEncryptionForFilesystemTest.java +++ b/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionWithoutPathEncryptionForFilesystemTest.java @@ -6,7 +6,7 @@ import de.adorsys.datasafe.simple.adapter.spring.factory.SpringSimpleDatasafeServiceFactory; import de.adorsys.datasafe.simple.adapter.spring.properties.SpringDFSCredentialProperties; import de.adorsys.datasafe.simple.adapter.spring.properties.SpringDatasafeEncryptionProperties; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -31,7 +31,7 @@ private static Stream fsonly() { @ParameterizedTest @MethodSource("fsonly") - public void plainService(WithStorageProvider.StorageDescriptor descriptor) { + public void plainService(WithStorageProviderIT.StorageDescriptor descriptor) { log.info("descriptor is {}", descriptor.getName()); DFSCredentials dfsCredentials = SpringPropertiesToDFSCredentialsUtil.dfsCredentials(dfsCredentialProperties); SpringSimpleDatasafeServiceFactory springSimpleDatasafeServiceFactory = new SpringSimpleDatasafeServiceFactory(dfsCredentials, encryptionProperties); diff --git a/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionWithoutPathEncryptionForMinioTest.java b/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionWithoutPathEncryptionForMinioTest.java index 023f93952..0480f6721 100644 --- a/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionWithoutPathEncryptionForMinioTest.java +++ b/datasafe-simple-adapter/datasafe-simple-adapter-spring/src/test/java/de/adorsys/datasafe/simple/adapter/spring/InjectionWithoutPathEncryptionForMinioTest.java @@ -6,7 +6,7 @@ import de.adorsys.datasafe.simple.adapter.spring.factory.SpringSimpleDatasafeServiceFactory; import de.adorsys.datasafe.simple.adapter.spring.properties.SpringDFSCredentialProperties; import de.adorsys.datasafe.simple.adapter.spring.properties.SpringDatasafeEncryptionProperties; -import de.adorsys.datasafe.teststorage.WithStorageProvider; +import de.adorsys.datasafe.teststorage.WithStorageProviderIT; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.params.ParameterizedTest; @@ -32,13 +32,13 @@ static void startMinio() { System.setProperty("MINIO_URL", minio().getMappedUrl()); } - private static Stream minioonly() { + private static Stream minioonly() { return Stream.of(minio()); } @ParameterizedTest @MethodSource("minioonly") - public void plainService(WithStorageProvider.StorageDescriptor descriptor) { + public void plainService(WithStorageProviderIT.StorageDescriptor descriptor) { log.info("descriptor is {}", descriptor.getName()); DFSCredentials dfsCredentials = SpringPropertiesToDFSCredentialsUtil.dfsCredentials(dfsCredentialProperties); SpringSimpleDatasafeServiceFactory springSimpleDatasafeServiceFactory = new SpringSimpleDatasafeServiceFactory(dfsCredentials, encryptionProperties); diff --git a/datasafe-test-storages/src/test/java/de/adorsys/datasafe/teststorage/WithStorageProvider.java b/datasafe-test-storages/src/test/java/de/adorsys/datasafe/teststorage/WithStorageProviderIT.java similarity index 98% rename from datasafe-test-storages/src/test/java/de/adorsys/datasafe/teststorage/WithStorageProvider.java rename to datasafe-test-storages/src/test/java/de/adorsys/datasafe/teststorage/WithStorageProviderIT.java index ba03f52c4..27ecc0d5d 100644 --- a/datasafe-test-storages/src/test/java/de/adorsys/datasafe/teststorage/WithStorageProvider.java +++ b/datasafe-test-storages/src/test/java/de/adorsys/datasafe/teststorage/WithStorageProviderIT.java @@ -50,7 +50,7 @@ */ @Slf4j @Getter -public abstract class WithStorageProvider extends BaseMockitoTest { +public abstract class WithStorageProviderIT extends BaseMockitoTest { // to make tests possible for minio, ceph AND amazon by setting AWS_PROPERTIES // we check for amazon and NOT amazon by the following two strings private static final String amazonDomain = "s3.amazonaws.com"; @@ -103,7 +103,7 @@ public abstract class WithStorageProvider extends BaseMockitoTest { @BeforeAll static void init(@TempDir Path tempDir) { log.info("Executing init"); - WithStorageProvider.tempDir = tempDir; + WithStorageProviderIT.tempDir = tempDir; minioStorage = Suppliers.memoize(() -> { startMinio(); @@ -460,7 +460,7 @@ public static class StorageDescriptor { private final String region; private final String rootBucket; - public StorageDescriptor(WithStorageProvider.StorageDescriptorName name, Supplier storageService, Uri location, String accessKey, String secretKey, String region, String rootBucket) { + public StorageDescriptor(WithStorageProviderIT.StorageDescriptorName name, Supplier storageService, Uri location, String accessKey, String secretKey, String region, String rootBucket) { this.name = name; this.storageService = storageService; this.location = location;