Take only class files with in the report (#12)

* take only class files

* Test case fails: good!

* Only process our compiled class files. Nothing else.

* Fix tests again

---------

Co-authored-by: Steven Van Ingelgem <[email protected]>

Author: svaningelgem

.github/workflows/build.yml

@@ -33,7 +33,7 @@ jobs:
           cache: 'maven'
 
       - name: Build and test
-        run: mvn -B verify
+        run: mvn --ntp -B verify
 
       - name: Upload test results
         if: always()

.github/workflows/release.yml

@@ -41,12 +41,12 @@ jobs:
       - name: Building
         run: |
           set -o pipefail
-          mvn -B clean install | awk '/svaningelgem/ || !/Downloading|Downloaded|Progress/'
+          mvn --ntp -B clean install | awk '/svaningelgem/ || !/Downloading|Downloaded|Progress/'
 
       - name: Flatten pom.xml file
         run: |
           set -o pipefail
-          mvn -B flatten:flatten | awk '/svaningelgem/ || !/Downloading|Downloaded|Progress/'
+          mvn --ntp -B flatten:flatten | awk '/svaningelgem/ || !/Downloading|Downloaded|Progress/'
 
       - name: Deploying to Central
         run: |

jacoco-console-reporter/src/main/java/io/github/svaningelgem/DirectoryNode.java

@@ -4,7 +4,10 @@
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 import java.util.stream.Collectors;
 
 /**

jacoco-console-reporter/src/main/java/io/github/svaningelgem/JacocoConsoleReporterMojo.java

@@ -1,7 +1,5 @@
 package io.github.svaningelgem;
 
-import lombok.Data;
-import lombok.RequiredArgsConstructor;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -11,13 +9,16 @@
 import org.jacoco.core.data.ExecutionDataReader;
 import org.jacoco.core.data.ExecutionDataStore;
 import org.jacoco.core.data.SessionInfoStore;
-import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.*;
 
 /**
@@ -129,6 +130,7 @@ public void execute() throws MojoExecutionException {
         additionalExecFiles.stream().map(File::getAbsoluteFile).forEach(collectedExecFilePaths::add);
         collectedExecFilePaths.add(jacocoExecFile.getAbsoluteFile());
         collectedClassesPaths.add(classesDirectory.getAbsoluteFile());
+        getLog().info("Collected Classes: " + collectedClassesPaths);
         if (jacocoExecFile.exists()) {
             getLog().debug("Added exec file from current module: " + jacocoExecFile.getAbsolutePath());
         }
@@ -144,6 +146,10 @@ public void execute() throws MojoExecutionException {
             return;
         }
 
+        generateReport();
+    }
+
+    private void generateReport() throws MojoExecutionException {
         try {
             getLog().debug("Loading execution data");
             ExecutionDataStore executionDataStore = loadExecutionData();
@@ -260,19 +266,16 @@ private void scanDirectoryForExecFiles(@NotNull File dir, List<String> execPatte
      * @return Populated execution data store with coverage information
      * @throws IOException if there are issues reading the JaCoCo execution files
      */
-    private @Nullable ExecutionDataStore loadExecutionData() throws IOException {
-        collectedExecFilePaths.removeIf(Objects::isNull);
-        collectedExecFilePaths.removeIf(f -> !f.exists());
-        if (collectedExecFilePaths.isEmpty()) {
-            getLog().warn("No coverage data found in this project; ensure JaCoCo plugin ran with tests.");
-            return null;
-        }
-
+    private @NotNull ExecutionDataStore loadExecutionData() throws IOException {
         ExecutionDataStore executionDataStore = new ExecutionDataStore();
         SessionInfoStore sessionInfoStore = new SessionInfoStore();
 
         // Load all exec files
         for (File execFile : collectedExecFilePaths) {
+            if (execFile == null || !execFile.exists()) {
+                continue;
+            }
+
             loadExecFile(execFile, executionDataStore, sessionInfoStore);
             getLog().debug("Processed exec file: " + execFile);
         }
@@ -301,16 +304,30 @@ private void loadExecFile(File execFile, ExecutionDataStore executionDataStore,
      * @return A bundle containing all coverage information
      * @throws IOException if there are issues reading the class files
      */
-    private @Nullable IBundleCoverage analyzeCoverage(ExecutionDataStore executionDataStore) throws IOException {
-        if (executionDataStore == null) return null;
-
+    private @NotNull IBundleCoverage analyzeCoverage(@NotNull ExecutionDataStore executionDataStore) throws IOException {
         CoverageBuilder coverageBuilder = new CoverageBuilder();
         Analyzer analyzer = new Analyzer(executionDataStore, coverageBuilder);
         for (File classPath : collectedClassesPaths) {
-            if (classPath != null && classPath.exists()) {
-                analyzer.analyzeAll(classPath);
+            if (classPath == null || !classPath.exists()) {
+                continue;
             }
+            getLog().debug("Analyzing class files in: " + classPath.getAbsolutePath());
+            Files.walkFileTree(classPath.toPath(), new SimpleFileVisitor<Path>() {
+                @Override
+                public @NotNull FileVisitResult visitFile(Path file, @NotNull BasicFileAttributes attrs) {
+                    String filePath = file.toString().toLowerCase(Locale.ENGLISH);
+                    if (filePath.endsWith(".class")) {
+                        try (FileInputStream in = new FileInputStream(file.toFile())) {
+                            analyzer.analyzeClass(in, file.toString());
+                        } catch (Exception e) {
+                            getLog().debug("Error analyzing class file: " + file + ": " + e.getMessage());
+                        }
+                    }
+                    return FileVisitResult.CONTINUE;
+                }
+            });
         }
+
         return coverageBuilder.getBundle("Project");
     }
 
@@ -320,13 +337,13 @@ private void loadExecFile(File execFile, ExecutionDataStore executionDataStore,
      *
      * @param root The root node of the directory tree containing coverage information
      */
-    private void printCoverageReport(@Nullable DirectoryNode root) {
+    private void printCoverageReport(@NotNull DirectoryNode root) {
         printTree(root);
         printSummary(root);
     }
 
-    private void printSummary(@Nullable DirectoryNode root) {
-        if (!showSummary || root == null) return;
+    private void printSummary(@NotNull DirectoryNode root) {
+        if (!showSummary) return;
 
         CoverageMetrics total = root.getMetrics();
 
@@ -359,8 +376,8 @@ private void printSummary(@Nullable DirectoryNode root) {
 
     }
 
-    private void printTree(@Nullable DirectoryNode root) {
-        if (!showTree || root == null) return;
+    private void printTree(@NotNull DirectoryNode root) {
+        if (!showTree) return;
 
         // Print header
         getLog().info("Overall Coverage Summary");
@@ -388,9 +405,7 @@ private void printTree(@Nullable DirectoryNode root) {
      * @param bundle The bundle containing coverage data for all analyzed classes
      * @return The root node of the directory tree containing coverage information
      */
-    private @Nullable DirectoryNode buildDirectoryTree(@Nullable IBundleCoverage bundle) {
-        if (bundle == null) return null;
-
+    private @NotNull DirectoryNode buildDirectoryTree(@NotNull IBundleCoverage bundle) {
         DirectoryNode root = new DirectoryNode("");
         for (IPackageCoverage packageCoverage : bundle.getPackages()) {
             String packageName = packageCoverage.getName().replace('.', '/');

jacoco-console-reporter/src/main/java/io/github/svaningelgem/SourceFileNode.java

@@ -2,7 +2,6 @@
 
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * A node representing a source file in the coverage tree.

jacoco-console-reporter/src/test/java/io/github/svaningelgem/BaseTestClass.java

@@ -1,7 +1,17 @@
 package io.github.svaningelgem;
 
 import lombok.var;
+import org.apache.maven.execution.DefaultMavenExecutionRequest;
+import org.apache.maven.execution.DefaultMavenExecutionResult;
+import org.apache.maven.execution.MavenExecutionRequest;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Plugin;
 import org.apache.maven.plugin.testing.MojoRule;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -11,12 +21,17 @@
 import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Random;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 public class BaseTestClass {
     protected final static Random RANDOM = new Random();
@@ -30,7 +45,9 @@ public class BaseTestClass {
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
-    protected final File testProjectDir = new File("../test-project");
+    protected final File mainProjectDir = new File(".").getAbsoluteFile();
+    protected final File mainProjectClasses = new File(mainProjectDir, "target/classes");
+    protected final File testProjectDir = new File("../test-project").getAbsoluteFile();
     protected final File testProjectJacocoExec = new File(testProjectDir, "target/jacoco.exec");
     protected final File testProjectClasses = new File(testProjectDir, "target/classes");
     protected final File pom = new File(getBasedir(), "src/test/resources/unit/pom.xml");
@@ -48,6 +65,29 @@ public void setUp() throws Exception {
         fileCounter = 0;
 
         mojo = (JacocoConsoleReporterMojo) rule.lookupConfiguredMojo(pom.getParentFile(), "report");
+        // Setting the defaults
+        mojo.deferReporting = true;
+        mojo.showFiles = false;
+        mojo.showTree = true;
+        mojo.showSummary = true;
+        mojo.scanModules = false;
+        mojo.weightClassCoverage = 0.1;
+        mojo.weightMethodCoverage = 0.1;
+        mojo.weightBranchCoverage = 0.4;
+        mojo.weightLineCoverage = 0.4;
+
+        // Create a real project with JaCoCo plugin
+        MavenProject project = createProjectWithJacocoPlugin(null);
+        mojo.project = project;
+
+        // Create a real MavenSession with this as the only project
+        List<MavenProject> projects = new ArrayList<>();
+        projects.add(project);
+        mojo.mavenSession = createRealMavenSession(projects);
+
+        // Configure mojo
+        mojo.baseDir = temporaryFolder.getRoot();
+
         log = new MyLog();
         mojo.setLog(log);
     }
@@ -171,4 +211,86 @@ protected void addFiles(DirectoryNode toNode, @Nullable CoverageMetrics defaultC
             toNode.getSourceFiles().add(file);
         }
     }
+
+    /**
+     * Helper method to copy a directory
+     */
+    protected void copyDirectory(@NotNull File sourceDir, File destDir) throws IOException {
+        if (!sourceDir.exists() || !sourceDir.isDirectory()) {
+            return;
+        }
+
+        if (!destDir.exists()) {
+            destDir.mkdirs();
+        }
+
+        File[] files = sourceDir.listFiles();
+        if (files == null) return;
+
+        for (File file : files) {
+            File destFile = new File(destDir, file.getName());
+            if (file.isDirectory()) {
+                copyDirectory(file, destFile);
+            } else {
+                Files.copy(file.toPath(), destFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            }
+        }
+    }
+
+    /**
+     * Helper method to copy a resource from the classpath to a file
+     */
+    protected void copyResourceToFile(String resourcePath, File destFile) throws IOException {
+        try (InputStream is = getClass().getResourceAsStream(resourcePath)) {
+            if (is == null) {
+                throw new IOException("Resource not found: " + resourcePath);
+            }
+            Files.copy(is, destFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        }
+    }
+
+    /**
+     * Creates a real MavenProject with JaCoCo plugin configuration
+     */
+    @Contract("_ -> new")
+    protected @NotNull MavenProject createProjectWithJacocoPlugin(String destFile) {
+        Model model = new Model();
+        model.setGroupId("test.group");
+        model.setArtifactId("test-artifact");
+        model.setVersion("1.0.0");
+
+        Build build = new Build();
+        model.setBuild(build);
+
+        Plugin plugin = new Plugin();
+        plugin.setGroupId("org.jacoco");
+        plugin.setArtifactId("jacoco-maven-plugin");
+        plugin.setVersion("0.8.12");
+
+        if (destFile != null) {
+            Xpp3Dom configuration = new Xpp3Dom("configuration");
+            Xpp3Dom destFileNode = new Xpp3Dom("destFile");
+            destFileNode.setValue(destFile);
+            configuration.addChild(destFileNode);
+            plugin.setConfiguration(configuration);
+        }
+
+        build.addPlugin(plugin);
+
+        return new MavenProject(model);
+    }
+
+    /**
+     * Creates a real MavenSession with multiple projects
+     */
+    protected @NotNull MavenSession createRealMavenSession(List<MavenProject> projects) {
+        PlexusContainer container = rule.getContainer();
+        MavenExecutionRequest request = new DefaultMavenExecutionRequest();
+        return new MavenSession(
+                container,
+                request,
+                new DefaultMavenExecutionResult(),
+                projects
+        );
+    }
 }

jacoco-console-reporter/src/test/java/io/github/svaningelgem/FileSystemNodeTest.java

@@ -1,7 +1,9 @@
 package io.github.svaningelgem;
 
 import org.junit.Test;
-import static org.junit.Assert.*;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class FileSystemNodeTest {