Fix CoverageService: only analyze classes present in exec data to avoid duplicate class errors

Author: jcompagner

plugins/com.github.gradusnikov.eclipse.plugin.assistai.main/src/com/github/gradusnikov/eclipse/assistai/mcp/services/CoverageService.java

@@ -6,13 +6,17 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.e4.core.di.annotations.Creatable;
+import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 import org.jacoco.core.analysis.Analyzer;
@@ -188,22 +192,77 @@ private String analyzeCoverage( String execFilePath, String projectName ) throws
             reader.read();
         }
 
+        Set<String> executedClassNames = executionDataStore.getContents().stream()
+            .map( data -> data.getName() )
+            .collect( Collectors.toSet() );
+
+        if ( executedClassNames.isEmpty() )
+        {
+            return "\n--- Coverage ---\nNo execution data found in coverage file.\n";
+        }
+
         CoverageBuilder coverageBuilder = new CoverageBuilder();
         Analyzer analyzer = new Analyzer( executionDataStore, coverageBuilder );
 
+        List<File> outputLocations = new ArrayList<>();
         IProject[] allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
         for ( IProject project : allProjects )
         {
-            if ( !project.isOpen() || !project.hasNature( JavaCore.NATURE_ID ) )
+            try
+            {
+                if ( !project.isOpen() || !project.hasNature( JavaCore.NATURE_ID ) )
+                {
+                    continue;
+                }
+                IJavaProject javaProject = JavaCore.create( project );
+                Set<File> projectOutputs = new HashSet<>();
+                File defaultOutput = project.getLocation().append(
+                    javaProject.getOutputLocation().removeFirstSegments( 1 ) ).toFile();
+                projectOutputs.add( defaultOutput );
+                for ( IClasspathEntry entry : javaProject.getResolvedClasspath( true ) )
+                {
+                    if ( entry.getEntryKind() == IClasspathEntry.CPE_SOURCE && entry.getOutputLocation() != null )
+                    {
+                        File entryOutput = project.getLocation().append(
+                            entry.getOutputLocation().removeFirstSegments( 1 ) ).toFile();
+                        projectOutputs.add( entryOutput );
+                    }
+                }
+                for ( File output : projectOutputs )
+                {
+                    if ( output.exists() )
+                    {
+                        outputLocations.add( output );
+                    }
+                }
+            }
+            catch ( Exception e )
             {
-                continue;
+                // skip projects that can't be resolved
             }
-            IJavaProject javaProject = JavaCore.create( project );
-            File outputLocation = project.getLocation().append(
-                javaProject.getOutputLocation().removeFirstSegments( 1 ) ).toFile();
-            if ( outputLocation.exists() )
+        }
+
+        for ( String className : executedClassNames )
+        {
+            String classFilePath = className.replace( '/', File.separatorChar ) + ".class";
+            for ( File outputLocation : outputLocations )
             {
-                analyzer.analyzeAll( outputLocation );
+                File classFile = new File( outputLocation, classFilePath );
+                if ( classFile.exists() )
+                {
+                    try ( FileInputStream fis = new FileInputStream( classFile ) )
+                    {
+                        analyzer.analyzeAll( fis, className );
+                    }
+                    catch ( Exception e )
+                    {
+                        if ( logger != null )
+                        {
+                            logger.warn( "Skipping class '" + className + "': " + e.getMessage() );
+                        }
+                    }
+                    break;
+                }
             }
         }
 

tests/com.github.gradusnikov.eclipse.plugin.assistai.main.tests/src/com/github/gradusnikov/eclipse/plugin/assistai/mcp/services/CoverageServiceTest.java

@@ -282,7 +282,7 @@ public void testFindLatestCoverageFile_returnsNullOrPath()
 
     @Test
     @Order( 9 )
-    public void testFormatCoverageInfo_withValidExecFile_andProject_returnsCoverageReport() throws Exception
+    public void testFormatCoverageInfo_withEmptyExecFile_andProject_returnsNoDataMessage() throws Exception
     {
         assumeTrue( coverageService.isCoverageAvailable(),
             "Skipping: EclEmma/JaCoCo not installed" );
@@ -297,8 +297,8 @@ public void testFormatCoverageInfo_withValidExecFile_andProject_returnsCoverageR
         try
         {
             String result = coverageService.formatCoverageInfo( tempExec.toString(), TEST_PROJECT_NAME );
-            assertTrue( result.contains( "--- Coverage Report ---" ) );
-            assertTrue( result.contains( "All classes fully covered." ) || result.contains( "Classes with incomplete coverage:" ) );
+            assertTrue( result.contains( "--- Coverage ---" ) );
+            assertTrue( result.contains( "No execution data found" ) );
         }
         finally
         {