Skip to content

Commit

Permalink
fix: fix BasicFunctionalityUtf8IT to contain the root bucket
Browse files Browse the repository at this point in the history
  • Loading branch information
@AssahBismarkabah
AssahBismarkabah committed Sep 6, 2024
1 parent 9c1f5a8 commit 4ed2e3c
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 21 deletions.
9 changes: 7 additions & 2 deletions datasafe-business/src/test/java/de/adorsys/datasafe/business/impl/e2e/BaseE2EIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,16 @@ protected void writeDataToPrivate(UserIDAuth auth, String path, String data) {

@SneakyThrows
protected void writeDataToInbox(UserIDAuth owner, UserIDAuth auth, String path, String data) {
String fullPath = "datasafe-root/" + path;
try (OutputStream stream = writeToInbox.write(
WriteInboxRequest.forDefaultPublic(owner, Collections.singleton(auth.getUserID()), path)
WriteInboxRequest.forDefaultPublic(owner, Collections.singleton(auth.getUserID()), fullPath)
)) {

log.info("Writing data '{}' to path '{}' for user '{}'", data, fullPath, auth.getUserID());
stream.write(data.getBytes(UTF_8));
log.info("File {} of user {} saved to {}", Obfuscate.secure(data), auth, Obfuscate.secure(fullPath, "/"));
} catch (Exception e) {
log.error("Failed to write data to inbox: {}", e.getMessage());
throw e;
}
}

Expand Down
34 changes: 15 additions & 19 deletions ...usiness/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;

import static de.adorsys.datasafe.business.impl.inbox.actions.DefaultInboxActionsModule_ProvideRootBucketFactory.provideRootBucket;
import static org.assertj.core.api.Assertions.assertThat;

/**
Expand Down Expand Up @@ -84,21 +83,18 @@ void listingPrivatePathWithUnicode(WithStorageProvider.StorageDescriptor descrip

@ParameterizedTest
@MethodSource("allStorages")
// // Updated BasicFunctionaltyUT8IT.java
void readInboxContentWithUnicodeUsingUnicodePath(WithStorageProvider.StorageDescriptor descriptor) {
init(descriptor);

john = registerUser("john");
jane = registerUser("jane");

String unicodeMessage = "привет мир!";
String filePath = provideRootBucket() + "/привет/prüfungsdokument=/файл:&? с пробелом.док"; // Updated

writeDataToInbox(john, jane, filePath, unicodeMessage);
writeDataToInbox(john, jane, " привет/prüfungsdokument=/файл:&? с пробелом.док", unicodeMessage);

String inboxContentJane = readInboxUsingPrivateKey(
jane,
BasePrivateResource.forPrivate(filePath)
BasePrivateResource.forPrivate(" привет/prüfungsdokument=/файл:&? с пробелом.док")
);

assertThat(inboxContentJane).isEqualTo(unicodeMessage);
Expand All @@ -111,22 +107,22 @@ void listingInboxPathWithUnicode(WithStorageProvider.StorageDescriptor descripto

registerJohnAndJane();

String rootBucket = provideRootBucket();
writeDataToInbox(john, jane, rootBucket + "/prüfungsdokument.doc+doc", MESSAGE_ONE);
writeDataToInbox(john, jane, rootBucket + "/уровень1/?файл+doc", MESSAGE_ONE);
writeDataToInbox(john, jane, rootBucket + "/уровень1/уровень 2=+/&файл пробел+плюс", MESSAGE_ONE);
//String rootBucket = provideRootBucket();
writeDataToInbox(john, jane, "/prüfungsdokument.doc+doc", MESSAGE_ONE);
writeDataToInbox(john, jane, "/уровень1/?файл+doc", MESSAGE_ONE);
writeDataToInbox(john, jane, "/уровень1/уровень 2=+/&файл пробел+плюс", MESSAGE_ONE);

assertInboxSpaceList(jane, "", "prüfungsdokument.doc+doc", "уровень1/?файл+doc", "уровень1/уровень 2=+/&файл пробел+плюс");
assertInboxSpaceList(jane, "./", "prüfungsdokument.doc+doc", "уровень1/?файл+doc", "уровень1/уровень 2=+/&файл пробел+плюс");
assertInboxSpaceList(jane, ".", "prüfungsdokument.doc+doc", "уровень1/?файл+doc", "уровень1/уровень 2=+/&файл пробел+плюс");
assertInboxSpaceList(jane, "", "prüfungsdokument.doc+doc", "уровень1/?файл+doc", "уровень1/уровень 2=+/&файл пробел+плюс");
assertInboxSpaceList(jane, "./", "prüfungsdokument.doc+doc", "уровень1/?файл+doc", "уровень1/уровень 2=+/&файл пробел+плюс");
assertInboxSpaceList(jane, ".", "prüfungsdokument.doc+doc", "уровень1/?файл+doc", "уровень1/уровень 2=+/&файл пробел+плюс");

assertInboxSpaceList(jane, rootBucket + "/prüfungsdokument.doc+doc", "prüfungsdokument.doc+doc");
assertInboxSpaceList(jane, "./" + rootBucket + "/prüfungsdokument.doc+doc", "prüfungsdokument.doc+doc");
assertInboxSpaceList(jane, "prüfungsdokument.doc+doc", "prüfungsdokument.doc+doc");
assertInboxSpaceList(jane, "./prüfungsdokument.doc+doc", "prüfungsdokument.doc+doc");

assertInboxSpaceList(jane, rootBucket + "/уровень1/уровень 2=+", "уровень1/уровень 2=+/&файл пробел+плюс");
assertInboxSpaceList(jane, rootBucket + "/уровень1/уровень 2=+/", "уровень1/уровень 2=+/&файл пробел+плюс");
assertInboxSpaceList(jane, "./" + rootBucket + "/уровень1/уровень 2=+", "уровень1/уровень 2=+/&файл пробел+плюс");
assertInboxSpaceList(jane, "./" + rootBucket + "/уровень1/уровень 2=+/", "уровень1/уровень 2=+/&файл пробел+плюс");
assertInboxSpaceList(jane, "уровень1/уровень 2=+", "уровень1/уровень 2=+/&файл пробел+плюс");
assertInboxSpaceList(jane, "уровень1/уровень 2=+/", "уровень1/уровень 2=+/&файл пробел+плюс");
assertInboxSpaceList(jane, "./уровень1/уровень 2=+", "уровень1/уровень 2=+/&файл пробел+плюс");
assertInboxSpaceList(jane, "./уровень1/уровень 2=+/", "уровень1/уровень 2=+/&файл пробел+плюс");
}


Expand Down

0 comments on commit 4ed2e3c

Please sign in to comment.