From c38600cacb73f8b3c5fc2597d6b234f59baa643f Mon Sep 17 00:00:00 2001 From: Elwizzy12 Date: Thu, 11 Apr 2024 13:35:53 +0100 Subject: [PATCH 1/8] 293-rename-datasafe-business-integration-test-files-for-clear-separation --- ...ityTest.java => BasicFunctionalityIT.java} | 2 +- ...est.java => BasicFunctionalityUtf8IT.java} | 2 +- ... BasicFunctionalityWithConcurrencyIT.java} | 2 +- ...sicFunctionalityWithPasswordChangeIT.java} | 2 +- ...st.java => DataTamperingResistanceIT.java} | 2 +- ...reTest.java => KeyStoreTypeCompareIT.java} | 2 +- ...Test.java => MultiDFSFunctionalityIT.java} | 2 +- ...ationTest.java => SchemeDelegationIT.java} | 46 +++++++++---------- ...est.java => SchemeDelegationWithDbIT.java} | 2 +- ...est.java => StorageBasedVersioningIT.java} | 2 +- ...f8Test.java => UserProfileWithUtf8IT.java} | 2 +- ...onedDataTest.java => VersionedDataIT.java} | 2 +- 12 files changed, 34 insertions(+), 34 deletions(-) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{BasicFunctionalityTest.java => BasicFunctionalityIT.java} (99%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{BasicFunctionalityUtf8Test.java => BasicFunctionalityUtf8IT.java} (99%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{BasicFunctionalityWithConcurrencyTest.java => BasicFunctionalityWithConcurrencyIT.java} (99%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{BasicFunctionalityWithPasswordChangeTest.java => BasicFunctionalityWithPasswordChangeIT.java} (99%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{DataTamperingResistanceTest.java => DataTamperingResistanceIT.java} (99%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{KeyStoreTypeCompareTest.java => KeyStoreTypeCompareIT.java} (98%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{MultiDFSFunctionalityTest.java => MultiDFSFunctionalityIT.java} (99%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{SchemeDelegationTest.java => SchemeDelegationIT.java} (81%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{SchemeDelegationWithDbTest.java => SchemeDelegationWithDbIT.java} (98%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{StorageBasedVersioningTest.java => StorageBasedVersioningIT.java} (98%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{UserProfileWithUtf8Test.java => UserProfileWithUtf8IT.java} (98%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{VersionedDataTest.java => VersionedDataIT.java} (99%) 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/BasicFunctionalityIT.java similarity index 99% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityTest.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityIT.java index 8ee49c217..4139e2a73 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/BasicFunctionalityIT.java @@ -47,7 +47,7 @@ * Tests that validates basic functionality - storing data to inbox, privatespace, listing files, etc. */ @Slf4j -class BasicFunctionalityTest extends BaseE2ETest { +class BasicFunctionalityIT extends BaseE2ETest { private static final int LARGE_SIZE = 10 * 1024 * 1024 + 100; 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/BasicFunctionalityUtf8IT.java similarity index 99% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8Test.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java index 7d9c233c1..5b2697852 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/BasicFunctionalityUtf8IT.java @@ -15,7 +15,7 @@ * Tests that validates basic functionality - storing data to inbox, privatespace, listing files, etc. using UTF-8 paths. */ @Slf4j -class BasicFunctionalityUtf8Test extends BaseE2ETest { +class BasicFunctionalityUtf8IT extends BaseE2ETest { private static final String MESSAGE_ONE = "Hello here 1"; private static final String FOLDER = "folder1"; 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/BasicFunctionalityWithConcurrencyIT.java similarity index 99% 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/BasicFunctionalityWithConcurrencyIT.java index 7a219bf06..238fff129 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/BasicFunctionalityWithConcurrencyIT.java @@ -56,7 +56,7 @@ * Multithreaded test of basic operations. */ @Slf4j -class BasicFunctionalityWithConcurrencyTest extends BaseE2ETest { +class BasicFunctionalityWithConcurrencyIT extends BaseE2ETest { private static final int TIMEOUT_S = 30; 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/BasicFunctionalityWithPasswordChangeIT.java similarity index 99% 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/BasicFunctionalityWithPasswordChangeIT.java index e970bcd3c..ad5f3c320 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/BasicFunctionalityWithPasswordChangeIT.java @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -class BasicFunctionalityWithPasswordChangeTest extends BaseE2ETest { +class BasicFunctionalityWithPasswordChangeIT extends BaseE2ETest { @SneakyThrows @ParameterizedTest diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceTest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceIT.java similarity index 99% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceTest.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceIT.java index 9fcedfe97..202f3ef83 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceTest.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceIT.java @@ -38,7 +38,7 @@ * attacker is unable to modify encrypted text without being detected. */ @Slf4j -class DataTamperingResistanceTest extends BaseE2ETest { +class DataTamperingResistanceIT extends BaseE2ETest { private static final Set NOT_TO_REPLACE_IN_PATH = ImmutableSet.of('=', '/'); 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/KeyStoreTypeCompareIT.java similarity index 98% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareTest.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareIT.java index 76e75fcc4..24672c5ba 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/KeyStoreTypeCompareIT.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; @Slf4j -public class KeyStoreTypeCompareTest extends BaseE2ETest { +public class KeyStoreTypeCompareIT extends BaseE2ETest { private final static int NUMBER_WRITES = 100; private final static int NUMBER_READS = 100; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/MultiDFSFunctionalityTest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/MultiDFSFunctionalityIT.java similarity index 99% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/MultiDFSFunctionalityTest.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/MultiDFSFunctionalityIT.java index a4e5830b8..c58607ac9 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/MultiDFSFunctionalityTest.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/MultiDFSFunctionalityIT.java @@ -70,7 +70,7 @@ * access `credentialsBucket` that has user profile and his storage access keystore. */ @Slf4j -class MultiDFSFunctionalityTest extends BaseMockitoTest { +class MultiDFSFunctionalityIT extends BaseMockitoTest { private static final String REGION = "eu-central-1"; private static final String LOCALHOST = getDockerUri("http://127.0.0.1"); 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/SchemeDelegationIT.java similarity index 81% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationTest.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationIT.java index f6396957e..b8977d334 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/SchemeDelegationIT.java @@ -32,32 +32,32 @@ import static org.assertj.core.api.Assertions.assertThat; -class SchemeDelegationTest extends WithStorageProvider { - - private Path fsPath; - private Uri minioPath; - private StorageService minio; - private StorageService filesystem; - private DefaultDatasafeServices datasafeServices; - - @BeforeEach - void initialize(@TempDir Path tempDir) { - WithStorageProvider.StorageDescriptor minioDescriptor = minio(); - this.fsPath = tempDir; - this.minio = minioDescriptor.getStorageService().get(); - this.filesystem = new FileSystemStorageService(tempDir); - this.minioPath = minioDescriptor.getLocation(); - StorageService multiDfs = new SchemeDelegatingStorage( - ImmutableMap.of( - "s3", minio, - "file", filesystem - ) - ); - this.datasafeServices = DaggerDefaultDatasafeServices .builder() .config(new ProfilesOnFsDataOnMinio(minioPath, tempDir)) - .storage(multiDfs) + + class SchemeDelegationTest extends WithStorageProvider { + + private Path fsPath; + private Uri minioPath; + private StorageService minio; + private StorageService filesystem; + private DefaultDatasafeServices datasafeServices; + + @BeforeEach + void initialize(@TempDir Path tempDir) { + WithStorageProvider.StorageDescriptor minioDescriptor = minio(); + this.fsPath = tempDir; + this.minio = minioDescriptor.getStorageService().get(); + this.filesystem = new FileSystemStorageService(tempDir); + this.minioPath = minioDescriptor.getLocation(); + StorageService multiDfs = new SchemeDelegatingStorage( + ImmutableMap.of( + "s3", minio, + "file", filesystem + ) + ); + .storage(multiDfs) .build(); } 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/SchemeDelegationWithDbIT.java similarity index 98% 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/SchemeDelegationWithDbIT.java index 21a0b0397..59f526289 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/SchemeDelegationWithDbIT.java @@ -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 SchemeDelegationWithDbIT extends WithStorageProvider { 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/StorageBasedVersioningIT.java similarity index 98% 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/StorageBasedVersioningIT.java index f82960a16..4da2b6b51 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/StorageBasedVersioningIT.java @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; @DisabledIfSystemProperty(named = WithStorageProvider.SKIP_CEPH, matches = "true") -class StorageBasedVersioningTest extends BaseE2ETest { +class StorageBasedVersioningIT extends BaseE2ETest { private static final String FILE = "file.txt"; 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/UserProfileWithUtf8IT.java similarity index 98% 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/UserProfileWithUtf8IT.java index eebdc6f71..4a71a3cc1 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/UserProfileWithUtf8IT.java @@ -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 UserProfileWithUtf8IT extends WithStorageProvider { 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/VersionedDataIT.java similarity index 99% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataTest.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataIT.java index d331737e1..f791a6c87 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/VersionedDataIT.java @@ -36,7 +36,7 @@ * Validates software versioned operations. */ @Slf4j -public class VersionedDataTest extends BaseE2ETest { +public class VersionedDataIT extends BaseE2ETest { private static final String MESSAGE_ONE = "Hello here 1"; private static final String MESSAGE_TWO = "Hello here 2"; From 8853a6305dcaafbc66f4627dff142fd117889156 Mon Sep 17 00:00:00 2001 From: Elwizzy12 Date: Thu, 11 Apr 2024 15:13:45 +0100 Subject: [PATCH 2/8] 293-rename-datasafe-business-integration-test-files-for-clear-separation --- .../business/impl/e2e/{BaseE2ETest.java => BaseE2EIT.java} | 2 +- .../datasafe/business/impl/e2e/BasicFunctionalityIT.java | 2 +- .../datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java | 2 +- .../business/impl/e2e/BasicFunctionalityWithConcurrencyIT.java | 2 +- .../impl/e2e/BasicFunctionalityWithPasswordChangeIT.java | 2 +- .../datasafe/business/impl/e2e/DataTamperingResistanceIT.java | 2 +- .../datasafe/business/impl/e2e/KeyStoreTypeCompareIT.java | 2 +- .../business/impl/e2e/ProfileContainsDatasafeVersionTest.java | 2 +- .../datasafe/business/impl/e2e/StorageBasedVersioningIT.java | 2 +- .../de/adorsys/datasafe/business/impl/e2e/VersionedDataIT.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{BaseE2ETest.java => BaseE2EIT.java} (99%) 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/BaseE2EIT.java similarity index 99% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2ETest.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2EIT.java index d544e2842..9cf4118e6 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/BaseE2EIT.java @@ -52,7 +52,7 @@ @Slf4j @RequiredArgsConstructor -public abstract class BaseE2ETest extends WithStorageProvider { +public abstract class BaseE2EIT extends WithStorageProvider { protected static final String PRIVATE_COMPONENT = "private"; protected static final String PRIVATE_FILES_COMPONENT = PRIVATE_COMPONENT + "/files"; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityIT.java index 4139e2a73..ce249ce74 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityIT.java @@ -47,7 +47,7 @@ * Tests that validates basic functionality - storing data to inbox, privatespace, listing files, etc. */ @Slf4j -class BasicFunctionalityIT extends BaseE2ETest { +class BasicFunctionalityIT extends BaseE2EIT { private static final int LARGE_SIZE = 10 * 1024 * 1024 + 100; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java index 5b2697852..344099e55 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java @@ -15,7 +15,7 @@ * Tests that validates basic functionality - storing data to inbox, privatespace, listing files, etc. using UTF-8 paths. */ @Slf4j -class BasicFunctionalityUtf8IT extends BaseE2ETest { +class BasicFunctionalityUtf8IT extends BaseE2EIT { private static final String MESSAGE_ONE = "Hello here 1"; private static final String FOLDER = "folder1"; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyIT.java index 238fff129..665666f61 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyIT.java @@ -56,7 +56,7 @@ * Multithreaded test of basic operations. */ @Slf4j -class BasicFunctionalityWithConcurrencyIT extends BaseE2ETest { +class BasicFunctionalityWithConcurrencyIT extends BaseE2EIT { private static final int TIMEOUT_S = 30; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeIT.java index ad5f3c320..714696659 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeIT.java @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -class BasicFunctionalityWithPasswordChangeIT extends BaseE2ETest { +class BasicFunctionalityWithPasswordChangeIT extends BaseE2EIT { @SneakyThrows @ParameterizedTest diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceIT.java index 202f3ef83..9d2a623fb 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceIT.java @@ -38,7 +38,7 @@ * attacker is unable to modify encrypted text without being detected. */ @Slf4j -class DataTamperingResistanceIT extends BaseE2ETest { +class DataTamperingResistanceIT extends BaseE2EIT { private static final Set NOT_TO_REPLACE_IN_PATH = ImmutableSet.of('=', '/'); diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareIT.java index 24672c5ba..d07bd839a 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareIT.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; @Slf4j -public class KeyStoreTypeCompareIT extends BaseE2ETest { +public class KeyStoreTypeCompareIT extends BaseE2EIT { private final static int NUMBER_WRITES = 100; private final static int NUMBER_READS = 100; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersionTest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersionTest.java index cf7afb707..9b8e7fffd 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersionTest.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersionTest.java @@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; -class ProfileContainsDatasafeVersionTest extends BaseE2ETest { +class ProfileContainsDatasafeVersionTest extends BaseE2EIT { @Test @SneakyThrows diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningIT.java index 4da2b6b51..5445cbaf3 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningIT.java @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; @DisabledIfSystemProperty(named = WithStorageProvider.SKIP_CEPH, matches = "true") -class StorageBasedVersioningIT extends BaseE2ETest { +class StorageBasedVersioningIT extends BaseE2EIT { private static final String FILE = "file.txt"; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataIT.java index f791a6c87..a4a583237 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataIT.java @@ -36,7 +36,7 @@ * Validates software versioned operations. */ @Slf4j -public class VersionedDataIT extends BaseE2ETest { +public class VersionedDataIT extends BaseE2EIT { private static final String MESSAGE_ONE = "Hello here 1"; private static final String MESSAGE_TWO = "Hello here 2"; From 6b83afcf61569321475ab4c75d178c4e731ee977 Mon Sep 17 00:00:00 2001 From: Elwizzy12 Date: Thu, 11 Apr 2024 15:27:25 +0100 Subject: [PATCH 3/8] rename-datasafe-business-integration-test-files-for-clear-separation --- .../e2e/{BaseE2EIT.java => BaseE2ETest.java} | 2 +- .../impl/e2e/BasicFunctionalityIT.java | 2 +- .../impl/e2e/BasicFunctionalityUtf8IT.java | 2 +- .../BasicFunctionalityWithConcurrencyIT.java | 2 +- ...asicFunctionalityWithPasswordChangeIT.java | 2 +- .../impl/e2e/DataTamperingResistanceIT.java | 2 +- .../impl/e2e/KeyStoreTypeCompareIT.java | 2 +- .../ProfileContainsDatasafeVersionTest.java | 2 +- .../business/impl/e2e/SchemeDelegationIT.java | 77 +++++++------------ .../impl/e2e/StorageBasedVersioningIT.java | 2 +- .../business/impl/e2e/VersionedDataIT.java | 2 +- 11 files changed, 38 insertions(+), 59 deletions(-) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{BaseE2EIT.java => BaseE2ETest.java} (99%) diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2EIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2ETest.java similarity index 99% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2EIT.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2ETest.java index 9cf4118e6..d544e2842 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2EIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2ETest.java @@ -52,7 +52,7 @@ @Slf4j @RequiredArgsConstructor -public abstract class BaseE2EIT extends WithStorageProvider { +public abstract class BaseE2ETest extends WithStorageProvider { protected static final String PRIVATE_COMPONENT = "private"; protected static final String PRIVATE_FILES_COMPONENT = PRIVATE_COMPONENT + "/files"; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityIT.java index ce249ce74..4139e2a73 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityIT.java @@ -47,7 +47,7 @@ * Tests that validates basic functionality - storing data to inbox, privatespace, listing files, etc. */ @Slf4j -class BasicFunctionalityIT extends BaseE2EIT { +class BasicFunctionalityIT extends BaseE2ETest { private static final int LARGE_SIZE = 10 * 1024 * 1024 + 100; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java index 344099e55..5b2697852 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java @@ -15,7 +15,7 @@ * Tests that validates basic functionality - storing data to inbox, privatespace, listing files, etc. using UTF-8 paths. */ @Slf4j -class BasicFunctionalityUtf8IT extends BaseE2EIT { +class BasicFunctionalityUtf8IT extends BaseE2ETest { private static final String MESSAGE_ONE = "Hello here 1"; private static final String FOLDER = "folder1"; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyIT.java index 665666f61..238fff129 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyIT.java @@ -56,7 +56,7 @@ * Multithreaded test of basic operations. */ @Slf4j -class BasicFunctionalityWithConcurrencyIT extends BaseE2EIT { +class BasicFunctionalityWithConcurrencyIT extends BaseE2ETest { private static final int TIMEOUT_S = 30; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeIT.java index 714696659..ad5f3c320 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeIT.java @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -class BasicFunctionalityWithPasswordChangeIT extends BaseE2EIT { +class BasicFunctionalityWithPasswordChangeIT extends BaseE2ETest { @SneakyThrows @ParameterizedTest diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceIT.java index 9d2a623fb..202f3ef83 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceIT.java @@ -38,7 +38,7 @@ * attacker is unable to modify encrypted text without being detected. */ @Slf4j -class DataTamperingResistanceIT extends BaseE2EIT { +class DataTamperingResistanceIT extends BaseE2ETest { private static final Set NOT_TO_REPLACE_IN_PATH = ImmutableSet.of('=', '/'); diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareIT.java index d07bd839a..24672c5ba 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareIT.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; @Slf4j -public class KeyStoreTypeCompareIT extends BaseE2EIT { +public class KeyStoreTypeCompareIT extends BaseE2ETest { private final static int NUMBER_WRITES = 100; private final static int NUMBER_READS = 100; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersionTest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersionTest.java index 9b8e7fffd..cf7afb707 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersionTest.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersionTest.java @@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; -class ProfileContainsDatasafeVersionTest extends BaseE2EIT { +class ProfileContainsDatasafeVersionTest extends BaseE2ETest { @Test @SneakyThrows diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationIT.java index b8977d334..9b4d05dde 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationIT.java @@ -1,5 +1,4 @@ package de.adorsys.datasafe.business.impl.e2e; - import de.adorsys.datasafe.business.impl.service.DaggerDefaultDatasafeServices; import de.adorsys.datasafe.business.impl.service.DefaultDatasafeServices; import de.adorsys.datasafe.directory.impl.profile.config.DefaultDFSConfig; @@ -12,59 +11,52 @@ import de.adorsys.datasafe.types.api.actions.WriteRequest; import de.adorsys.datasafe.types.api.resource.AbsoluteLocation; import de.adorsys.datasafe.types.api.resource.BasePrivateResource; -import de.adorsys.datasafe.types.api.resource.ResolvedResource; import de.adorsys.datasafe.types.api.resource.Uri; -import de.adorsys.datasafe.types.api.types.ReadStorePassword; -import de.adorsys.datasafe.types.api.utils.ReadKeyPasswordTestFactory; import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; -import java.io.IOException; import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.Path; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; +class SchemeDelegationTest extends WithStorageProvider { + + private Path fsPath; + private Uri minioPath; + private StorageService minio; + private StorageService filesystem; + private DefaultDatasafeServices datasafeServices; + + @BeforeEach + void initialize(@TempDir Path tempDir) { + WithStorageProvider.StorageDescriptor minioDescriptor = minio(); + this.fsPath = tempDir; + this.minio = minioDescriptor.getStorageService().get(); + this.filesystem = new FileSystemStorageService(tempDir); + this.minioPath = minioDescriptor.getLocation(); + StorageService multiDfs = new SchemeDelegatingStorage( + ImmutableMap.of( + "s3", minio, + "file", filesystem + ) + ); + this.datasafeServices = DaggerDefaultDatasafeServices .builder() .config(new ProfilesOnFsDataOnMinio(minioPath, tempDir)) - - class SchemeDelegationTest extends WithStorageProvider { - - private Path fsPath; - private Uri minioPath; - private StorageService minio; - private StorageService filesystem; - private DefaultDatasafeServices datasafeServices; - - @BeforeEach - void initialize(@TempDir Path tempDir) { - WithStorageProvider.StorageDescriptor minioDescriptor = minio(); - this.fsPath = tempDir; - this.minio = minioDescriptor.getStorageService().get(); - this.filesystem = new FileSystemStorageService(tempDir); - this.minioPath = minioDescriptor.getLocation(); - StorageService multiDfs = new SchemeDelegatingStorage( - ImmutableMap.of( - "s3", minio, - "file", filesystem - ) - ); - .storage(multiDfs) + .storage(multiDfs) .build(); } @Test @SneakyThrows void testProfileOnFsDataOnMinioWorks() { - UserIDAuth userJohn = new UserIDAuth("john", ReadKeyPasswordTestFactory.getForString("doe")); + UserIDAuth userJohn = new UserIDAuth("john", "doe"); // John's profile will be saved to filesystem datasafeServices.userProfile().registerUsingDefaults(userJohn); @@ -76,12 +68,12 @@ void testProfileOnFsDataOnMinioWorks() { } // Profiles are on FS - assertThat(listFs()) + assertThat(Files.walk(fsPath)) .extracting(it -> fsPath.relativize(it)) .extracting(Path::toString) .containsExactlyInAnyOrder("", "public-john", "private-john"); // File and keystore/pub keys are on minio - assertThat(listMinio()) + assertThat(minio.list(new AbsoluteLocation<>(BasePrivateResource.forPrivate(minioPath.resolve(""))))) .extracting(it -> minioPath.relativize(it.location())) .extracting(it -> it.asURI().toString()) .contains("users/john/private/keystore", "users/john/public/pubkeys") @@ -89,25 +81,12 @@ void testProfileOnFsDataOnMinioWorks() { .hasSize(3); } - private List> listMinio() { - try (Stream> ls = - minio.list(new AbsoluteLocation<>(BasePrivateResource.forPrivate(minioPath.resolve(""))))) { - return ls.collect(Collectors.toList()); - } - } - - private List listFs() throws IOException { - try (Stream ls = Files.walk(fsPath)) { - return ls.collect(Collectors.toList()); - } - } - static class ProfilesOnFsDataOnMinio extends DefaultDFSConfig { private final Path profilesPath; ProfilesOnFsDataOnMinio(Uri minioBucketPath, Path profilesPath) { - super(minioBucketPath, new ReadStorePassword("PAZZWORT")); + super(minioBucketPath, "PAZZWORT"); this.profilesPath = profilesPath; } @@ -125,4 +104,4 @@ public AbsoluteLocation privateProfile(UserID forUser) { ); } } -} +} \ No newline at end of file diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningIT.java index 5445cbaf3..4da2b6b51 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningIT.java @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; @DisabledIfSystemProperty(named = WithStorageProvider.SKIP_CEPH, matches = "true") -class StorageBasedVersioningIT extends BaseE2EIT { +class StorageBasedVersioningIT extends BaseE2ETest { private static final String FILE = "file.txt"; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataIT.java index a4a583237..f791a6c87 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataIT.java @@ -36,7 +36,7 @@ * Validates software versioned operations. */ @Slf4j -public class VersionedDataIT extends BaseE2EIT { +public class VersionedDataIT extends BaseE2ETest { private static final String MESSAGE_ONE = "Hello here 1"; private static final String MESSAGE_TWO = "Hello here 2"; From eca059a3552aa1b9f1f6b7ca3bc29e7597c21a2b Mon Sep 17 00:00:00 2001 From: Elwizzy12 Date: Thu, 11 Apr 2024 16:12:22 +0100 Subject: [PATCH 4/8] rename-datasafe-business-integration-test-files-for-clear-separation --- .../business/impl/e2e/SchemeDelegationIT.java | 115 ++++++++++++------ 1 file changed, 80 insertions(+), 35 deletions(-) diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationIT.java index 9b4d05dde..846c11ea1 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationIT.java @@ -1,4 +1,7 @@ package de.adorsys.datasafe.business.impl.e2e; + +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import de.adorsys.datasafe.business.impl.service.DaggerDefaultDatasafeServices; import de.adorsys.datasafe.business.impl.service.DefaultDatasafeServices; import de.adorsys.datasafe.directory.impl.profile.config.DefaultDFSConfig; @@ -6,101 +9,143 @@ import de.adorsys.datasafe.encrypiton.api.types.UserIDAuth; import de.adorsys.datasafe.storage.api.SchemeDelegatingStorage; import de.adorsys.datasafe.storage.api.StorageService; +import de.adorsys.datasafe.storage.impl.db.DatabaseConnectionRegistry; +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.types.api.actions.WriteRequest; import de.adorsys.datasafe.types.api.resource.AbsoluteLocation; import de.adorsys.datasafe.types.api.resource.BasePrivateResource; +import de.adorsys.datasafe.types.api.resource.ResolvedResource; import de.adorsys.datasafe.types.api.resource.Uri; +import de.adorsys.datasafe.types.api.types.ReadStorePassword; +import de.adorsys.datasafe.types.api.utils.ReadKeyPasswordTestFactory; import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; import java.io.OutputStream; +import java.net.URI; import java.nio.file.Files; import java.nio.file.Path; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import static de.adorsys.datasafe.types.api.global.PathEncryptionId.AES_SIV; import static org.assertj.core.api.Assertions.assertThat; -class SchemeDelegationTest extends WithStorageProvider { +class SchemeDelegationWithDbTest extends WithStorageProvider { + + private static final Set ALLOWED_TABLES = ImmutableSet.of("users", "private_profiles", "public_profiles"); private Path fsPath; - private Uri minioPath; - private StorageService minio; - private StorageService filesystem; + private StorageService db; private DefaultDatasafeServices datasafeServices; @BeforeEach void initialize(@TempDir Path tempDir) { - WithStorageProvider.StorageDescriptor minioDescriptor = minio(); this.fsPath = tempDir; - this.minio = minioDescriptor.getStorageService().get(); - this.filesystem = new FileSystemStorageService(tempDir); - this.minioPath = minioDescriptor.getLocation(); + StorageService filesystem = new FileSystemStorageService(tempDir); + this.db = new DatabaseStorageService(ALLOWED_TABLES, new DatabaseConnectionRegistry( + uri -> uri.location().getWrapped().getScheme() + ":" + uri.location().getPath().split("/")[1], + ImmutableMap.of("jdbc://localhost:9999", new DatabaseCredentials("sa", "sa"))) + ); + StorageService multiDfs = new SchemeDelegatingStorage( ImmutableMap.of( - "s3", minio, - "file", filesystem + "file", filesystem, + "jdbc", db ) ); this.datasafeServices = DaggerDefaultDatasafeServices .builder() - .config(new ProfilesOnFsDataOnMinio(minioPath, tempDir)) + .config(new ProfilesOnDbDataOnFs(tempDir.toUri(), URI.create("jdbc://localhost:9999/h2:mem:test/"))) .storage(multiDfs) .build(); } @Test @SneakyThrows - void testProfileOnFsDataOnMinioWorks() { - UserIDAuth userJohn = new UserIDAuth("john", "doe"); + void testProfileOnDbDataOnFsWorks() { + UserIDAuth userJohn = new UserIDAuth("john", ReadKeyPasswordTestFactory.getForString("doe")); - // John's profile will be saved to filesystem + // John's profile will be saved to Database datasafeServices.userProfile().registerUsingDefaults(userJohn); - // But this data - it will be saved to minio + // But this data - it will be saved to FS try (OutputStream os = datasafeServices.privateService().write(WriteRequest.forDefaultPrivate(userJohn, "file.txt"))) { os.write("Hello".getBytes()); } - // Profiles are on FS - assertThat(Files.walk(fsPath)) - .extracting(it -> fsPath.relativize(it)) - .extracting(Path::toString) - .containsExactlyInAnyOrder("", "public-john", "private-john"); - // File and keystore/pub keys are on minio - assertThat(minio.list(new AbsoluteLocation<>(BasePrivateResource.forPrivate(minioPath.resolve(""))))) - .extracting(it -> minioPath.relativize(it.location())) - .extracting(it -> it.asURI().toString()) - .contains("users/john/private/keystore", "users/john/public/pubkeys") - .anyMatch(it -> it.startsWith("users/john/private/files/")) - .hasSize(3); + // Profiles are on DB + assertThat(listDb("jdbc://localhost:9999/h2:mem:test/private_profiles/")) + .containsExactly("jdbc://localhost:9999/h2:mem:test/private_profiles/john"); + assertThat(listDb("jdbc://localhost:9999/h2:mem:test/public_profiles/")) + .containsExactly("jdbc://localhost:9999/h2:mem:test/public_profiles/john"); + + Path path = fsPath.resolve(new Uri("users/john/private/files/").resolve(AES_SIV.asUriRoot()).asString()); + Path encryptedFile = walk(path).get(1); + // File and keystore/pub keys are on FS + assertThat(walk(fsPath)) + .extracting(it -> fsPath.toUri().relativize(it.toUri())) + .extracting(URI::toString) + .containsExactlyInAnyOrder( + "", + "users/", + "users/john/", + "users/john/public/", + "users/john/public/pubkeys", + "users/john/private/", + "users/john/private/keystore", + "users/john/private/files/", + "users/john/private/files/SIV/", + fsPath.toUri().relativize(encryptedFile.toUri()).toString() + ); + } + + @SneakyThrows + private List walk(Path at) { + try (Stream ls = Files.walk(at)) { + return ls.collect(Collectors.toList()); + } + } + + private List listDb(String path) { + try (Stream> stream = db.list(BasePrivateResource.forAbsolutePrivate(URI.create(path)))){ + return stream.map(it -> it.location().asURI().toString()).collect(Collectors.toList()); + } } - static class ProfilesOnFsDataOnMinio extends DefaultDFSConfig { + static class ProfilesOnDbDataOnFs extends DefaultDFSConfig { - private final Path profilesPath; + private final Uri profilesPath; - ProfilesOnFsDataOnMinio(Uri minioBucketPath, Path profilesPath) { - super(minioBucketPath, "PAZZWORT"); - this.profilesPath = profilesPath; + ProfilesOnDbDataOnFs(URI fsPath, URI profilesPath) { + super(fsPath, new ReadStorePassword("PAZZWORT")); + this.profilesPath = new Uri(profilesPath); } @Override public AbsoluteLocation publicProfile(UserID forUser) { return new AbsoluteLocation<>( - BasePrivateResource.forPrivate(profilesPath.resolve("public-" + forUser.getValue()).toUri()) + BasePrivateResource.forPrivate( + profilesPath.resolve("public_profiles/").resolve(forUser.getValue()) + ) ); } @Override public AbsoluteLocation privateProfile(UserID forUser) { return new AbsoluteLocation<>( - BasePrivateResource.forPrivate(profilesPath.resolve("private-" + forUser.getValue()).toUri()) + BasePrivateResource.forPrivate( + profilesPath.resolve("private_profiles/").resolve(forUser.getValue()) + ) ); } } From c43c2e177c8025a61d99f3fa1fc0175b25e037f6 Mon Sep 17 00:00:00 2001 From: Elwizzy12 Date: Thu, 11 Apr 2024 16:48:53 +0100 Subject: [PATCH 5/8] rename-datasafe-business-integration-test-files-for-clear-separation --- last-module-codecoverage-check/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/last-module-codecoverage-check/pom.xml b/last-module-codecoverage-check/pom.xml index 1d5806c75..fdaeb0053 100644 --- a/last-module-codecoverage-check/pom.xml +++ b/last-module-codecoverage-check/pom.xml @@ -7,6 +7,7 @@ de.adorsys 2.0.2-SNAPSHOT + 4.0.0 last-module-codecoverage-check From 801e2da0b80495d204bbea3645a52bd46236d8ae Mon Sep 17 00:00:00 2001 From: Elwizzy12 Date: Thu, 11 Apr 2024 18:06:42 +0100 Subject: [PATCH 6/8] integration-test-files-for-clear-separation --- .../business/impl/e2e/{BaseE2ETest.java => BaseE2EIT.java} | 0 ...feVersionTest.java => ProfileContainsDatasafeVersion2EIT.java} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{BaseE2ETest.java => BaseE2EIT.java} (100%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{ProfileContainsDatasafeVersionTest.java => ProfileContainsDatasafeVersion2EIT.java} (100%) 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/BaseE2EIT.java similarity index 100% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2ETest.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2EIT.java diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersionTest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersion2EIT.java similarity index 100% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersionTest.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersion2EIT.java From 0c3af1cf06c370f0c1f798d5e6b7a1526311a08a Mon Sep 17 00:00:00 2001 From: Elwizzy12 Date: Thu, 11 Apr 2024 18:18:47 +0100 Subject: [PATCH 7/8] integration-test-files-for-clear-separation --- .../e2e/{BaseE2EIT.java => BaseE2ETest.java} | 0 ...> ProfileContainsDatasafeVersionTest.java} | 0 .../impl/e2e/SchemaDelegationTest.java | 128 +++++++++++++++ .../business/impl/e2e/SchemeDelegationIT.java | 152 ------------------ 4 files changed, 128 insertions(+), 152 deletions(-) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{BaseE2EIT.java => BaseE2ETest.java} (100%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{ProfileContainsDatasafeVersion2EIT.java => ProfileContainsDatasafeVersionTest.java} (100%) create mode 100644 datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemaDelegationTest.java delete mode 100644 datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationIT.java diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2EIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2ETest.java similarity index 100% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2EIT.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2ETest.java diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersion2EIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersionTest.java similarity index 100% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersion2EIT.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersionTest.java diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemaDelegationTest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemaDelegationTest.java new file mode 100644 index 000000000..1ea5f453c --- /dev/null +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemaDelegationTest.java @@ -0,0 +1,128 @@ +package de.adorsys.datasafe.business.impl.e2e; + +import de.adorsys.datasafe.business.impl.service.DaggerDefaultDatasafeServices; +import de.adorsys.datasafe.business.impl.service.DefaultDatasafeServices; +import de.adorsys.datasafe.directory.impl.profile.config.DefaultDFSConfig; +import de.adorsys.datasafe.encrypiton.api.types.UserID; +import de.adorsys.datasafe.encrypiton.api.types.UserIDAuth; +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.types.api.actions.WriteRequest; +import de.adorsys.datasafe.types.api.resource.AbsoluteLocation; +import de.adorsys.datasafe.types.api.resource.BasePrivateResource; +import de.adorsys.datasafe.types.api.resource.ResolvedResource; +import de.adorsys.datasafe.types.api.resource.Uri; +import de.adorsys.datasafe.types.api.types.ReadStorePassword; +import de.adorsys.datasafe.types.api.utils.ReadKeyPasswordTestFactory; +import lombok.SneakyThrows; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; + +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static org.assertj.core.api.Assertions.assertThat; + +class SchemeDelegationTest extends WithStorageProvider { + + private Path fsPath; + private Uri minioPath; + private StorageService minio; + private StorageService filesystem; + private DefaultDatasafeServices datasafeServices; + + @BeforeEach + void initialize(@TempDir Path tempDir) { + WithStorageProvider.StorageDescriptor minioDescriptor = minio(); + this.fsPath = tempDir; + this.minio = minioDescriptor.getStorageService().get(); + this.filesystem = new FileSystemStorageService(tempDir); + this.minioPath = minioDescriptor.getLocation(); + StorageService multiDfs = new SchemeDelegatingStorage( + ImmutableMap.of( + "s3", minio, + "file", filesystem + ) + ); + + this.datasafeServices = DaggerDefaultDatasafeServices + .builder() + .config(new ProfilesOnFsDataOnMinio(minioPath, tempDir)) + .storage(multiDfs) + .build(); + } + + @Test + @SneakyThrows + void testProfileOnFsDataOnMinioWorks() { + UserIDAuth userJohn = new UserIDAuth("john", ReadKeyPasswordTestFactory.getForString("doe")); + + // John's profile will be saved to filesystem + datasafeServices.userProfile().registerUsingDefaults(userJohn); + + // But this data - it will be saved to minio + try (OutputStream os = + datasafeServices.privateService().write(WriteRequest.forDefaultPrivate(userJohn, "file.txt"))) { + os.write("Hello".getBytes()); + } + + // Profiles are on FS + assertThat(listFs()) + .extracting(it -> fsPath.relativize(it)) + .extracting(Path::toString) + .containsExactlyInAnyOrder("", "public-john", "private-john"); + // File and keystore/pub keys are on minio + assertThat(listMinio()) + .extracting(it -> minioPath.relativize(it.location())) + .extracting(it -> it.asURI().toString()) + .contains("users/john/private/keystore", "users/john/public/pubkeys") + .anyMatch(it -> it.startsWith("users/john/private/files/")) + .hasSize(3); + } + + private List> listMinio() { + try (Stream> ls = + minio.list(new AbsoluteLocation<>(BasePrivateResource.forPrivate(minioPath.resolve(""))))) { + return ls.collect(Collectors.toList()); + } + } + + private List listFs() throws IOException { + try (Stream ls = Files.walk(fsPath)) { + return ls.collect(Collectors.toList()); + } + } + + static class ProfilesOnFsDataOnMinio extends DefaultDFSConfig { + + private final Path profilesPath; + + ProfilesOnFsDataOnMinio(Uri minioBucketPath, Path profilesPath) { + super(minioBucketPath, new ReadStorePassword("PAZZWORT")); + this.profilesPath = profilesPath; + } + + @Override + public AbsoluteLocation publicProfile(UserID forUser) { + return new AbsoluteLocation<>( + BasePrivateResource.forPrivate(profilesPath.resolve("public-" + forUser.getValue()).toUri()) + ); + } + + @Override + public AbsoluteLocation privateProfile(UserID forUser) { + return new AbsoluteLocation<>( + BasePrivateResource.forPrivate(profilesPath.resolve("private-" + forUser.getValue()).toUri()) + ); + } + } +} \ No newline at end of file diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationIT.java deleted file mode 100644 index 846c11ea1..000000000 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationIT.java +++ /dev/null @@ -1,152 +0,0 @@ -package de.adorsys.datasafe.business.impl.e2e; - -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import de.adorsys.datasafe.business.impl.service.DaggerDefaultDatasafeServices; -import de.adorsys.datasafe.business.impl.service.DefaultDatasafeServices; -import de.adorsys.datasafe.directory.impl.profile.config.DefaultDFSConfig; -import de.adorsys.datasafe.encrypiton.api.types.UserID; -import de.adorsys.datasafe.encrypiton.api.types.UserIDAuth; -import de.adorsys.datasafe.storage.api.SchemeDelegatingStorage; -import de.adorsys.datasafe.storage.api.StorageService; -import de.adorsys.datasafe.storage.impl.db.DatabaseConnectionRegistry; -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.types.api.actions.WriteRequest; -import de.adorsys.datasafe.types.api.resource.AbsoluteLocation; -import de.adorsys.datasafe.types.api.resource.BasePrivateResource; -import de.adorsys.datasafe.types.api.resource.ResolvedResource; -import de.adorsys.datasafe.types.api.resource.Uri; -import de.adorsys.datasafe.types.api.types.ReadStorePassword; -import de.adorsys.datasafe.types.api.utils.ReadKeyPasswordTestFactory; -import lombok.SneakyThrows; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.io.TempDir; - -import java.io.OutputStream; -import java.net.URI; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static de.adorsys.datasafe.types.api.global.PathEncryptionId.AES_SIV; -import static org.assertj.core.api.Assertions.assertThat; - -class SchemeDelegationWithDbTest extends WithStorageProvider { - - private static final Set ALLOWED_TABLES = ImmutableSet.of("users", "private_profiles", "public_profiles"); - - private Path fsPath; - private StorageService db; - private DefaultDatasafeServices datasafeServices; - - @BeforeEach - void initialize(@TempDir Path tempDir) { - this.fsPath = tempDir; - StorageService filesystem = new FileSystemStorageService(tempDir); - this.db = new DatabaseStorageService(ALLOWED_TABLES, new DatabaseConnectionRegistry( - uri -> uri.location().getWrapped().getScheme() + ":" + uri.location().getPath().split("/")[1], - ImmutableMap.of("jdbc://localhost:9999", new DatabaseCredentials("sa", "sa"))) - ); - - StorageService multiDfs = new SchemeDelegatingStorage( - ImmutableMap.of( - "file", filesystem, - "jdbc", db - ) - ); - - this.datasafeServices = DaggerDefaultDatasafeServices - .builder() - .config(new ProfilesOnDbDataOnFs(tempDir.toUri(), URI.create("jdbc://localhost:9999/h2:mem:test/"))) - .storage(multiDfs) - .build(); - } - - @Test - @SneakyThrows - void testProfileOnDbDataOnFsWorks() { - UserIDAuth userJohn = new UserIDAuth("john", ReadKeyPasswordTestFactory.getForString("doe")); - - // John's profile will be saved to Database - datasafeServices.userProfile().registerUsingDefaults(userJohn); - - // But this data - it will be saved to FS - try (OutputStream os = - datasafeServices.privateService().write(WriteRequest.forDefaultPrivate(userJohn, "file.txt"))) { - os.write("Hello".getBytes()); - } - - // Profiles are on DB - assertThat(listDb("jdbc://localhost:9999/h2:mem:test/private_profiles/")) - .containsExactly("jdbc://localhost:9999/h2:mem:test/private_profiles/john"); - assertThat(listDb("jdbc://localhost:9999/h2:mem:test/public_profiles/")) - .containsExactly("jdbc://localhost:9999/h2:mem:test/public_profiles/john"); - - Path path = fsPath.resolve(new Uri("users/john/private/files/").resolve(AES_SIV.asUriRoot()).asString()); - Path encryptedFile = walk(path).get(1); - // File and keystore/pub keys are on FS - assertThat(walk(fsPath)) - .extracting(it -> fsPath.toUri().relativize(it.toUri())) - .extracting(URI::toString) - .containsExactlyInAnyOrder( - "", - "users/", - "users/john/", - "users/john/public/", - "users/john/public/pubkeys", - "users/john/private/", - "users/john/private/keystore", - "users/john/private/files/", - "users/john/private/files/SIV/", - fsPath.toUri().relativize(encryptedFile.toUri()).toString() - ); - } - - @SneakyThrows - private List walk(Path at) { - try (Stream ls = Files.walk(at)) { - return ls.collect(Collectors.toList()); - } - } - - private List listDb(String path) { - try (Stream> stream = db.list(BasePrivateResource.forAbsolutePrivate(URI.create(path)))){ - return stream.map(it -> it.location().asURI().toString()).collect(Collectors.toList()); - } - } - - static class ProfilesOnDbDataOnFs extends DefaultDFSConfig { - - private final Uri profilesPath; - - ProfilesOnDbDataOnFs(URI fsPath, URI profilesPath) { - super(fsPath, new ReadStorePassword("PAZZWORT")); - this.profilesPath = new Uri(profilesPath); - } - - @Override - public AbsoluteLocation publicProfile(UserID forUser) { - return new AbsoluteLocation<>( - BasePrivateResource.forPrivate( - profilesPath.resolve("public_profiles/").resolve(forUser.getValue()) - ) - ); - } - - @Override - public AbsoluteLocation privateProfile(UserID forUser) { - return new AbsoluteLocation<>( - BasePrivateResource.forPrivate( - profilesPath.resolve("private_profiles/").resolve(forUser.getValue()) - ) - ); - } - } -} \ No newline at end of file From 04602eafb9947dad1a734deb86bc2cdaff2d1688 Mon Sep 17 00:00:00 2001 From: Elwizzy12 Date: Fri, 12 Apr 2024 11:06:03 +0100 Subject: [PATCH 8/8] changed integration test with suffix IT --- .../business/impl/e2e/{BaseE2ETest.java => BaseE2EIT.java} | 2 +- .../datasafe/business/impl/e2e/BasicFunctionalityIT.java | 2 +- .../datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java | 2 +- .../business/impl/e2e/BasicFunctionalityWithConcurrencyIT.java | 2 +- .../impl/e2e/BasicFunctionalityWithPasswordChangeIT.java | 2 +- .../datasafe/business/impl/e2e/DataTamperingResistanceIT.java | 2 +- .../datasafe/business/impl/e2e/KeyStoreTypeCompareIT.java | 2 +- ...ersionTest.java => ProfileContainsDatasafeVersion2EIT.java} | 2 +- .../e2e/{SchemaDelegationTest.java => SchemeDelegationIT.java} | 3 +-- .../datasafe/business/impl/e2e/StorageBasedVersioningIT.java | 2 +- .../de/adorsys/datasafe/business/impl/e2e/VersionedDataIT.java | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{BaseE2ETest.java => BaseE2EIT.java} (99%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{ProfileContainsDatasafeVersionTest.java => ProfileContainsDatasafeVersion2EIT.java} (94%) rename datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/{SchemaDelegationTest.java => SchemeDelegationIT.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/BaseE2EIT.java similarity index 99% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2ETest.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2EIT.java index d544e2842..9cf4118e6 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/BaseE2EIT.java @@ -52,7 +52,7 @@ @Slf4j @RequiredArgsConstructor -public abstract class BaseE2ETest extends WithStorageProvider { +public abstract class BaseE2EIT extends WithStorageProvider { protected static final String PRIVATE_COMPONENT = "private"; protected static final String PRIVATE_FILES_COMPONENT = PRIVATE_COMPONENT + "/files"; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityIT.java index 4139e2a73..ce249ce74 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityIT.java @@ -47,7 +47,7 @@ * Tests that validates basic functionality - storing data to inbox, privatespace, listing files, etc. */ @Slf4j -class BasicFunctionalityIT extends BaseE2ETest { +class BasicFunctionalityIT extends BaseE2EIT { private static final int LARGE_SIZE = 10 * 1024 * 1024 + 100; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java index 5b2697852..344099e55 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java @@ -15,7 +15,7 @@ * Tests that validates basic functionality - storing data to inbox, privatespace, listing files, etc. using UTF-8 paths. */ @Slf4j -class BasicFunctionalityUtf8IT extends BaseE2ETest { +class BasicFunctionalityUtf8IT extends BaseE2EIT { private static final String MESSAGE_ONE = "Hello here 1"; private static final String FOLDER = "folder1"; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyIT.java index 238fff129..665666f61 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithConcurrencyIT.java @@ -56,7 +56,7 @@ * Multithreaded test of basic operations. */ @Slf4j -class BasicFunctionalityWithConcurrencyIT extends BaseE2ETest { +class BasicFunctionalityWithConcurrencyIT extends BaseE2EIT { private static final int TIMEOUT_S = 30; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeIT.java index ad5f3c320..714696659 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityWithPasswordChangeIT.java @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -class BasicFunctionalityWithPasswordChangeIT extends BaseE2ETest { +class BasicFunctionalityWithPasswordChangeIT extends BaseE2EIT { @SneakyThrows @ParameterizedTest diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceIT.java index 202f3ef83..9d2a623fb 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/DataTamperingResistanceIT.java @@ -38,7 +38,7 @@ * attacker is unable to modify encrypted text without being detected. */ @Slf4j -class DataTamperingResistanceIT extends BaseE2ETest { +class DataTamperingResistanceIT extends BaseE2EIT { private static final Set NOT_TO_REPLACE_IN_PATH = ImmutableSet.of('=', '/'); diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareIT.java index 24672c5ba..d07bd839a 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/KeyStoreTypeCompareIT.java @@ -24,7 +24,7 @@ import static org.assertj.core.api.Assertions.assertThat; @Slf4j -public class KeyStoreTypeCompareIT extends BaseE2ETest { +public class KeyStoreTypeCompareIT extends BaseE2EIT { private final static int NUMBER_WRITES = 100; private final static int NUMBER_READS = 100; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersionTest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersion2EIT.java similarity index 94% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersionTest.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersion2EIT.java index cf7afb707..7f12fdcf2 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersionTest.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/ProfileContainsDatasafeVersion2EIT.java @@ -8,7 +8,7 @@ import static org.assertj.core.api.Assertions.assertThat; -class ProfileContainsDatasafeVersionTest extends BaseE2ETest { +class ProfileContainsDatasafeVersion2EIT extends BaseE2EIT { @Test @SneakyThrows diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemaDelegationTest.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationIT.java similarity index 98% rename from datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemaDelegationTest.java rename to datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationIT.java index 1ea5f453c..0035db8c2 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemaDelegationTest.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/SchemeDelegationIT.java @@ -1,5 +1,4 @@ package de.adorsys.datasafe.business.impl.e2e; - import de.adorsys.datasafe.business.impl.service.DaggerDefaultDatasafeServices; import de.adorsys.datasafe.business.impl.service.DefaultDatasafeServices; import de.adorsys.datasafe.directory.impl.profile.config.DefaultDFSConfig; @@ -32,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; -class SchemeDelegationTest extends WithStorageProvider { +class SchemeDelegationIT extends WithStorageProvider { private Path fsPath; private Uri minioPath; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningIT.java index 4da2b6b51..5445cbaf3 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/StorageBasedVersioningIT.java @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; @DisabledIfSystemProperty(named = WithStorageProvider.SKIP_CEPH, matches = "true") -class StorageBasedVersioningIT extends BaseE2ETest { +class StorageBasedVersioningIT extends BaseE2EIT { private static final String FILE = "file.txt"; diff --git a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataIT.java b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataIT.java index f791a6c87..a4a583237 100644 --- a/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataIT.java +++ b/datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/VersionedDataIT.java @@ -36,7 +36,7 @@ * Validates software versioned operations. */ @Slf4j -public class VersionedDataIT extends BaseE2ETest { +public class VersionedDataIT extends BaseE2EIT { private static final String MESSAGE_ONE = "Hello here 1"; private static final String MESSAGE_TWO = "Hello here 2";