Merge pull request #68 from healenium/feature/EPMHLM-334

Feature/epmhlm 334
healenium · May 28, 2023 · 9f05217 · 9f05217
2 parents bc082ea + 628dde1
commit 9f05217
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group 'com.epam.healenium'
-version '3.3.2'
+version '3.3.3'
 
 sourceCompatibility = 1.8
 

diff --git a/src/main/java/com/epam/healenium/service/impl/ReportServiceImpl.java b/src/main/java/com/epam/healenium/service/impl/ReportServiceImpl.java
@@ -22,6 +22,8 @@
 import java.text.DecimalFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -110,7 +112,7 @@ private void buildReportRecords(RecordDto result, Report report) {
                     || it.getClassName().contains(Constants.MULTIPLE_ELEMENTS_PROXY_CLASS_PATH)
                     ? it.getFailedLocator().getValue()
                     : it.getClassName() + "." + it.getMethodName() + "()");
-            reportRecord.setScreenShotPath(it.getScreenShotPath());
+            reportRecord.setScreenShotPath(transformPath(it.getScreenShotPath()));
             reportRecord.setFailedLocatorType(it.getFailedLocator().getType());
             reportRecord.setFailedLocatorValue(it.getFailedLocator().getValue());
             reportRecord.setHealedLocatorType(it.getHealedLocator().getType());
@@ -123,6 +125,14 @@ private void buildReportRecords(RecordDto result, Report report) {
         });
     }
 
+    private String transformPath(String sourcePath) {
+        List<String> dirs = Arrays.asList(sourcePath.split("/"));
+        Collections.reverse(dirs);
+        String name = dirs.get(0);
+        String uid = dirs.get(1);
+        return "/screenshots/".concat(uid).concat("/").concat(name);
+    }
+
 
     /**
      * Create record in report about healing

diff --git a/src/main/java/com/epam/healenium/util/Utils.java b/src/main/java/com/epam/healenium/util/Utils.java
@@ -1,8 +1,8 @@
 package com.epam.healenium.util;
 
-import jdk.internal.joptsimple.internal.Strings;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.DigestUtils;
 
 import java.nio.charset.StandardCharsets;
@@ -53,11 +53,11 @@ public String buildScreenshotName() {
 
     public String getAddressForKey(String url, boolean urlForKey) {
         try {
-            return urlForKey ? url : Strings.EMPTY;
+            return urlForKey ? url : StringUtils.EMPTY;
         } catch (Exception e) {
             log.warn("Error during parse url. Message: {}", e.getMessage());
         }
-        return Strings.EMPTY;
+        return StringUtils.EMPTY;
     }
 
 }