From e77cd453b76ab2b1beddb9eae728ca440b643e01 Mon Sep 17 00:00:00 2001 From: nrainer Date: Sun, 2 Sep 2018 12:10:04 +0200 Subject: [PATCH] #19 Fix selection of tests --- src/main/java/eu/stamp_project/PmpContext.java | 13 +++++++++++-- src/main/java/org/pitest/maven/PmpMojo.java | 8 ++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/stamp_project/PmpContext.java b/src/main/java/eu/stamp_project/PmpContext.java index fd6e96d..aeff3fa 100644 --- a/src/main/java/eu/stamp_project/PmpContext.java +++ b/src/main/java/eu/stamp_project/PmpContext.java @@ -113,12 +113,21 @@ public static Boolean oneFileExists(List fileNameList) // ********************************************************************** public static ArrayList getClasses(MavenProject theProject) + { + return getClassesInternal(theProject.getBuild().getOutputDirectory()); + } + + public static ArrayList getTestClasses(MavenProject theProject) + { + return getClassesInternal(theProject.getBuild().getTestOutputDirectory()); + } + + private static ArrayList getClassesInternal(String buildOutputDirectory) { ArrayList classList = new ArrayList(); ArrayList classFilterList = new ArrayList(); - String outputDirName = theProject.getBuild().getOutputDirectory(); String aFilter; - File outputDir = new File(outputDirName); + File outputDir = new File(buildOutputDirectory); if (outputDir.exists()) { diff --git a/src/main/java/org/pitest/maven/PmpMojo.java b/src/main/java/org/pitest/maven/PmpMojo.java index b6f9451..4c155a3 100644 --- a/src/main/java/org/pitest/maven/PmpMojo.java +++ b/src/main/java/org/pitest/maven/PmpMojo.java @@ -183,6 +183,13 @@ public void updateTargetClasses() } } } + + public void updateTargetTests() { + if (targetTests == null || targetTests.isEmpty()) { + targetTests = new ArrayList<>(); + targetTests.addAll(PmpContext.getTestClasses(getProject())); + } + } // ********************************************************************** // protected @@ -219,6 +226,7 @@ protected RunDecision shouldRun() PmpContext.getInstance().setCurrentProject(myPmpProject); updateTargetClasses(); + updateTargetTests(); if (getProject().getPackaging().equals("pom") && myPmpProject.hasTestCompileSourceRoots() &&