Fix CapturedLogRecord returning null when sourceFile was null

Author: abelsromero

asciidoctor-maven-commons/src/main/java/org/asciidoctor/maven/log/CapturedLogRecord.java

@@ -1,7 +1,6 @@
 package org.asciidoctor.maven.log;
 
 import java.io.File;
-import java.util.Optional;
 
 import org.asciidoctor.ast.Cursor;
 import org.asciidoctor.log.LogRecord;
@@ -24,11 +23,13 @@ final class CapturedLogRecord extends LogRecord {
     }
 
     public Cursor getCursor() {
-        if (sourceFile == null)
-            return null;
-
-        return Optional.ofNullable(super.getCursor())
-            .orElse(new FileCursor(sourceFile));
+        if (super.getCursor() != null) {
+            return super.getCursor();
+        }
+        if (sourceFile != null) {
+            return new FileCursor(sourceFile);
+        }
+        return null;
     }
 
     public File getSourceFile() {

asciidoctor-maven-commons/src/test/java/org/asciidoctor/maven/log/CapturedLogRecordTest.java

@@ -0,0 +1,60 @@
+package org.asciidoctor.maven.log;
+
+import java.io.File;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.asciidoctor.ast.Cursor;
+import org.asciidoctor.log.LogRecord;
+import org.asciidoctor.log.Severity;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+class CapturedLogRecordTest {
+
+    @Nested
+    class WhenLogRecordsContainsCursor {
+
+        @Test
+        void shouldReturnCursorFile() {
+            final var cursorFile = new File("uno", "dos");
+            final var recordFile = new File("tres", "quatre");
+            final var cursor = new TestCursor(cursorFile.getAbsolutePath(), 0, null, null);
+
+            final var logRecord = new CapturedLogRecord(getLogRecord(cursor), recordFile);
+            final var capturedLogRecord = new CapturedLogRecord(logRecord, cursorFile);
+
+            assertThat(capturedLogRecord.getCursor().getFile()).isEqualTo(cursorFile.getAbsolutePath());
+        }
+
+    }
+
+    @Nested
+    class WhenLogRecordsDoesNotContainsCursor {
+
+        @Test
+        void shouldReturnLogRecordFileWhenCursorFileIsSet() {
+            final var cursorFile = new File("uno", "dos");
+            final var recordFile = new File("tres", "quatre");
+
+            final var logRecord = new CapturedLogRecord(getLogRecord(null), recordFile);
+            final var capturedLogRecord = new CapturedLogRecord(logRecord, cursorFile);
+
+            assertThat(capturedLogRecord.getCursor().getFile()).isEqualTo(recordFile.getAbsolutePath());
+        }
+
+        @Test
+        void shouldReturnNullWhenCursorFileIsNoSet() {
+            final var logRecord = new CapturedLogRecord(getLogRecord(null), null);
+            final var capturedLogRecord = new CapturedLogRecord(logRecord, null);
+
+            assertThat(capturedLogRecord.getCursor()).isNull();
+        }
+
+    }
+
+    private LogRecord getLogRecord(Cursor cursor) {
+        return new LogRecord(Severity.INFO, cursor, "a message");
+    }
+
+}

asciidoctor-maven-commons/src/test/java/org/asciidoctor/maven/log/LogRecordFormatterTest.java

@@ -3,15 +3,15 @@
 import java.io.File;
 import java.io.IOException;
 
+import static java.lang.String.format;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import org.asciidoctor.ast.Cursor;
 import org.asciidoctor.log.LogRecord;
 import org.asciidoctor.log.Severity;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-import static java.lang.String.format;
-import static org.assertj.core.api.Assertions.assertThat;
-
 class LogRecordFormatterTest {
 
     private static final String PROJECT_NAME = "asciidoctor-maven-commons";
@@ -117,38 +117,4 @@ private String normalizePath(String formattedLogRecord) {
         return formattedLogRecord.replaceAll("\\\\", "/");
     }
 
-    class TestCursor implements Cursor {
-
-        private final int lineNumber;
-        private final String file;
-        private final String path;
-        private final String dir;
-
-        TestCursor(String file, int lineNumber, String path, String dir) {
-            this.file = file;
-            this.lineNumber = lineNumber;
-            this.path = path;
-            this.dir = dir;
-        }
-
-        @Override
-        public int getLineNumber() {
-            return lineNumber;
-        }
-
-        @Override
-        public String getPath() {
-            return path;
-        }
-
-        @Override
-        public String getDir() {
-            return dir;
-        }
-
-        @Override
-        public String getFile() {
-            return file;
-        }
-    }
 }

asciidoctor-maven-commons/src/test/java/org/asciidoctor/maven/log/TestCursor.java

@@ -0,0 +1,38 @@
+package org.asciidoctor.maven.log;
+
+import org.asciidoctor.ast.Cursor;
+
+class TestCursor implements Cursor {
+
+    private final int lineNumber;
+    private final String file;
+    private final String path;
+    private final String dir;
+
+    TestCursor(String file, int lineNumber, String path, String dir) {
+        this.file = file;
+        this.lineNumber = lineNumber;
+        this.path = path;
+        this.dir = dir;
+    }
+
+    @Override
+    public int getLineNumber() {
+        return lineNumber;
+    }
+
+    @Override
+    public String getPath() {
+        return path;
+    }
+
+    @Override
+    public String getDir() {
+        return dir;
+    }
+
+    @Override
+    public String getFile() {
+        return file;
+    }
+}