fixes #235

Author: anshooarora

reporters/klov/src/main/java/com/aventstack/extentreports/reporter/HttpMediaManagerImplKlov.java

@@ -46,7 +46,9 @@ public void storeMedia(Media m) throws IOException {
         if (m instanceof ScreenCapture && ((ScreenCapture) m).getBase64() != null) {
             return;
         }
-        File f = new File(m.getResolvedPath());
+        File f = new File(m.getPath());
+        if (m.getResolvedPath() != null)
+            f = new File(m.getResolvedPath());
         if (!f.exists()) {
             throw new IOException("The system cannot find the file specified " + m.getPath());
         }
@@ -69,13 +71,12 @@ public void storeMedia(Media m) throws IOException {
                         ContentType.TEXT_PLAIN));
         builder.addPart("testId",
                 new StringBody(m.getInfoMap().get(ExtentKlovReporter.TEST_ID_KEY).toString(), ContentType.TEXT_PLAIN));
-        builder.addPart("f", new FileBody(new File(m.getResolvedPath())));
+        builder.addPart("f", new FileBody(f));
         post.setEntity(builder.build());
 
-        String logId = m.getInfoMap().get(ExtentKlovReporter.LOG_ID_KEY) == null
-                ? null
-                : m.getInfoMap().get(ExtentKlovReporter.LOG_ID_KEY).toString();
-        builder.addPart("logId", new StringBody(logId, ContentType.TEXT_PLAIN));
+        Object logId = m.getInfoMap().get(ExtentKlovReporter.LOG_ID_KEY);
+        if (logId != null)
+            builder.addPart("logId", new StringBody(logId.toString(), ContentType.TEXT_PLAIN));
 
         HttpClient client = null;
         if (host.toLowerCase().startsWith("https")) {

src/main/java/com/aventstack/extentreports/ExtentTest.java

@@ -357,7 +357,7 @@ public ExtentTest generateLog(Status status, Markup markup) {
      * @return An {@link ExtentTest} object
      */
     public ExtentTest log(Status status, String details, Throwable t, Media media) {
-    	Assert.notNull(status, "Status must not be null");
+        Assert.notNull(status, "Status must not be null");
         Log log = Log.builder()
                 .status(status)
                 .details(details == null ? "" : details)
@@ -366,7 +366,7 @@ public ExtentTest log(Status status, String details, Throwable t, Media media) {
         log.setException(exceptionInfo);
         log.addMedia(media);
         if (exceptionInfo != null)
-        	model.getExceptions().add(exceptionInfo);
+            model.getExceptions().add(exceptionInfo);
         model.addLog(log);
         extent.onLogCreated(log, model);
         return this;
@@ -1067,7 +1067,7 @@ public Status getStatus() {
     }
 
     public ExtentTest addScreenCaptureFromPath(String path, String title) {
-    	Assert.notEmpty(path, "ScreenCapture path must not be null or empty");
+        Assert.notEmpty(path, "ScreenCapture path must not be null or empty");
         Media m = ScreenCapture.builder().path(path).title(title).build();
         model.addMedia(m);
         extent.onMediaAdded(m, model);
@@ -1079,7 +1079,7 @@ public ExtentTest addScreenCaptureFromPath(String path) {
     }
 
     public ExtentTest addScreenCaptureFromBase64String(String base64, String title) {
-    	Assert.notEmpty(base64, "ScreenCapture's base64 string must not be null or empty");
+        Assert.notEmpty(base64, "ScreenCapture's base64 string must not be null or empty");
         if (!base64.startsWith("data:"))
             base64 = "data:image/png;base64," + base64;
         Media m = ScreenCapture.builder().base64(base64).title(title).build();

src/main/java/com/aventstack/extentreports/model/Test.java

@@ -65,7 +65,7 @@ public final class Test implements RunResult, Serializable, BaseEntity, MetaData
     private final List<Log> generatedLog = Collections.synchronizedList(new ArrayList<>());
 
     public final void addChild(Test child) {
-    	Assert.notNull(child, "Node must not be null");
+        Assert.notNull(child, "Node must not be null");
         child.setLevel(level + 1);
         child.setParent(this);
         child.setLeaf(true);
@@ -100,7 +100,7 @@ public final void addGeneratedLog(Log log) {
     }
 
     private final void addLog(Log log, List<Log> list) {
-    	Assert.notNull(log, "Log must not be null");
+        Assert.notNull(log, "Log must not be null");
         log.setSeq(list.size());
         list.add(log);
         end(log.getStatus());
@@ -148,7 +148,7 @@ public final String getFullName() {
         StringBuilder sb = new StringBuilder(test.getName());
         while (test.getParent() != null) {
             test = test.getParent();
-            if (test.getBddType() == null || test.getBddType() != ScenarioOutline.class)
+            if (!test.isBDD() || test.getBddType() != ScenarioOutline.class)
                 sb.insert(0, test.getName() + ".");
         }
         return sb.toString();
@@ -168,7 +168,7 @@ public final boolean hasScreenCapture() {
     public final long timeTaken() {
         return endTime.getTime() - startTime.getTime();
     }
-    
+
     public List<ExceptionInfo> aggregateExceptions() {
         return logs.stream()
                 .filter(x -> x.getException() != null)

src/main/java/com/aventstack/extentreports/util/Assert.java

@@ -1,15 +1,15 @@
 package com.aventstack.extentreports.util;
 
 public class Assert {
-	public static void notNull(Object o, String message) {
-		if (o == null) {
-			throw new IllegalArgumentException(message);
-		}
-	}
-	
-	public static void notEmpty(String s, String message) {
-		if (s == null || s.isEmpty()) {
-			throw new IllegalArgumentException(message);
-		}
-	}
+    public static void notNull(Object o, String message) {
+        if (o == null) {
+            throw new IllegalArgumentException(message);
+        }
+    }
+
+    public static void notEmpty(String s, String message) {
+        if (s == null || s.isEmpty()) {
+            throw new IllegalArgumentException(message);
+        }
+    }
 }