Merge pull request #29006 from ballerina-platform/revert-28956-cov-fi…

…lter-fix

Revert "Separate filtering for testerina coverage and codecov coverage"

misc/testerina/modules/testerina-runtime/src/main/java/org/ballerinalang/test/runtime/entity/CoverageReport.java

@@ -110,29 +110,8 @@ public void generateReport(JarResolver jarResolver, Map<String, ModuleCoverage>
         }
 
         if (!filteredPathList.isEmpty()) {
-            addCompiledSources(filteredPathList, orgName, packageName, version);
-            execFileLoader.load(executionDataFile.toFile());
-            final CoverageBuilder coverageBuilder = analyzeStructure();
-            // Create testerina coverage report
-            createReport(coverageBuilder.getBundle(title), moduleCoverageMap);
-            // Add additional dependency jars for Coverage XML
-            addCompiledSources(getDependencyJarList(jBallerinaBackend), orgName, packageName, version);
-            execFileLoader.load(executionDataFile.toFile());
-            final CoverageBuilder xmlCoverageBuilder = analyzeStructure();
-            // Create XML coverage report for Codecov
-            createXMLReport(getPartialCoverageModifiedBundle(xmlCoverageBuilder));
-            CodeCoverageUtils.deleteDirectory(coverageDir.resolve(BIN_DIR).toFile());
-        } else {
-            String msg = "Unable to generate code coverage for the module " + packageName + ". Jar files dont exist.";
-            throw new NoSuchFileException(msg);
-        }
-    }
-
-    private void addCompiledSources(List<Path> pathList, String orgName, String packageName, String version) throws
-            IOException {
-        if (!pathList.isEmpty()) {
             // For each jar file found, we unzip it for this particular module
-            for (Path jarPath : pathList) {
+            for (Path jarPath : filteredPathList) {
                 try {
                     // Creates coverage folder with each class per module
                     CodeCoverageUtils.unzipCompiledSource(jarPath, coverageDir, orgName, packageName, version);
@@ -143,6 +122,15 @@ private void addCompiledSources(List<Path> pathList, String orgName, String pack
                     return;
                 }
             }
+
+            execFileLoader.load(executionDataFile.toFile());
+            final CoverageBuilder coverageBuilder = analyzeStructure();
+            createReport(coverageBuilder.getBundle(title), moduleCoverageMap);
+            createXMLReport(getPartialCoverageModifiedBundle(coverageBuilder));
+            CodeCoverageUtils.deleteDirectory(coverageDir.resolve(BIN_DIR).toFile());
+        } else {
+            String msg = "Unable to generate code coverage for the module " + packageName + ". Jar files dont exist.";
+            throw new NoSuchFileException(msg);
         }
     }
 
@@ -313,14 +301,6 @@ private Document getDocumentFromModule(Module moduleInstance, String sourceFileN
 
     private List<Path> getExclusionJarList(JBallerinaBackend jBallerinaBackend) {
         List<Path> exclusionPathList = new ArrayList<>();
-        exclusionPathList.addAll(getDependencyJarList(jBallerinaBackend));
-        exclusionPathList.add(jBallerinaBackend.runtimeLibrary().path());
-        exclusionPathList.addAll(ProjectUtils.testDependencies());
-        return exclusionPathList;
-    }
-
-    private List<Path> getDependencyJarList(JBallerinaBackend jBallerinaBackend) {
-        List<Path> dependencyPathList = new ArrayList<>();
         module.packageInstance().getResolution().allDependencies()
                 .stream()
                 .map(ResolvedPackageDependency::packageInstance)
@@ -329,15 +309,17 @@ private List<Path> getDependencyJarList(JBallerinaBackend jBallerinaBackend) {
                         Module dependencyModule = pkg.module(dependencyModuleId);
                         PlatformLibrary generatedJarLibrary = jBallerinaBackend.codeGeneratedLibrary(
                                 pkg.packageId(), dependencyModule.moduleName());
-                        dependencyPathList.add(generatedJarLibrary.path());
+                        exclusionPathList.add(generatedJarLibrary.path());
                     }
                     Collection<PlatformLibrary> otherJarDependencies = jBallerinaBackend.platformLibraryDependencies(
                             pkg.packageId(), PlatformLibraryScope.DEFAULT);
                     for (PlatformLibrary otherJarDependency : otherJarDependencies) {
-                        dependencyPathList.add(otherJarDependency.path());
+                        exclusionPathList.add(otherJarDependency.path());
                     }
                 });
-        return dependencyPathList;
+        exclusionPathList.add(jBallerinaBackend.runtimeLibrary().path());
+        exclusionPathList.addAll(ProjectUtils.testDependencies());
+        return exclusionPathList;
     }
 
     private Collection<ISourceFileCoverage> modifySourceFiles(Collection<ISourceFileCoverage> sourcefiles) {