From a29fac98709139383391864dd34a2b2774dd15f3 Mon Sep 17 00:00:00 2001 From: loliveiramontedonio Date: Mon, 12 Dec 2022 08:42:02 -0300 Subject: [PATCH 1/4] fix test --- .../l10n/mojito/service/screenshot/ScreenshotServiceTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webapp/src/test/java/com/box/l10n/mojito/service/screenshot/ScreenshotServiceTest.java b/webapp/src/test/java/com/box/l10n/mojito/service/screenshot/ScreenshotServiceTest.java index c0f0261ce5..93613e0c7b 100644 --- a/webapp/src/test/java/com/box/l10n/mojito/service/screenshot/ScreenshotServiceTest.java +++ b/webapp/src/test/java/com/box/l10n/mojito/service/screenshot/ScreenshotServiceTest.java @@ -86,6 +86,7 @@ public void testDeleteScreenshot() throws Exception { List createdThirdPartyScreenshots = thirdPartyScreenshotRepository.findAllByScreenshotId(screenshot.getId()); Assert.assertEquals(createdThirdPartyScreenshots.get(0).getId(), thirdPartyScreenshot.getId()); + screenshot.setThirdPartyScreenshots(new HashSet(createdThirdPartyScreenshots)); Repository repository = repositoryService.createRepository("testRepository"); @@ -105,7 +106,9 @@ public void testDeleteScreenshot() throws Exception { ScreenshotTextUnit createdScreenshotTextUnit = screenshotTextUnitRepository.findById(screenshotTextUnit.getId()).orElse(null); assertEquals(createdScreenshotTextUnit.getScreenshot().getId(), screenshot.getId()); + screenshot.setScreenshotTextUnits(new HashSet(Arrays.asList(createdScreenshotTextUnit))); + screenshotRepository.save(screenshot); screenshotService.deleteScreenshot(screenshot.getId()); verify(thirdPartyServiceMock, times(1)) From 05895da4097d1aff9346e641599eff96f8b914a1 Mon Sep 17 00:00:00 2001 From: loliveiramontedonio Date: Mon, 12 Dec 2022 09:12:51 -0300 Subject: [PATCH 2/4] . From 8ffa84a918329230825b91e60f3373b183f8fdc9 Mon Sep 17 00:00:00 2001 From: loliveiramontedonio Date: Tue, 13 Dec 2022 07:45:22 -0300 Subject: [PATCH 3/4] Revert "Redirect test output to file to reduce build log noise" This reverts commit 21292195c410bbc10c740fae6c57bc0d946e9e87. --- cli/pom.xml | 2 -- common/pom.xml | 2 -- common/src/test/resources/logback.xml | 16 ---------------- restclient/pom.xml | 2 -- restclient/src/test/resources/logback.xml | 16 ---------------- webapp/pom.xml | 3 +-- webapp/src/test/resources/logback.xml | 16 ---------------- 7 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 common/src/test/resources/logback.xml delete mode 100644 restclient/src/test/resources/logback.xml delete mode 100644 webapp/src/test/resources/logback.xml diff --git a/cli/pom.xml b/cli/pom.xml index 5606a38712..0fa61bbd81 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -147,8 +147,6 @@ -Dspring.config.additional-location=optional:file://${user.home}/.l10n/config/cli/ -Dspring.profiles.active=${user.name},test -Xmx1024m - true - ${project.build.directory}/test-reports diff --git a/common/pom.xml b/common/pom.xml index d98810ddde..2e9683e8bc 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -374,8 +374,6 @@ -Dspring.config.additional-location=optional:file://${user.home}/.l10n/config/common/ -Dspring.profiles.active=${user.name},test -Duser.timezone=UTC - true - ${project.build.directory}/test-reports diff --git a/common/src/test/resources/logback.xml b/common/src/test/resources/logback.xml deleted file mode 100644 index 5af6606894..0000000000 --- a/common/src/test/resources/logback.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - %msg%n - - - - - - - - - diff --git a/restclient/pom.xml b/restclient/pom.xml index 59a3e19bbf..7a4d42dd21 100644 --- a/restclient/pom.xml +++ b/restclient/pom.xml @@ -79,8 +79,6 @@ -Dspring.config.additional-location=optional:file://${user.home}/.l10n/config/restclient/ -Dspring.profiles.active=${user.name},test -Xmx1024m - true - ${project.build.directory}/test-reports diff --git a/restclient/src/test/resources/logback.xml b/restclient/src/test/resources/logback.xml deleted file mode 100644 index cfda09691c..0000000000 --- a/restclient/src/test/resources/logback.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - %msg%n - - - - - - - - - diff --git a/webapp/pom.xml b/webapp/pom.xml index 65ac03363d..d66ab92144 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -436,8 +436,7 @@ -Dspring.config.additional-location=optional:file://${user.home}/.l10n/config/webapp/ -Dspring.profiles.active=${user.name},test -Xmx1024m -Duser.timezone=UTC - true - ${project.build.directory}/test-reports + 1 diff --git a/webapp/src/test/resources/logback.xml b/webapp/src/test/resources/logback.xml deleted file mode 100644 index 00c0a9c368..0000000000 --- a/webapp/src/test/resources/logback.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - %msg%n - - - - - - - - - From 2dc8aca3d941f7ef931d1f45d6904cdd4c013e3a Mon Sep 17 00:00:00 2001 From: loliveiramontedonio Date: Wed, 14 Dec 2022 14:07:59 -0300 Subject: [PATCH 4/4] test logs --- .../service/screenshot/ScreenshotService.java | 17 +++++++++++++---- .../screenshot/ScreenshotServiceTest.java | 2 ++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/webapp/src/main/java/com/box/l10n/mojito/service/screenshot/ScreenshotService.java b/webapp/src/main/java/com/box/l10n/mojito/service/screenshot/ScreenshotService.java index 30e5cc8c77..99afacf110 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/service/screenshot/ScreenshotService.java +++ b/webapp/src/main/java/com/box/l10n/mojito/service/screenshot/ScreenshotService.java @@ -381,13 +381,22 @@ public void updateScreenshot(Screenshot screenshot) { */ @Transactional public void deleteScreenshot(Long id) { + logger.debug("thirdPartyScreenshotRepository: " + thirdPartyScreenshotRepository); + logger.debug("thirdPartySyncJobsConfig: " + thirdPartySyncJobsConfig); + logger.debug("thirdPartyService: " + thirdPartyService); + logger.debug("thirdPartyScreenshotRepository: " + thirdPartyScreenshotRepository); + logger.debug("screenshotTextUnitRepository: " + screenshotTextUnitRepository); + logger.debug("screenshotRepository: " + screenshotRepository); + + logger.debug("id: " + id); List thirdPartyScreenshots = thirdPartyScreenshotRepository.findAllByScreenshotId(id); - + logger.debug("thirdPartyScreenshots: " + thirdPartyScreenshots); final Map thirdPartySyncJobs = thirdPartySyncJobsConfig.getThirdPartySyncJobs(); - + logger.debug("thirdPartySyncJobs: " + thirdPartySyncJobs); for (ThirdPartyScreenshot thirdPartyScreenshot : thirdPartyScreenshots) { + logger.debug("thirdPartyScreenshot: " + thirdPartyScreenshot); String repository = thirdPartyScreenshot.getScreenshot().getScreenshotTextUnits().stream() .findFirst() @@ -396,9 +405,9 @@ public void deleteScreenshot(Long id) { .getAsset() .getRepository() .getName(); - + logger.debug("repository: " + repository); String projectId = thirdPartySyncJobs.get(repository).getThirdPartyProjectId(); - + logger.debug("projectId: " + projectId); thirdPartyService.removeImage(projectId, thirdPartyScreenshot.getThirdPartyId()); thirdPartyScreenshotRepository.deleteById(thirdPartyScreenshot.getId()); } diff --git a/webapp/src/test/java/com/box/l10n/mojito/service/screenshot/ScreenshotServiceTest.java b/webapp/src/test/java/com/box/l10n/mojito/service/screenshot/ScreenshotServiceTest.java index 93613e0c7b..d0f42b605f 100644 --- a/webapp/src/test/java/com/box/l10n/mojito/service/screenshot/ScreenshotServiceTest.java +++ b/webapp/src/test/java/com/box/l10n/mojito/service/screenshot/ScreenshotServiceTest.java @@ -109,6 +109,8 @@ public void testDeleteScreenshot() throws Exception { screenshot.setScreenshotTextUnits(new HashSet(Arrays.asList(createdScreenshotTextUnit))); screenshotRepository.save(screenshot); + logger.debug("screenshotService: " + screenshotService); + logger.debug("screenshot.getId(): " + screenshot.getId()); screenshotService.deleteScreenshot(screenshot.getId()); verify(thirdPartyServiceMock, times(1))