From 3fd8cda9ec920bf38b9c3fe486764a32eed971a2 Mon Sep 17 00:00:00 2001
From: Henry Coles <henry.colesgroupcmg.com>
Date: Thu, 3 Mar 2022 14:55:32 +0000
Subject: [PATCH] remove defunct testPlugin parameter
---
.../main/java/org/pitest/ant/PitestTask.java | 4 ----
.../java/org/pitest/ant/PitestTaskTest.java | 9 +-------
.../commandline/OptionsParser.java | 8 -------
.../mutationtest/config/ConfigOption.java | 5 -----
.../org/pitest/maven/AbstractPitMojo.java | 9 +-------
.../MojoToReportOptionsConverterTest.java | 6 +-----
.../org/pitest/maven/RunDecisionTest.java | 8 +++----
.../main/java/org/pitest/functional/F6.java | 21 -------------------
8 files changed, 7 insertions(+), 63 deletions(-)
delete mode 100644 pitest/src/main/java/org/pitest/functional/F6.java
diff --git a/pitest-ant/src/main/java/org/pitest/ant/PitestTask.java b/pitest-ant/src/main/java/org/pitest/ant/PitestTask.java
index 134cad311..799dec5f8 100644
--- a/pitest-ant/src/main/java/org/pitest/ant/PitestTask.java
+++ b/pitest-ant/src/main/java/org/pitest/ant/PitestTask.java
@@ -208,10 +208,6 @@ public void setMutableCodePaths(final String glob) {
setOption(ConfigOption.CODE_PATHS, glob);
}
- public void setTestPlugin(final String value) {
- this.setOption(ConfigOption.TEST_PLUGIN, value);
- }
-
public void setIncludedGroups(final String value) {
this.setOption(ConfigOption.INCLUDED_GROUPS, value);
}
diff --git a/pitest-ant/src/test/java/org/pitest/ant/PitestTaskTest.java b/pitest-ant/src/test/java/org/pitest/ant/PitestTaskTest.java
index 2b3619731..e62115253 100644
--- a/pitest-ant/src/test/java/org/pitest/ant/PitestTaskTest.java
+++ b/pitest-ant/src/test/java/org/pitest/ant/PitestTaskTest.java
@@ -252,14 +252,7 @@ public void shouldPassMutableCodePathsToJavaTask() {
this.pitestTask.execute(this.java);
verify(this.arg).setValue("--mutableCodePaths=foo");
}
-
- @Test
- public void shouldPassTestPluginToJavaTask() {
- this.pitestTask.setTestPlugin("junit");
- this.pitestTask.execute(this.java);
- verify(this.arg).setValue("--testPlugin=junit");
- }
-
+
@Test
public void shouldOnlyPassTheSpecifiedOptions() throws Exception {
this.pitestTask.setVerbose("true");
diff --git a/pitest-command-line/src/main/java/org/pitest/mutationtest/commandline/OptionsParser.java b/pitest-command-line/src/main/java/org/pitest/mutationtest/commandline/OptionsParser.java
index 83937f77f..8e73af7af 100644
--- a/pitest-command-line/src/main/java/org/pitest/mutationtest/commandline/OptionsParser.java
+++ b/pitest-command-line/src/main/java/org/pitest/mutationtest/commandline/OptionsParser.java
@@ -76,7 +76,6 @@
import static org.pitest.mutationtest.config.ConfigOption.SOURCE_DIR;
import static org.pitest.mutationtest.config.ConfigOption.TARGET_CLASSES;
import static org.pitest.mutationtest.config.ConfigOption.TEST_FILTER;
-import static org.pitest.mutationtest.config.ConfigOption.TEST_PLUGIN;
import static org.pitest.mutationtest.config.ConfigOption.TEST_STRENGTH_THRESHOLD;
import static org.pitest.mutationtest.config.ConfigOption.THREADS;
import static org.pitest.mutationtest.config.ConfigOption.TIMEOUT_CONST;
@@ -134,7 +133,6 @@ public class OptionsParser {
private final ArgumentAcceptingOptionSpec<Boolean> exportLineCoverageSpec;
private final OptionSpec<String> javaExecutable;
private final OptionSpec<KeyValuePair> pluginPropertiesSpec;
- private final OptionSpec<String> testPluginSpec;
private final ArgumentAcceptingOptionSpec<Boolean> includeLaunchClasspathSpec;
private final ArgumentAcceptingOptionSpec<Boolean> useClasspathJarSpec;
@@ -145,12 +143,6 @@ public OptionsParser(Predicate<String> dependencyFilter) {
this.parser = new OptionParser();
this.parser.acceptsAll(Arrays.asList("h", "?"), "show help");
- this.testPluginSpec = parserAccepts(TEST_PLUGIN)
- .withRequiredArg()
- .ofType(String.class)
- .defaultsTo("junit")
- .describedAs("this parameter is ignored and will be removed in a future release");
-
this.reportDirSpec = parserAccepts(REPORT_DIR).withRequiredArg()
.describedAs("directory to create report folder in").required();
diff --git a/pitest-entry/src/main/java/org/pitest/mutationtest/config/ConfigOption.java b/pitest-entry/src/main/java/org/pitest/mutationtest/config/ConfigOption.java
index 337d0f97a..b81d9b599 100644
--- a/pitest-entry/src/main/java/org/pitest/mutationtest/config/ConfigOption.java
+++ b/pitest-entry/src/main/java/org/pitest/mutationtest/config/ConfigOption.java
@@ -20,11 +20,6 @@
public enum ConfigOption {
- /**
- * The test plugin to use
- */
- TEST_PLUGIN("testPlugin"),
-
/**
* The directory to write report sot
*/
diff --git a/pitest-maven/src/main/java/org/pitest/maven/AbstractPitMojo.java b/pitest-maven/src/main/java/org/pitest/maven/AbstractPitMojo.java
index 4224e8b36..cb4f862a9 100644
--- a/pitest-maven/src/main/java/org/pitest/maven/AbstractPitMojo.java
+++ b/pitest-maven/src/main/java/org/pitest/maven/AbstractPitMojo.java
@@ -37,14 +37,7 @@ public class AbstractPitMojo extends AbstractMojo {
private final PluginServices plugins;
// Concrete List types declared for all fields to work around maven 2 bug
-
- /**
- * Test plugin to use
- */
- // No longer used, retained here temporarily for backwards compatibility in buildscripts
- @Parameter(property = "testPlugin", defaultValue = "")
- private String testPlugin;
-
+
/**
* Classes to include in mutation test
*/
diff --git a/pitest-maven/src/test/java/org/pitest/maven/MojoToReportOptionsConverterTest.java b/pitest-maven/src/test/java/org/pitest/maven/MojoToReportOptionsConverterTest.java
index 32c308dc0..9354bffad 100644
--- a/pitest-maven/src/test/java/org/pitest/maven/MojoToReportOptionsConverterTest.java
+++ b/pitest-maven/src/test/java/org/pitest/maven/MojoToReportOptionsConverterTest.java
@@ -405,11 +405,7 @@ public void testParsesCustomProperties() {
assertEquals("foo", actual.getFreeFormProperties().get("foo"));
assertEquals("bar", actual.getFreeFormProperties().get("bar"));
}
-
- public void testDoesNotErrorIfDefunctTestPluginArgumentSupplied() {
- parseConfig("<testPlugin>testng</testPlugin>");
- }
-
+
public void testDoesNotUseClasspathJarByDefault() {
final ReportOptions actual = parseConfig("");
assertFalse(actual.useClasspathJar());
diff --git a/pitest-maven/src/test/java/org/pitest/maven/RunDecisionTest.java b/pitest-maven/src/test/java/org/pitest/maven/RunDecisionTest.java
index af5470d8c..618f5e228 100644
--- a/pitest-maven/src/test/java/org/pitest/maven/RunDecisionTest.java
+++ b/pitest-maven/src/test/java/org/pitest/maven/RunDecisionTest.java
@@ -7,7 +7,7 @@
public class RunDecisionTest {
@Test
- public void shouldRunIfThereAreNoReasonsWhyNot() throws Exception {
+ public void shouldRunIfThereAreNoReasonsWhyNot() {
AbstractPitMojo.RunDecision rd = new AbstractPitMojo.RunDecision();
assertThat(rd.getReasons()).isEmpty();
@@ -15,7 +15,7 @@ public void shouldRunIfThereAreNoReasonsWhyNot() throws Exception {
}
@Test
- public void shouldNotRunIfThereIsAReasonsWhyNot() throws Exception {
+ public void shouldNotRunIfThereIsAReasonsWhyNot() {
AbstractPitMojo.RunDecision rd = new AbstractPitMojo.RunDecision();
rd.addReason("Today is Sunday");
@@ -25,7 +25,7 @@ public void shouldNotRunIfThereIsAReasonsWhyNot() throws Exception {
}
@Test
- public void addReasonAddsReason() throws Exception {
+ public void addReasonAddsReason() {
AbstractPitMojo.RunDecision rd = new AbstractPitMojo.RunDecision();
rd.addReason("Today is Sunday");
@@ -34,7 +34,7 @@ public void addReasonAddsReason() throws Exception {
}
@Test
- public void getReasonsReturnsAllReasons() throws Exception {
+ public void getReasonsReturnsAllReasons() {
AbstractPitMojo.RunDecision rd = new AbstractPitMojo.RunDecision();
rd.addReason("Today is Monday");
diff --git a/pitest/src/main/java/org/pitest/functional/F6.java b/pitest/src/main/java/org/pitest/functional/F6.java
deleted file mode 100644
index a96036880..000000000
--- a/pitest/src/main/java/org/pitest/functional/F6.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2010 Henry Coles
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and limitations under the License.
- */
-package org.pitest.functional;
-
-public interface F6<A, B, C, D, E, FF, G> { // NO_UCD
-
- G apply(A a, B b, C c, D d, E e, FF f);
-
-}