#24: Fixed NPE in log storage

Invictum · Jun 22, 2018 · 01448c2 · 01448c2
1 parent b393ba7
commit 01448c2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/com/github/invictum/reportportal/LogStorage.java b/src/main/java/com/github/invictum/reportportal/LogStorage.java
@@ -1,5 +1,6 @@
 package com.github.invictum.reportportal;
 
+import org.openqa.selenium.logging.LogEntries;
 import org.openqa.selenium.logging.Logs;
 
 import java.util.ArrayList;
@@ -30,10 +31,13 @@ public void collect(Logs seleniumLogs) {
         }
         // Collect all available logs
         types.get().ifPresent(types -> types.forEach(type -> {
-            List<EnhancedLogEntry> typedLogs = seleniumLogs.get(type).getAll().stream()
-                    .map(log -> new EnhancedLogEntry(type, log.getLevel(), log.getTimestamp(), log.getMessage()))
-                    .collect(Collectors.toList());
-            logs.get().addAll(typedLogs);
+            LogEntries logEntries = seleniumLogs.get(type);
+            if (logEntries != null) {
+                List<EnhancedLogEntry> typedLogs = logEntries.getAll().stream()
+                        .map(log -> new EnhancedLogEntry(type, log.getLevel(), log.getTimestamp(), log.getMessage()))
+                        .collect(Collectors.toList());
+                logs.get().addAll(typedLogs);
+            }
         }));
     }
 

diff --git a/src/test/java/com/github/invictum/reportportal/LogStorageTest.java b/src/test/java/com/github/invictum/reportportal/LogStorageTest.java
@@ -57,4 +57,11 @@ public void collectAvailableTypesOnlyOnceTest() {
         storage.collect(logsMock);
         Mockito.verify(logsMock, Mockito.times(1)).getAvailableLogTypes();
     }
+
+    @Test
+    public void skipCollectionIfNull() {
+        Mockito.when(logsMock.get("data")).thenReturn(null);
+        storage.collect(logsMock);
+        Assert.assertTrue(storage.query(item -> true).isEmpty());
+    }
 }