restore resolvedPath of Media from JSON archive

realulim · Jun 22, 2023 · b99caeb · b99caeb
1 parent 1417a85
commit b99caeb
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/src/main/java/com/aventstack/extentreports/ExtentTest.java b/src/main/java/com/aventstack/extentreports/ExtentTest.java
@@ -1103,16 +1103,16 @@ public Status getStatus() {
         return model.getStatus();
     }
 
-    public ExtentTest addScreenCaptureFromPath(String path, String title) {
+    public ExtentTest addScreenCaptureFromPath(String path, String resolvedPath, String title) {
         Assert.notEmpty(path, "ScreenCapture path must not be null or empty");
-        Media m = ScreenCapture.builder().path(path).title(title).build();
+        Media m = ScreenCapture.builder().path(path).resolvedPath(resolvedPath).title(title).build();
         model.addMedia(m);
         extent.onMediaAdded(m, model);
         return this;
     }
 
     public ExtentTest addScreenCaptureFromPath(String path) {
-        return addScreenCaptureFromPath(path, null);
+        return addScreenCaptureFromPath(path, path, null);
     }
 
     public ExtentTest addScreenCaptureFromBase64String(String base64, String title) {

diff --git a/src/main/java/com/aventstack/extentreports/MediaEntityBuilder.java b/src/main/java/com/aventstack/extentreports/MediaEntityBuilder.java
@@ -30,14 +30,18 @@ public Media build() {
         return media.get();
     }
 
-    public static MediaEntityBuilder createScreenCaptureFromPath(String path, String title) {
+    public static MediaEntityBuilder createScreenCaptureFromPath(String path, String resolvedPath, String title) {
     	Assert.notEmpty(path, "ScreenCapture path must not be null or empty");
-        media.set(ScreenCapture.builder().path(path).title(title).build());
+        media.set(ScreenCapture.builder().path(path).resolvedPath(resolvedPath).title(title).build());
         return getInstance();
     }
 
+    public static MediaEntityBuilder createScreenCaptureFromPath(String path, String resolvedPath) {
+        return createScreenCaptureFromPath(path, resolvedPath, null);
+    }
+
     public static MediaEntityBuilder createScreenCaptureFromPath(String path) {
-        return createScreenCaptureFromPath(path, null);
+        return createScreenCaptureFromPath(path, path, null);
     }
 
     public static MediaEntityBuilder createScreenCaptureFromBase64String(String base64, String title) {
@@ -51,4 +55,5 @@ public static MediaEntityBuilder createScreenCaptureFromBase64String(String base
     public static MediaEntityBuilder createScreenCaptureFromBase64String(String base64) {
         return createScreenCaptureFromBase64String(base64, null);
     }
-}
+
+}
diff --git a/src/main/java/com/aventstack/extentreports/append/RawEntityConverter.java b/src/main/java/com/aventstack/extentreports/append/RawEntityConverter.java
@@ -79,7 +79,7 @@ private void addMedia(Log log, ExtentTest extentTest, Throwable ex) {
         Media m = log.getMedia();
         if (m.getPath() != null) {
             extentTest.log(log.getTimestamp(), log.getStatus(), log.getDetails(), ex,
-                    MediaEntityBuilder.createScreenCaptureFromPath(m.getPath()).build());
+                    MediaEntityBuilder.createScreenCaptureFromPath(m.getPath(), m.getResolvedPath()).build());
         } else if (((ScreenCapture) m).getBase64() != null) {
             extentTest.log(log.getTimestamp(), log.getStatus(), log.getDetails(), ex,
                     MediaEntityBuilder.createScreenCaptureFromBase64String(((ScreenCapture) m).getBase64())
@@ -91,7 +91,7 @@ private void addMedia(Test test, ExtentTest extentTest) {
         if (test.getMedia() != null) {
             for (Media m : test.getMedia()) {
                 if (m.getPath() != null) {
-                    extentTest.addScreenCaptureFromPath(m.getPath());
+                    extentTest.addScreenCaptureFromPath(m.getPath(), m.getResolvedPath(), null);
                 } else if (m instanceof ScreenCapture) {
                     extentTest.addScreenCaptureFromBase64String(((ScreenCapture) m).getBase64());
                 }

diff --git a/src/test/java/com/aventstack/extentreports/ExtentTestMediaTest.java b/src/test/java/com/aventstack/extentreports/ExtentTestMediaTest.java
@@ -34,7 +34,7 @@ public void addScreenCaptureFromNullPathTest() {
     @Test
     public void addScreenCaptureFromPathTest() {
         ExtentTest test = extent().createTest("Test")
-                .addScreenCaptureFromPath(PATH, TITLE)
+                .addScreenCaptureFromPath(PATH, PATH, TITLE)
                 .pass("Pass");
         Assert.assertEquals(test.getModel().getMedia().size(), 1);
         Assert.assertEquals(test.getModel().getMedia().get(0).getPath(), PATH);
@@ -55,7 +55,7 @@ public void addScreenCaptureFromPathNode() {
         ExtentTest test = extent().createTest("Test");
         ExtentTest node = test
                 .createNode("Node")
-                .addScreenCaptureFromPath(PATH, TITLE)
+                .addScreenCaptureFromPath(PATH, PATH, TITLE)
                 .pass("Pass");
         Assert.assertEquals(test.getModel().getMedia().size(), 0);
         Assert.assertEquals(node.getModel().getMedia().size(), 1);
@@ -78,7 +78,7 @@ public void addScreenCaptureNullPathTestLog() {
     @Test
     public void addScreenCaptureFromPathTestLog() {
         ExtentTest test = extent().createTest("Test")
-                .pass("Pass", MediaEntityBuilder.createScreenCaptureFromPath(PATH, TITLE).build());
+                .pass("Pass", MediaEntityBuilder.createScreenCaptureFromPath(PATH, PATH, TITLE).build());
         Assert.assertEquals(test.getModel().getMedia().size(), 0);
         Assert.assertNotNull(test.getModel().getLogs().get(0).getMedia());
         Assert.assertEquals(test.getModel().getLogs().get(0).getMedia().getPath(), PATH);
@@ -99,7 +99,7 @@ public void addScreenCaptureFromPathNodeLog() {
         ExtentTest test = extent().createTest("Test");
         ExtentTest node = test
                 .createNode("Node")
-                .pass("Pass", MediaEntityBuilder.createScreenCaptureFromPath(PATH, TITLE).build());
+                .pass("Pass", MediaEntityBuilder.createScreenCaptureFromPath(PATH, PATH, TITLE).build());
         Assert.assertEquals(node.getModel().getMedia().size(), 0);
         Assert.assertNotNull(node.getModel().getLogs().get(0).getMedia());
         Assert.assertEquals(node.getModel().getLogs().get(0).getMedia().getPath(), PATH);