update business.impl.e2e

adorsys · Sep 5, 2024 · 9c1f5a8 · 9c1f5a8
1 parent 436e00b
commit 9c1f5a8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
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/BaseE2EIT.java
@@ -43,6 +43,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -125,7 +126,6 @@ protected void writeDataToInbox(UserIDAuth owner, UserIDAuth auth, String path,
 
  stream.write(data.getBytes(UTF_8));
  }
- log.info("File {} of user {} saved to {}", Obfuscate.secure(data), auth, Obfuscate.secure(path, "/"));
  }
 
  protected AbsoluteLocation<ResolvedResource> getFirstFileInPrivate(UserIDAuth owner) {
@@ -241,15 +241,21 @@ protected void assertPrivateSpaceList(UserIDAuth user, String root, String... ex
 
  protected void assertInboxSpaceList(UserIDAuth user, String root, String... expected) {
  List<String> paths;
+ String prefixedRoot = "datasafe-root/" + root;
+
  try (Stream<AbsoluteLocation<ResolvedResource>> ls =
- listInbox.list(ListRequest.forDefaultPrivate(user, root))
+  listInbox.list(ListRequest.forDefaultPrivate(user, prefixedRoot))
  ) {
  paths = ls
- .map(it -> it.getResource().asPrivate().decryptedPath().asString())
- .collect(Collectors.toList());
+  .map(it -> it.getResource().asPrivate().decryptedPath().asString())
+  .collect(Collectors.toList());
  }
 
- assertThat(paths).containsExactlyInAnyOrder(expected);
+ String[] prefixedExpected = Arrays.stream(expected)
+ .map(path -> "datasafe-root/" + path)
+ .toArray(String[]::new);
+
+ assertThat(paths).containsExactlyInAnyOrder(prefixedExpected);
  }
 
  @SneakyThrows

diff --git a/...usiness/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java b/...usiness/src/test/java/de/adorsys/datasafe/business/impl/e2e/BasicFunctionalityUtf8IT.java
@@ -84,7 +84,7 @@ void listingPrivatePathWithUnicode(WithStorageProvider.StorageDescriptor descrip
 
  @ParameterizedTest
  @MethodSource("allStorages")
- // Updated BasicFunctionaltyUT8IT.java
+ // // Updated BasicFunctionaltyUT8IT.java
  void readInboxContentWithUnicodeUsingUnicodePath(WithStorageProvider.StorageDescriptor descriptor) {
  init(descriptor);
 
@@ -116,17 +116,17 @@ void listingInboxPathWithUnicode(WithStorageProvider.StorageDescriptor descripto
  writeDataToInbox(john, jane, rootBucket + "/уровень1/?файл+doc", MESSAGE_ONE);
  writeDataToInbox(john, jane, rootBucket + "/уровень1/уровень 2=+/&файл пробел+плюс", MESSAGE_ONE);
 
- assertInboxSpaceList(jane, "", rootBucket + "/prüfungsdokument.doc+doc", rootBucket + "/уровень1/?файл+doc", rootBucket + "/уровень1/уровень 2=+/&файл пробел+плюс");
- assertInboxSpaceList(jane, "./", rootBucket + "/prüfungsdokument.doc+doc", rootBucket + "/уровень1/?файл+doc", rootBucket + "/уровень1/уровень 2=+/&файл пробел+плюс");
- assertInboxSpaceList(jane, ".", rootBucket + "/prüfungsdokument.doc+doc", rootBucket + "/уровень1/?файл+doc", rootBucket + "/уровень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", rootBucket + "/prüfungsdokument.doc+doc");
- assertInboxSpaceList(jane, "./" + rootBucket + "/prüfungsdokument.doc+doc", rootBucket + "/prüfungsdokument.doc+doc");
+ assertInboxSpaceList(jane, rootBucket + "/prüfungsdokument.doc+doc",  "prüfungsdokument.doc+doc");
+ assertInboxSpaceList(jane, "./" + rootBucket + "/prüfungsdokument.doc+doc", "prüfungsdokument.doc+doc");
 
- assertInboxSpaceList(jane, rootBucket + "/уровень1/уровень 2=+", rootBucket + "/уровень1/уровень 2=+/&файл пробел+плюс");
- assertInboxSpaceList(jane, rootBucket + "/уровень1/уровень 2=+/", rootBucket + "/уровень1/уровень 2=+/&файл пробел+плюс");
- assertInboxSpaceList(jane, "./" + rootBucket + "/уровень1/уровень 2=+", rootBucket + "/уровень1/уровень 2=+/&файл пробел+плюс");
- assertInboxSpaceList(jane, "./" + rootBucket + "/уровень1/уровень 2=+/", rootBucket + "/уровень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, "./" + rootBucket + "/уровень1/уровень 2=+/",  "уровень1/уровень 2=+/&файл пробел+плюс");
  }