From 6c38ed6ad1a122b764d23f00944439b9f6d98411 Mon Sep 17 00:00:00 2001 From: Aliaksei_Ashukha Date: Wed, 16 Oct 2024 16:57:46 +0300 Subject: [PATCH 1/2] EPMHLM-428 Fix SAST issues in hlm-backend --- .../com/epam/healenium/service/impl/ReportServiceImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/epam/healenium/service/impl/ReportServiceImpl.java b/src/main/java/com/epam/healenium/service/impl/ReportServiceImpl.java index 439222e..49632ef 100644 --- a/src/main/java/com/epam/healenium/service/impl/ReportServiceImpl.java +++ b/src/main/java/com/epam/healenium/service/impl/ReportServiceImpl.java @@ -31,8 +31,6 @@ @RequiredArgsConstructor public class ReportServiceImpl implements ReportService { - private static final String SESSION_ID_REGEX = "^[a-fA-F0-9]+$"; - private final ReportRepository reportRepository; private final HealingResultRepository resultRepository; @@ -145,7 +143,7 @@ private String transformPath(String sourcePath) { */ @Override public void createReportRecord(HealingResult result, Healing healing, String sessionId, byte[] screenshot) { - if (!StringUtils.isEmpty(sessionId) && sessionId.matches(SESSION_ID_REGEX)) { + if (!StringUtils.isEmpty(sessionId)) { String screenshotDir = "/screenshots/" + sessionId; String screenshotPath = persistScreenshot(screenshot, screenshotDir); log.debug("[Save Healing] Screenshot Path: {}", screenshotPath); From 064309e1b12869b01dd6f4406fa6464ca22a7152 Mon Sep 17 00:00:00 2001 From: Aliaksei_Ashukha Date: Thu, 17 Oct 2024 20:22:12 +0300 Subject: [PATCH 2/2] EPMHLM-428 Update tests --- example/docker-compose.yaml | 2 +- src/test/java/com/epam/healenium/TestSaveLocators.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/example/docker-compose.yaml b/example/docker-compose.yaml index 4ed99a7..8c6a333 100644 --- a/example/docker-compose.yaml +++ b/example/docker-compose.yaml @@ -18,7 +18,7 @@ services: - healenium healenium: - image: healenium/hlm-backend:3.4.4 + image: healenium/hlm-backend:3.4.6 container_name: healenium restart: on-failure ports: diff --git a/src/test/java/com/epam/healenium/TestSaveLocators.java b/src/test/java/com/epam/healenium/TestSaveLocators.java index 7158764..3782c12 100644 --- a/src/test/java/com/epam/healenium/TestSaveLocators.java +++ b/src/test/java/com/epam/healenium/TestSaveLocators.java @@ -47,6 +47,7 @@ public class TestSaveLocators extends TestContainersInitializer { @Autowired private ObjectMapper objectMapper; private SelectorRequestDto selectorRequest; + private RequestDto requestDto; @BeforeEach public void setUp() { @@ -58,6 +59,12 @@ public void setUp() { selectorRequest.setMethodName("testMethod()"); selectorRequest.setUrl("https://test-url"); selectorRequest.setNodePath(getLastValidPath()); + + requestDto = new RequestDto(); + requestDto.setLocator(selectorRequest.getLocator()); + requestDto.setClassName(selectorRequest.getClassName()); + requestDto.setMethodName(selectorRequest.getMethodName()); + requestDto.setUrl(selectorRequest.getUrl()); } @AfterEach @@ -105,7 +112,7 @@ public void testSaveLocatorHealing() throws IOException { @Test public void testHealingResultFromEmptyDb() { - Set resultDtos = healingService.getHealingResults(selectorRequest); + Set resultDtos = healingService.getHealingResults(requestDto); Assertions.assertNotEquals(1, resultDtos.size(), "Incorrect amount of healing results were found"); }