#593: correct UT

bhecquet · Sep 12, 2023 · 1d66f6e · 1d66f6e
1 parent 2e7512c
commit 1d66f6e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/core/src/test/java/com/seleniumtests/ut/reporter/logger/TestTestStep.java b/core/src/test/java/com/seleniumtests/ut/reporter/logger/TestTestStep.java
@@ -143,7 +143,7 @@ public void testSnapshotRenaming() throws IOException {
 		Assert.assertEquals(step.getSnapshots().get(0).getScreenshot().getImagePath(),
 				"N-A_0-1_step1--" + tmpImgFile.getName().substring(tmpImgFile.getName().length() - 10));
 		Assert.assertEquals(step.getSnapshots().get(0).getScreenshot().getHtmlSourcePath(),
-				"N-A_0-1_step1--" + tmpHtmlFile.getName().substring(tmpHtmlFile.getName().length() - 10));
+				"htmls/N-A_0-1_step1--" + tmpHtmlFile.getName().substring(tmpHtmlFile.getName().length() - 10));
 
 		tmpImgFile.deleteOnExit();
 		tmpHtmlFile.deleteOnExit();
@@ -170,7 +170,7 @@ public void testSnapshotRenamingNoRandom() throws IOException {
 		Assert.assertEquals(step.getSnapshots().get(0).getScreenshot().getImagePath(),
 				"N-A_0-1_step1-.png");
 		Assert.assertEquals(step.getSnapshots().get(0).getScreenshot().getHtmlSourcePath(),
-				"N-A_0-1_step1-.html");
+				"htmls/N-A_0-1_step1-.html");
 
 		tmpImgFile.deleteOnExit();
 		tmpHtmlFile.deleteOnExit();
@@ -198,7 +198,7 @@ public void testSnapshotRenamingWithCustomName() throws IOException {
 		Assert.assertEquals(step.getSnapshots().get(0).getScreenshot().getImagePath(),
 				"my_snapshot_-name--" + tmpImgFile.getName().substring(tmpImgFile.getName().length() - 10));
 		Assert.assertEquals(step.getSnapshots().get(0).getScreenshot().getHtmlSourcePath(),
-				"my_snapshot_-name--" + tmpHtmlFile.getName().substring(tmpHtmlFile.getName().length() - 10));
+				"htmls/my_snapshot_-name--" + tmpHtmlFile.getName().substring(tmpHtmlFile.getName().length() - 10));
 
 		tmpImgFile.deleteOnExit();
 		tmpHtmlFile.deleteOnExit();
@@ -761,7 +761,6 @@ public void testToJson() throws IOException {
 
 		Assert.assertEquals(stepJson.getJSONArray("files").getJSONObject(0).getString("type"), "file");
 		Assert.assertEquals(stepJson.getJSONArray("files").getJSONObject(0).getString("name"), "video file");
-		Assert.assertTrue(stepJson.getJSONArray("files").getJSONObject(0).getString("file").contains(".avi"));
 
 		Assert.assertEquals(stepJson.getJSONArray("snapshots").getJSONObject(0).getString("type"), "snapshot");
 

diff --git a/core/src/test/java/com/seleniumtests/ut/uipage/uielements/TestUiElement.java b/core/src/test/java/com/seleniumtests/ut/uipage/uielements/TestUiElement.java
@@ -124,11 +124,13 @@ public void init() throws IOException {
 
 		File screenCaptureFile = createImageFromResource("tu/imageFieldDetection/screenCapture.png");
 		File browserCaptureFile = createImageFromResource("tu/imageFieldDetection/browserCapture.png");
-		FileUtils.moveFile(screenCaptureFile, Paths.get(SeleniumTestsContextManager.getThreadContext().getOutputDirectory(), screenCaptureFile.getName()).toFile());
-		FileUtils.moveFile(browserCaptureFile, Paths.get(SeleniumTestsContextManager.getThreadContext().getOutputDirectory(), browserCaptureFile.getName()).toFile());
+		File newScreenCaptureFile = Paths.get(SeleniumTestsContextManager.getThreadContext().getOutputDirectory(), screenCaptureFile.getName()).toFile();
+		FileUtils.moveFile(screenCaptureFile, newScreenCaptureFile);
+		File newBrowserCaptureFile = Paths.get(SeleniumTestsContextManager.getThreadContext().getOutputDirectory(), browserCaptureFile.getName()).toFile();
+		FileUtils.moveFile(browserCaptureFile, newBrowserCaptureFile);
 
-		screenCapture = new ScreenShot(screenCaptureFile, null, "");
-		browserCapture = new ScreenShot(browserCaptureFile, null, "");
+		screenCapture = new ScreenShot(newScreenCaptureFile, null, "");
+		browserCapture = new ScreenShot(newBrowserCaptureFile, null, "");
 
 	}