From 9037a2a349d2f154e963c1ed887d88da2c82351a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Tue, 29 Nov 2022 14:53:19 +0000 Subject: [PATCH] fix(deps): update dependency org.apache.maven.surefire:maven-surefire-common to v3.0.0-m7 (#213) --- pom.xml | 2 +- .../fr/spoonlabs/flacoco/core/coverage/CoverageMatrix.java | 4 ++-- .../core/coverage/framework/TestFrameworkStrategy.java | 4 ++-- .../classloader/finder/classes/impl/SourceFolderFinder.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 8359c0ec..3243dad4 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ org.apache.maven.surefire maven-surefire-common - 3.0.0-M5 + 3.0.0-M7 diff --git a/src/main/java/fr/spoonlabs/flacoco/core/coverage/CoverageMatrix.java b/src/main/java/fr/spoonlabs/flacoco/core/coverage/CoverageMatrix.java index fd1f4ddc..5201c19f 100644 --- a/src/main/java/fr/spoonlabs/flacoco/core/coverage/CoverageMatrix.java +++ b/src/main/java/fr/spoonlabs/flacoco/core/coverage/CoverageMatrix.java @@ -196,13 +196,13 @@ private boolean classToInclude(String className) { // True if it is present in the available binaries for (String dir : config.getBinJavaDir()) { - DirectoryScanner directoryScanner = new DirectoryScanner(new File(dir), TestListResolver.getWildcard()); + DirectoryScanner directoryScanner = new DirectoryScanner(new File(dir), new TestListResolver("*.class")); if (directoryScanner.scan().getClasses().contains(className)) { return true; } } for (String dir : config.getBinTestDir()) { - DirectoryScanner directoryScanner = new DirectoryScanner(new File(dir), TestListResolver.getWildcard()); + DirectoryScanner directoryScanner = new DirectoryScanner(new File(dir), new TestListResolver("*.class")); if (directoryScanner.scan().getClasses().contains(className)) { return true; } diff --git a/src/main/java/fr/spoonlabs/flacoco/core/coverage/framework/TestFrameworkStrategy.java b/src/main/java/fr/spoonlabs/flacoco/core/coverage/framework/TestFrameworkStrategy.java index 7fdd30c7..2219478e 100644 --- a/src/main/java/fr/spoonlabs/flacoco/core/coverage/framework/TestFrameworkStrategy.java +++ b/src/main/java/fr/spoonlabs/flacoco/core/coverage/framework/TestFrameworkStrategy.java @@ -89,12 +89,12 @@ protected String computeClasspath() { protected String computeJacocoIncludes() { StringBuilder includes = new StringBuilder(); for (String directory : config.getBinJavaDir()) { - DirectoryScanner directoryScanner = new DirectoryScanner(new File(directory), TestListResolver.getWildcard()); + DirectoryScanner directoryScanner = new DirectoryScanner(new File(directory), new TestListResolver("*.class")); includes.append(":").append(directoryScanner.scan().getClasses().stream().reduce((x, y) -> x + ":" + y).orElse("")); } if (config.isCoverTests()) { for (String directory : config.getBinTestDir()) { - DirectoryScanner directoryScanner = new DirectoryScanner(new File(directory), TestListResolver.getWildcard()); + DirectoryScanner directoryScanner = new DirectoryScanner(new File(directory), new TestListResolver("*.class")); includes.append(":").append(directoryScanner.scan().getClasses().stream().reduce((x, y) -> x + ":" + y).orElse("")); } } diff --git a/src/main/java/fr/spoonlabs/flacoco/core/test/strategies/classloader/finder/classes/impl/SourceFolderFinder.java b/src/main/java/fr/spoonlabs/flacoco/core/test/strategies/classloader/finder/classes/impl/SourceFolderFinder.java index 72985228..a4794752 100644 --- a/src/main/java/fr/spoonlabs/flacoco/core/test/strategies/classloader/finder/classes/impl/SourceFolderFinder.java +++ b/src/main/java/fr/spoonlabs/flacoco/core/test/strategies/classloader/finder/classes/impl/SourceFolderFinder.java @@ -22,7 +22,7 @@ public String[] getClasses() { } static List getClassesLoc(File testSrcFolder) { - DirectoryScanner directoryScanner = new DirectoryScanner(testSrcFolder, TestListResolver.getWildcard()); + DirectoryScanner directoryScanner = new DirectoryScanner(testSrcFolder, new TestListResolver("*.class")); return directoryScanner.scan().getClasses(); } }