From 1ad19f89dc5b382fb2f168ae705e6bbf2650395b Mon Sep 17 00:00:00 2001 From: Emmanuel Chebbi Date: Fri, 11 Oct 2019 19:07:21 +0200 Subject: [PATCH 1/5] Move target platform for Oxygen Because: - older versions of Eclipse IDE do not support JUnit 5, making hard to test whether Pitclipse supports JUnit 5 test Breaking change: - drop support for Eclipse Mars, Eclipse Neon --- CHANGELOG.md | 2 + .../org.pitest.pitclipse.target.oxygen.target | 64 +++++++++++++++++++ .../org.pitest.pitclipse.target.target | 23 +++++++ .../mutations/ListenerTestFixture.java | 2 +- .../pageobjects/PerspectiveSelector.java | 4 +- .../pageobjects/PitPreferenceSelector.java | 2 +- .../behaviours/pageobjects/WindowsMenu.java | 7 +- 7 files changed, 99 insertions(+), 5 deletions(-) create mode 100644 releng/org.pitest.pitclipse.target/org.pitest.pitclipse.target.oxygen.target diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d5b9e9d..9d2fcae6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +### Removed + - [#113](https://github.com/pitest/pitclipse/pull/113) Support for Eclipse Mars, Eclipse Neon ## [2.0.2] - 2020-02-18 ### Changed diff --git a/releng/org.pitest.pitclipse.target/org.pitest.pitclipse.target.oxygen.target b/releng/org.pitest.pitclipse.target/org.pitest.pitclipse.target.oxygen.target new file mode 100644 index 00000000..614a0e9f --- /dev/null +++ b/releng/org.pitest.pitclipse.target/org.pitest.pitclipse.target.oxygen.target @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/releng/org.pitest.pitclipse.target/org.pitest.pitclipse.target.target b/releng/org.pitest.pitclipse.target/org.pitest.pitclipse.target.target index fa90a828..57b32c65 100644 --- a/releng/org.pitest.pitclipse.target/org.pitest.pitclipse.target.target +++ b/releng/org.pitest.pitclipse.target/org.pitest.pitclipse.target.target @@ -28,5 +28,28 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/org.pitest.pitclipse.runner.tests/src/org/pitest/pitclipse/runner/results/mutations/ListenerTestFixture.java b/tests/org.pitest.pitclipse.runner.tests/src/org/pitest/pitclipse/runner/results/mutations/ListenerTestFixture.java index 8ff8b852..caccc8fe 100644 --- a/tests/org.pitest.pitclipse.runner.tests/src/org/pitest/pitclipse/runner/results/mutations/ListenerTestFixture.java +++ b/tests/org.pitest.pitclipse.runner.tests/src/org/pitest/pitclipse/runner/results/mutations/ListenerTestFixture.java @@ -41,8 +41,8 @@ import java.math.BigInteger; import java.util.List; -import static org.mockito.Matchers.argThat; import static org.mockito.Mockito.verify; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import static org.pitest.pitclipse.runner.TestFactory.TEST_FACTORY; class ListenerTestFixture { diff --git a/tests/org.pitest.pitclipse.ui.tests/src/org/pitest/pitclipse/ui/behaviours/pageobjects/PerspectiveSelector.java b/tests/org.pitest.pitclipse.ui.tests/src/org/pitest/pitclipse/ui/behaviours/pageobjects/PerspectiveSelector.java index 1b0936ee..4552a72d 100644 --- a/tests/org.pitest.pitclipse.ui.tests/src/org/pitest/pitclipse/ui/behaviours/pageobjects/PerspectiveSelector.java +++ b/tests/org.pitest.pitclipse.ui.tests/src/org/pitest/pitclipse/ui/behaviours/pageobjects/PerspectiveSelector.java @@ -30,8 +30,8 @@ public PerspectiveSelector(SWTWorkbenchBot bot) { public void selectPerspective(String perspectiveName) { SWTBotShell shell = bot.shell("Open Perspective"); shell.activate(); - bot.table().select(perspectiveName); - bot.button("OK").click(); + bot.table().getTableItem(perspectiveName).select(); + bot.button("Open").click(); } } diff --git a/tests/org.pitest.pitclipse.ui.tests/src/org/pitest/pitclipse/ui/behaviours/pageobjects/PitPreferenceSelector.java b/tests/org.pitest.pitclipse.ui.tests/src/org/pitest/pitclipse/ui/behaviours/pageobjects/PitPreferenceSelector.java index 3d43b786..61063749 100644 --- a/tests/org.pitest.pitclipse.ui.tests/src/org/pitest/pitclipse/ui/behaviours/pageobjects/PitPreferenceSelector.java +++ b/tests/org.pitest.pitclipse.ui.tests/src/org/pitest/pitclipse/ui/behaviours/pageobjects/PitPreferenceSelector.java @@ -64,7 +64,7 @@ private void selectExecutionMode(PitExecutionMode mode) { @Override public void close() { - bot.button("OK").click(); + bot.button("Apply and Close").click(); } private SWTBotTreeItem expandPitPreferences() { diff --git a/tests/org.pitest.pitclipse.ui.tests/src/org/pitest/pitclipse/ui/behaviours/pageobjects/WindowsMenu.java b/tests/org.pitest.pitclipse.ui.tests/src/org/pitest/pitclipse/ui/behaviours/pageobjects/WindowsMenu.java index f9d60775..5877ed9e 100644 --- a/tests/org.pitest.pitclipse.ui.tests/src/org/pitest/pitclipse/ui/behaviours/pageobjects/WindowsMenu.java +++ b/tests/org.pitest.pitclipse.ui.tests/src/org/pitest/pitclipse/ui/behaviours/pageobjects/WindowsMenu.java @@ -48,7 +48,12 @@ public void openJavaPerspective() { .menu(OPEN_PERSPECTIVES) .menu(OTHER) .click(); - perspectiveSelector.selectPerspective("Java"); + try { + perspectiveSelector.selectPerspective("Java"); + } + catch (Exception e) { + perspectiveSelector.selectPerspective("Java (default)"); + } // for (IPerspectiveDescriptor descriptor : PlatformUI.getWorkbench().getPerspectiveRegistry().getPerspectives()) { // System.out.println(descriptor.getLabel() + " -- " + descriptor.getId()); // } From 5b5de707ad51d6d28b0ac8ace64569f41b727abb Mon Sep 17 00:00:00 2001 From: Emmanuel Chebbi Date: Fri, 11 Oct 2019 19:24:45 +0200 Subject: [PATCH 2/5] Support JUnit 5 tests (fix #73) Details: - wrap the pitest-junit5-plugin Maven plugin as an Eclipse bundle - this plugin allows Pitest to detect JUnit 5 tests; it is dynamically added to Pitest's classpath when JUnit 5 is detected in project's classpath --- CHANGELOG.md | 3 + README.md | 2 - bundles/README.md | 31 ++-- .../pitclipse/core/PitCoreActivator.java | 13 ++ .../META-INF/MANIFEST.MF | 3 +- .../launch/AbstractPitLaunchDelegate.java | 33 +++- .../config/LaunchConfigurationWrapper.java | 6 +- .../pitclipse/runner/PitCliArguments.java | 4 + .../pitest/pitclipse/runner/PitOptions.java | 17 +- .../.classpath | 35 ++++ .../org.pitest.pitest-junit5-plugin/.project | 34 ++++ .../.settings/org.eclipse.jdt.core.prefs | 8 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../META-INF/MANIFEST.MF | 34 ++++ .../build.properties | 6 + .../lib/.gitignore | 2 + .../org.pitest.pitest-junit5-plugin/pom.xml | 157 ++++++++++++++++++ bundles/pom.xml | 1 + features/org.pitest.feature/feature.xml | 10 ++ .../feature.xml | 1 + .../org.pitest.pitclipse.target.oxygen.target | 64 ------- .../org.pitest.pitclipse.target.target | 61 ++++--- 22 files changed, 413 insertions(+), 116 deletions(-) create mode 100644 bundles/org.pitest.pitest-junit5-plugin/.classpath create mode 100644 bundles/org.pitest.pitest-junit5-plugin/.project create mode 100644 bundles/org.pitest.pitest-junit5-plugin/.settings/org.eclipse.jdt.core.prefs create mode 100644 bundles/org.pitest.pitest-junit5-plugin/.settings/org.eclipse.m2e.core.prefs create mode 100644 bundles/org.pitest.pitest-junit5-plugin/META-INF/MANIFEST.MF create mode 100644 bundles/org.pitest.pitest-junit5-plugin/build.properties create mode 100644 bundles/org.pitest.pitest-junit5-plugin/lib/.gitignore create mode 100644 bundles/org.pitest.pitest-junit5-plugin/pom.xml delete mode 100644 releng/org.pitest.pitclipse.target/org.pitest.pitclipse.target.oxygen.target diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d2fcae6..b1c828e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +### Added + - [#73](https://github.com/pitest/pitclipse/pull/113) Support for JUnit 5 tests + ### Removed - [#113](https://github.com/pitest/pitclipse/pull/113) Support for Eclipse Mars, Eclipse Neon diff --git a/README.md b/README.md index 4a4c271f..bc05e944 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,6 @@ It is also possible to run a single JUnit test class. Specific PIT options can b Preferences also allow to change mutation settings (`Window > Preferences > Pitest`). -> **/!\\** JUnit 5 is not supported at the moment - ## Installation ### From the Eclipse Marketplace diff --git a/bundles/README.md b/bundles/README.md index e58f1adf..9038175f 100644 --- a/bundles/README.md +++ b/bundles/README.md @@ -1,25 +1,26 @@ # Pitclipse Architecture -- [Overview](#Overview) -- [Event flow](#Event-flow) -- [How can I be notified when a new PIT application is launched?](#How-can-I-be-notified-when-a-new-PIT-application-is-launched) -- [How do I listen for new PIT results?](#How-do-I-listen-for-new-PIT-results) -- [How do I listen for new PIT mutations results?](#How-do-I-listen-for-new-PIT-mutations-results) +- [Overview](#overview) +- [Event flow](#event-flow) +- [How can I be notified when a new PIT application is launched?](#how-can-i-be-notified-when-a-new-pit-application-is-launched) +- [How do I listen for new PIT results?](#how-do-i-listen-for-new-pit-results) +- [How do I listen for new PIT mutations results?](#how-do-i-listen-for-new-pit-mutations-results) ## Overview This folder defines Pitclipse's source plug-ins. Here is an overview of their purposes. -Bundle | Purpose ------- | ------- -`org.pitest` | Wraps Pitest JAR as an Eclipse plug-in -`org.pitest.pitclipse.core` | Defines extension points and handlers forwarding Pitest results to registered extensions. -`org.pitest.pitclipse.launch` | Provides a PIT Mutation launch configuration. -`org.pitest.pitclipse.launch.ui` | Integrates Pitclipse's launch configurations within Eclipse IDE's UI. -`org.pitest.pitclipse.listeners` | Fragment for `org.pitest` allowing Pitest to discover Pitclipse's mutation listeners. -`org.pitest.pitclipse.preferences.ui` | Provides a Pitclipse Preferences page. -`org.pitest.pitclipse.runner` | Allows to execute Pitest within an Eclipse runtime. -`org.pitest.pitclipse.ui` | Provides views to display Pitest's results. +| Bundle | Purpose | +| ------------------------------------- | -------------------------------------------------------------------------------------------------------------- | +| `org.pitest` | Wraps Pitest JARs as an Eclipse plug-in | +| `org.pitest.pitest-junit5-plugin` | Wraps JARs of the [pitest-junit5-plugin](https://github.com/pitest/pitest-junit5-plugin) as an Eclipse plug-in | +| `org.pitest.pitclipse.core` | Defines extension points and handlers forwarding Pitest results to registered extensions. | +| `org.pitest.pitclipse.launch` | Provides a PIT Mutation launch configuration. | +| `org.pitest.pitclipse.launch.ui` | Integrates Pitclipse's launch configurations within Eclipse IDE's UI. | +| `org.pitest.pitclipse.listeners` | Fragment for `org.pitest` allowing Pitest to discover Pitclipse's mutation listeners. | +| `org.pitest.pitclipse.preferences.ui` | Provides a Pitclipse Preferences page. | +| `org.pitest.pitclipse.runner` | Allows to execute Pitest within an Eclipse runtime. | +| `org.pitest.pitclipse.ui` | Provides views to display Pitest's results. | ## Event flow diff --git a/bundles/org.pitest.pitclipse.core/src/org/pitest/pitclipse/core/PitCoreActivator.java b/bundles/org.pitest.pitclipse.core/src/org/pitest/pitclipse/core/PitCoreActivator.java index 25dff577..98315295 100644 --- a/bundles/org.pitest.pitclipse.core/src/org/pitest/pitclipse/core/PitCoreActivator.java +++ b/bundles/org.pitest.pitclipse.core/src/org/pitest/pitclipse/core/PitCoreActivator.java @@ -55,6 +55,7 @@ */ public class PitCoreActivator extends Plugin { + private static final String ORG_PITEST_JUNIT5_PLUGIN = "org.pitest.pitest-junit5-plugin"; private static final String ORG_PITEST_PITCLIPSE_LISTENERS = "org.pitest.pitclipse.listeners"; private static final String ORG_PITEST_PITCLIPSE_RUNNER = "org.pitest.pitclipse.runner"; private static final String ORG_PITEST = "org.pitest"; @@ -72,6 +73,8 @@ public class PitCoreActivator extends Plugin { private IPreferenceStore preferences; private ImmutableList pitClasspath = of(); + + private ImmutableList pitestJunit5PluginClasspath = of(); private File resultDir; @@ -85,6 +88,10 @@ private void setPitClasspath(List classpath) { pitClasspath = copyOf(classpath); } + public List getPitestJunit5PluginClasspath() { + return pitestJunit5PluginClasspath; + } + public IPreferenceStore getPreferenceStore() { if (preferences == null) { preferences = new ScopedPreferenceStore(InstanceScope.INSTANCE, PLUGIN_ID); @@ -130,6 +137,12 @@ public void start(BundleContext context) throws Exception { // NOPMD - Base pitclipseClasspath.add(getBundleFile(Platform.getBundle(ORG_PITEST_PITCLIPSE_LISTENERS)).getCanonicalPath() + File.separator + "bin"); } setPitClasspath(pitclipseClasspath.build()); + + if (Platform.getBundle(ORG_PITEST_JUNIT5_PLUGIN) != null) { + pitestJunit5PluginClasspath = ImmutableList.of( + getBundleFile(Platform.getBundle(ORG_PITEST_JUNIT5_PLUGIN)).getCanonicalPath() + File.separator + jarDir + File.separator + "pitest-junit5-plugin.jar" + ); + } } private void setupStateDirectories() { diff --git a/bundles/org.pitest.pitclipse.launch/META-INF/MANIFEST.MF b/bundles/org.pitest.pitclipse.launch/META-INF/MANIFEST.MF index 7ff6c4e6..5ce37f08 100644 --- a/bundles/org.pitest.pitclipse.launch/META-INF/MANIFEST.MF +++ b/bundles/org.pitest.pitclipse.launch/META-INF/MANIFEST.MF @@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)", org.eclipse.jdt.launching;bundle-version="[3.8.0,4.0.0)", org.pitest.pitclipse.core, org.pitest.pitclipse.runner, - org.eclipse.jdt.core;bundle-version="[3.11.2,4.0.0)" + org.eclipse.jdt.core;bundle-version="[3.11.2,4.0.0)", + org.eclipse.jdt.junit.core Export-Package: org.pitest.pitclipse.launch, org.pitest.pitclipse.launch.config Import-Package: com.google.common.base;version="21.0.0", diff --git a/bundles/org.pitest.pitclipse.launch/src/org/pitest/pitclipse/launch/AbstractPitLaunchDelegate.java b/bundles/org.pitest.pitclipse.launch/src/org/pitest/pitclipse/launch/AbstractPitLaunchDelegate.java index 362676c1..3fa71d6b 100644 --- a/bundles/org.pitest.pitclipse.launch/src/org/pitest/pitclipse/launch/AbstractPitLaunchDelegate.java +++ b/bundles/org.pitest.pitclipse.launch/src/org/pitest/pitclipse/launch/AbstractPitLaunchDelegate.java @@ -24,6 +24,10 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.jdt.core.IClasspathEntry; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.junit.JUnitCore; import org.eclipse.jdt.launching.JavaLaunchDelegate; import org.pitest.pitclipse.core.extension.handler.ExtensionPointHandler; import org.pitest.pitclipse.core.extension.point.PitRuntimeOptions; @@ -33,6 +37,7 @@ import org.pitest.pitclipse.launch.config.ProjectFinder; import org.pitest.pitclipse.launch.config.SourceDirFinder; import org.pitest.pitclipse.runner.PitOptions; +import org.pitest.pitclipse.runner.PitOptions.PitOptionsBuilder; import org.pitest.pitclipse.runner.PitRunner; import org.pitest.pitclipse.runner.config.PitConfiguration; import org.pitest.pitclipse.runner.io.SocketProvider; @@ -56,6 +61,7 @@ public abstract class AbstractPitLaunchDelegate extends JavaLaunchDelegate { private static final String PIT_RUNNER = PitRunner.class.getCanonicalName(); private int portNumber; private final PitConfiguration pitConfiguration; + private boolean projectUsesJunit5 = false; public AbstractPitLaunchDelegate(PitConfiguration pitConfiguration) { this.pitConfiguration = pitConfiguration; @@ -72,10 +78,15 @@ public String getMainTypeName(ILaunchConfiguration launchConfig) throws CoreExce @Override public String[] getClasspath(ILaunchConfiguration launchConfig) throws CoreException { - List newClasspath = ImmutableList.builder() - .addAll(getDefault().getPitClasspath()) - .addAll(ImmutableList.copyOf(super.getClasspath(launchConfig))) - .build(); + ImmutableList.Builder builder = ImmutableList.builder() + .addAll(getDefault().getPitClasspath()); + builder.addAll(ImmutableList.copyOf(super.getClasspath(launchConfig))); + if (projectUsesJunit5) { + // Allow Pitest to detect Junit5 tests + builder.addAll(getDefault().getPitestJunit5PluginClasspath()); + } + List newClasspath = builder.build(); + log("Classpath: " + newClasspath); return newClasspath.toArray(new String[newClasspath.size()]); } @@ -94,7 +105,10 @@ public void launch(ILaunchConfiguration configuration, String mode, ILaunch laun .withPackageFinder(getPackageFinder()).withClassFinder(getClassFinder()) .withSourceDirFinder(getSourceDirFinder()).withPitConfiguration(pitConfiguration).build(); - PitOptions options = configWrapper.getPitOptions(); + projectUsesJunit5 = isJUnit5InClasspathOf(configWrapper.getProject()); + PitOptionsBuilder optionsBuilder = configWrapper.getPitOptionsBuilder(); + PitOptions options = optionsBuilder.withUseJUnit5(projectUsesJunit5) + .build(); super.launch(configuration, mode, launch, monitor); @@ -104,6 +118,15 @@ public void launch(ILaunchConfiguration configuration, String mode, ILaunch laun portNumber, options, configWrapper.getMutatedProjects())); } + + private static boolean isJUnit5InClasspathOf(IJavaProject project) throws JavaModelException { + for (IClasspathEntry classpathEntry : project.getRawClasspath()) { + if (JUnitCore.JUNIT5_CONTAINER_PATH.equals(classpathEntry.getPath())) { + return true; + } + } + return false; + } protected abstract ProjectFinder getProjectFinder(); diff --git a/bundles/org.pitest.pitclipse.launch/src/org/pitest/pitclipse/launch/config/LaunchConfigurationWrapper.java b/bundles/org.pitest.pitclipse.launch/src/org/pitest/pitclipse/launch/config/LaunchConfigurationWrapper.java index f1b8c4ae..c77516e1 100644 --- a/bundles/org.pitest.pitclipse.launch/src/org/pitest/pitclipse/launch/config/LaunchConfigurationWrapper.java +++ b/bundles/org.pitest.pitclipse.launch/src/org/pitest/pitclipse/launch/config/LaunchConfigurationWrapper.java @@ -111,6 +111,10 @@ public boolean isTestLaunch() throws CoreException { } public PitOptions getPitOptions() throws CoreException { + return getPitOptionsBuilder().build(); + } + + public PitOptions.PitOptionsBuilder getPitOptionsBuilder() throws CoreException { List classPath = getClassesFromProject(); List sourceDirs = getSourceDirsForProject(); int threadCount = getThreadCount(); @@ -137,7 +141,7 @@ public PitOptions getPitOptions() throws CoreException { List packages = getPackagesToTest(); builder.withPackagesToTest(packages); } - return builder.build(); + return builder; } public static Builder builder() { diff --git a/bundles/org.pitest.pitclipse.runner/src/org/pitest/pitclipse/runner/PitCliArguments.java b/bundles/org.pitest.pitclipse.runner/src/org/pitest/pitclipse/runner/PitCliArguments.java index 44c8199b..d501aa39 100644 --- a/bundles/org.pitest.pitclipse.runner/src/org/pitest/pitclipse/runner/PitCliArguments.java +++ b/bundles/org.pitest.pitclipse.runner/src/org/pitest/pitclipse/runner/PitCliArguments.java @@ -54,6 +54,10 @@ private String[] toCliArgs(PitOptions options) { builder.addAll(mutatorsFrom(options)); builder.add("--timeoutConst", Integer.toString(options.getTimeout())); builder.add("--timeoutFactor", options.getTimeoutFactor().toPlainString()); + if (options.getUseJUnit5()) { + // Specify that the 'pitest-junit5-plugin' should be used to discover tests + builder.add("--testPlugin", "junit5"); + } String additionalClasspath = additionalClassPath(options); if (!additionalClasspath.isEmpty()) { builder.add("--classPath", additionalClasspath); diff --git a/bundles/org.pitest.pitclipse.runner/src/org/pitest/pitclipse/runner/PitOptions.java b/bundles/org.pitest.pitclipse.runner/src/org/pitest/pitclipse/runner/PitOptions.java index 1381d88b..1fdc545b 100644 --- a/bundles/org.pitest.pitclipse.runner/src/org/pitest/pitclipse/runner/PitOptions.java +++ b/bundles/org.pitest.pitclipse.runner/src/org/pitest/pitclipse/runner/PitOptions.java @@ -54,11 +54,12 @@ public final class PitOptions implements Serializable { private final ImmutableList mutators; private final int timeout; private final BigDecimal timeoutFactor; + private final boolean useJUnit5; private PitOptions(String classUnderTest, ImmutableList classesToMutate, ImmutableList sourceDirs, File reportDir, ImmutableList packages, ImmutableList classPath, int threads, File historyLocation, ImmutableList excludedClasses, ImmutableList excludedMethods, - ImmutableList avoidCallsTo, ImmutableList mutators, int timeout, BigDecimal timeoutFactor) { + ImmutableList avoidCallsTo, ImmutableList mutators, int timeout, BigDecimal timeoutFactor, boolean useJUnit5) { this.classUnderTest = classUnderTest; this.threads = threads; this.historyLocation = historyLocation; @@ -73,6 +74,7 @@ private PitOptions(String classUnderTest, ImmutableList classesToMutate, this.mutators = mutators; this.timeout = timeout; this.timeoutFactor = timeoutFactor; + this.useJUnit5 = useJUnit5; } public File getReportDirectory() { @@ -102,6 +104,7 @@ public static final class PitOptionsBuilder { private ImmutableList mutators = copyOf(split(DEFAULT_MUTATORS)); private int timeout = 3000; private BigDecimal timeoutFactor = BigDecimal.valueOf(1.25); + private boolean useJUnit5 = false; private PitOptionsBuilder() { } @@ -136,7 +139,8 @@ public PitOptions build() { initialiseReportDir(); initialiseHistoryLocation(); return new PitOptions(classUnderTest, classesToMutate, sourceDirs, reportDir, packages, classPath, threads, - historyLocation, excludedClasses, excludedMethods, avoidCallsTo, mutators, timeout, timeoutFactor); + historyLocation, excludedClasses, excludedMethods, avoidCallsTo, mutators, timeout, timeoutFactor, + useJUnit5); } private void initialiseReportDir() { @@ -242,6 +246,11 @@ public PitOptionsBuilder withMutators(List mutators) { return this; } + public PitOptionsBuilder withUseJUnit5(boolean useJUnit5) { + this.useJUnit5 = useJUnit5; + return this; + } + private static List split(String toSplit) { return ImmutableList.copyOf(Splitter.on(',').trimResults().omitEmptyStrings().split(toSplit)); } @@ -310,6 +319,10 @@ public int getTimeout() { public BigDecimal getTimeoutFactor() { return timeoutFactor; } + + public boolean getUseJUnit5() { + return useJUnit5; + } @Override public String toString() { diff --git a/bundles/org.pitest.pitest-junit5-plugin/.classpath b/bundles/org.pitest.pitest-junit5-plugin/.classpath new file mode 100644 index 00000000..728816b3 --- /dev/null +++ b/bundles/org.pitest.pitest-junit5-plugin/.classpath @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.pitest.pitest-junit5-plugin/.project b/bundles/org.pitest.pitest-junit5-plugin/.project new file mode 100644 index 00000000..194357cc --- /dev/null +++ b/bundles/org.pitest.pitest-junit5-plugin/.project @@ -0,0 +1,34 @@ + + + org.pitest.pitest-junit5-plugin + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/bundles/org.pitest.pitest-junit5-plugin/.settings/org.eclipse.jdt.core.prefs b/bundles/org.pitest.pitest-junit5-plugin/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..5723a0f8 --- /dev/null +++ b/bundles/org.pitest.pitest-junit5-plugin/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/bundles/org.pitest.pitest-junit5-plugin/.settings/org.eclipse.m2e.core.prefs b/bundles/org.pitest.pitest-junit5-plugin/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 00000000..f897a7f1 --- /dev/null +++ b/bundles/org.pitest.pitest-junit5-plugin/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/bundles/org.pitest.pitest-junit5-plugin/META-INF/MANIFEST.MF b/bundles/org.pitest.pitest-junit5-plugin/META-INF/MANIFEST.MF new file mode 100644 index 00000000..7556f0d2 --- /dev/null +++ b/bundles/org.pitest.pitest-junit5-plugin/META-INF/MANIFEST.MF @@ -0,0 +1,34 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: pitest-junit5-plugin +Bundle-SymbolicName: org.pitest.pitest-junit5-plugin +Bundle-Version: 0.12.0 +Bundle-ClassPath: lib/pitest-junit5-plugin-sources.jar, + lib/pitest-junit5-plugin-javadoc.jar, + lib/pitest-junit5-plugin.jar, + ./ +Bundle-Vendor: Henry Coles +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Eclipse-BundleShape: dir +Automatic-Module-Name: org.pitest.pitest-junit5-plugin +Export-Package: org.junit.platform.commons, + org.junit.platform.commons.annotation, + org.junit.platform.commons.function, + org.junit.platform.commons.logging, + org.junit.platform.commons.support, + org.junit.platform.commons.util, + org.junit.platform.engine, + org.junit.platform.engine.discovery, + org.junit.platform.engine.reporting, + org.junit.platform.engine.support.config, + org.junit.platform.engine.support.descriptor, + org.junit.platform.engine.support.discovery, + org.junit.platform.engine.support.filter, + org.junit.platform.engine.support.hierarchical, + org.junit.platform.launcher, + org.junit.platform.launcher.core, + org.junit.platform.launcher.listeners, + org.junit.platform.launcher.listeners.discovery, + org.junit.platform.launcher.tagexpression, + org.pitest.junit5 +Require-Bundle: org.pitest;bundle-version="1.4.11" diff --git a/bundles/org.pitest.pitest-junit5-plugin/build.properties b/bundles/org.pitest.pitest-junit5-plugin/build.properties new file mode 100644 index 00000000..af367135 --- /dev/null +++ b/bundles/org.pitest.pitest-junit5-plugin/build.properties @@ -0,0 +1,6 @@ +bin.includes = META-INF/,\ + lib/pitest-junit5-plugin-sources.jar,\ + lib/pitest-junit5-plugin-javadoc.jar,\ + lib/pitest-junit5-plugin.jar +src.includes = lib/pitest-junit5-plugin-sources.jar,\ + lib/pitest-junit5-plugin-javadoc.jar diff --git a/bundles/org.pitest.pitest-junit5-plugin/lib/.gitignore b/bundles/org.pitest.pitest-junit5-plugin/lib/.gitignore new file mode 100644 index 00000000..d8e2f54c --- /dev/null +++ b/bundles/org.pitest.pitest-junit5-plugin/lib/.gitignore @@ -0,0 +1,2 @@ +!.gitignore +*.jar \ No newline at end of file diff --git a/bundles/org.pitest.pitest-junit5-plugin/pom.xml b/bundles/org.pitest.pitest-junit5-plugin/pom.xml new file mode 100644 index 00000000..97b879ae --- /dev/null +++ b/bundles/org.pitest.pitest-junit5-plugin/pom.xml @@ -0,0 +1,157 @@ + + 4.0.0 + + org.pitest + org.pitest.pitclipse.bundles + 2.0.2 + + + org.pitest.pitest-junit5-plugin + 0.12.0 + eclipse-plugin + Wraps Pitest JUnit 5 Plugin's JAR as an Eclipse plug-in + + + + 0.12 + + + + + org.pitest + pitest-junit5-plugin + ${project.maven.version} + + + org.pitest + pitest-junit5-plugin + ${project.maven.version} + sources + + + org.pitest + pitest-junit5-plugin + ${project.maven.version} + javadoc + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.1.0 + + + + ${basedir}/lib + + .gitignore + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-test-libs + + copy-dependencies + + + lib + true + runtime + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-checkstyle-plugin + + + [3.0.0,) + + + check + + + + + + + + + + org.eclipse.tycho + + + tycho-compiler-plugin + + + [1.5.1,) + + + compile + + + + + + + + + + org.eclipse.tycho + + + tycho-packaging-plugin + + + [1.5.1,) + + + build-qualifier + validate-id + + validate-version + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bundles/pom.xml b/bundles/pom.xml index ef51425a..85bf0b90 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -15,6 +15,7 @@ org.pitest + org.pitest.pitest-junit5-plugin org.pitest.pitclipse.core org.pitest.pitclipse.launch org.pitest.pitclipse.launch.ui diff --git a/features/org.pitest.feature/feature.xml b/features/org.pitest.feature/feature.xml index 4e583aad..2a0aff2b 100644 --- a/features/org.pitest.feature/feature.xml +++ b/features/org.pitest.feature/feature.xml @@ -213,10 +213,20 @@ limitations under the License. + + + + + + diff --git a/features/org.pitest.pitclipse.core.feature/feature.xml b/features/org.pitest.pitclipse.core.feature/feature.xml index 447f1310..db52070c 100644 --- a/features/org.pitest.pitclipse.core.feature/feature.xml +++ b/features/org.pitest.pitclipse.core.feature/feature.xml @@ -235,6 +235,7 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/releng/org.pitest.pitclipse.target/org.pitest.pitclipse.target.target b/releng/org.pitest.pitclipse.target/org.pitest.pitclipse.target.target index 57b32c65..6ac49511 100644 --- a/releng/org.pitest.pitclipse.target/org.pitest.pitclipse.target.target +++ b/releng/org.pitest.pitclipse.target/org.pitest.pitclipse.target.target @@ -1,34 +1,22 @@ - + + + - - - - - - + + + + + + + - - - + + + - - - - - - - - - - - - - - - - + @@ -47,9 +35,30 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 4d4c4a220f8f36ba63e7a5fce633881f49cecdb4 Mon Sep 17 00:00:00 2001 From: Emmanuel Chebbi Date: Sun, 1 Mar 2020 17:52:25 +0100 Subject: [PATCH 3/5] Remove debug logs Because: - they are shown in the console during PIT execution but provide no value --- .../pitest/pitclipse/launch/AbstractPitLaunchDelegate.java | 2 -- .../src/org/pitest/pitclipse/runner/PitRunner.java | 5 ----- .../src/org/pitest/pitclipse/runner/io/SocketProvider.java | 2 -- .../runner/io/SocketProviderIntegrationTestFixture.java | 1 - 4 files changed, 10 deletions(-) diff --git a/bundles/org.pitest.pitclipse.launch/src/org/pitest/pitclipse/launch/AbstractPitLaunchDelegate.java b/bundles/org.pitest.pitclipse.launch/src/org/pitest/pitclipse/launch/AbstractPitLaunchDelegate.java index 3fa71d6b..e77f255b 100644 --- a/bundles/org.pitest.pitclipse.launch/src/org/pitest/pitclipse/launch/AbstractPitLaunchDelegate.java +++ b/bundles/org.pitest.pitclipse.launch/src/org/pitest/pitclipse/launch/AbstractPitLaunchDelegate.java @@ -45,7 +45,6 @@ import java.util.List; import static org.pitest.pitclipse.core.PitCoreActivator.getDefault; -import static org.pitest.pitclipse.core.PitCoreActivator.log; /** *

Abstract launch configuration used to execute PIT in a background VM.

@@ -87,7 +86,6 @@ public String[] getClasspath(ILaunchConfiguration launchConfig) throws CoreExcep } List newClasspath = builder.build(); - log("Classpath: " + newClasspath); return newClasspath.toArray(new String[newClasspath.size()]); } diff --git a/bundles/org.pitest.pitclipse.runner/src/org/pitest/pitclipse/runner/PitRunner.java b/bundles/org.pitest.pitclipse.runner/src/org/pitest/pitclipse/runner/PitRunner.java index 775f2bf5..e85162f6 100644 --- a/bundles/org.pitest.pitclipse.runner/src/org/pitest/pitclipse/runner/PitRunner.java +++ b/bundles/org.pitest.pitclipse.runner/src/org/pitest/pitclipse/runner/PitRunner.java @@ -42,23 +42,19 @@ public static void main(String[] args) { try (PitClient client = new PitClient(port)) { client.connect(); - System.out.println("Connected"); Optional request = client.readRequest(); Optional results = request.transform(executePit()); results.toJavaUtil().ifPresent(client::sendResults); - System.out.println("Closing server"); } catch (IOException e) { // An error occurred while closing the client e.printStackTrace(); } - System.out.println("Closed"); } public static Function executePit() { return request -> { - System.out.println("Received request: " + request); String[] cliArgs = PitCliArguments.from(request.getOptions()); MutationCoverageReport.main(cliArgs); File reportDir = request.getReportDirectory(); @@ -69,7 +65,6 @@ public static Function executePit() { .withProjects(request.getProjects()) .withMutations(mutations) .build(); - System.out.println("Sending results: " + results); return results; }; } diff --git a/bundles/org.pitest.pitclipse.runner/src/org/pitest/pitclipse/runner/io/SocketProvider.java b/bundles/org.pitest.pitclipse.runner/src/org/pitest/pitclipse/runner/io/SocketProvider.java index d50764cc..8afaf3c8 100644 --- a/bundles/org.pitest.pitclipse.runner/src/org/pitest/pitclipse/runner/io/SocketProvider.java +++ b/bundles/org.pitest.pitclipse.runner/src/org/pitest/pitclipse/runner/io/SocketProvider.java @@ -47,7 +47,6 @@ public ObjectStreamSocket listen(int portNumber) { ServerSocket serverSocket = null; try { serverSocket = new ServerSocket(portNumber); - System.out.println("Listening on: " + serverSocket.getInetAddress() + ":" + portNumber); Socket connection = serverSocket.accept(); return ObjectStreamSocket.make(connection); } catch (IOException e) { @@ -94,7 +93,6 @@ private Optional doConnect(int portNumber) { try { InetAddress localhost = InetAddress.getByName(null); Socket socket = new Socket(); - System.out.println("Connecting to: " + localhost + ":" + portNumber); SocketAddress endpoint = new InetSocketAddress(localhost, portNumber); socket.connect(endpoint, DEFAULT_TIMEOUT); return Optional.of(ObjectStreamSocket.make(socket)); diff --git a/tests/org.pitest.pitclipse.runner.tests/src/org/pitest/pitclipse/runner/io/SocketProviderIntegrationTestFixture.java b/tests/org.pitest.pitclipse.runner.tests/src/org/pitest/pitclipse/runner/io/SocketProviderIntegrationTestFixture.java index 127e74ce..0ff7140f 100644 --- a/tests/org.pitest.pitclipse.runner.tests/src/org/pitest/pitclipse/runner/io/SocketProviderIntegrationTestFixture.java +++ b/tests/org.pitest.pitclipse.runner.tests/src/org/pitest/pitclipse/runner/io/SocketProviderIntegrationTestFixture.java @@ -50,7 +50,6 @@ static Optional connectTo(int port) { static Future listenOn(final int port) { Callable socketTest = new Callable() { public ReturnStatus call() throws Exception { - System.out.println("Listening on port " + port); ObjectStreamSocket server = new SocketProvider().listen(port); try { server.write(ECHO); From 2a5d0766f4518ee5ce1b93ae20253686a65cfd05 Mon Sep 17 00:00:00 2001 From: Emmanuel Chebbi Date: Sun, 1 Mar 2020 18:19:47 +0100 Subject: [PATCH 4/5] Make tycho-versions-plugin's version explicit Because: - I just faced issues while changing project's version due to Maven using the tycho-versions-plugin 1.3.0 --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 3addafaa..ddd0ab4a 100644 --- a/pom.xml +++ b/pom.xml @@ -64,6 +64,11 @@ ${tycho-version} true + + org.eclipse.tycho + tycho-versions-plugin + ${tycho-version} + org.eclipse.tycho From 1df64f77e777dc885f335bcb8de40e7342faf35d Mon Sep 17 00:00:00 2001 From: Emmanuel Chebbi Date: Sun, 1 Mar 2020 18:20:49 +0100 Subject: [PATCH 5/5] Bump version to 2.1.0 --- CHANGELOG.md | 2 ++ bundles/org.pitest.pitclipse.core/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.pitest.pitclipse.launch/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../org.pitest.pitclipse.runner/META-INF/MANIFEST.MF | 2 +- bundles/org.pitest.pitclipse.ui/META-INF/MANIFEST.MF | 2 +- bundles/org.pitest.pitest-junit5-plugin/pom.xml | 2 +- bundles/org.pitest/pom.xml | 2 +- bundles/pom.xml | 2 +- features/org.pitest.pitclipse.core.feature/feature.xml | 2 +- features/org.pitest.pitclipse.ui.feature/feature.xml | 2 +- features/pom.xml | 2 +- pom.xml | 4 ++-- releng/org.pitest.pitclipse.p2/pom.xml | 2 +- releng/org.pitest.pitclipse.target/pom.xml | 2 +- releng/pom.xml | 2 +- tests/io.cucumber/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- tests/org.pitest.pitclipse.runner.tests/pom.xml | 2 +- .../org.pitest.pitclipse.tests.coverage.report/pom.xml | 10 +++++----- .../org.pitest.pitclipse.ui.tests/META-INF/MANIFEST.MF | 2 +- tests/org.pitest.pitclipse.ui.tests/pom.xml | 2 +- tests/pom.xml | 2 +- 25 files changed, 31 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1c828e8..c290ad4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] + +## [2.1.0] - 2020-03-01 ### Added - [#73](https://github.com/pitest/pitclipse/pull/113) Support for JUnit 5 tests diff --git a/bundles/org.pitest.pitclipse.core/META-INF/MANIFEST.MF b/bundles/org.pitest.pitclipse.core/META-INF/MANIFEST.MF index 704d4f95..03e0f9f3 100644 --- a/bundles/org.pitest.pitclipse.core/META-INF/MANIFEST.MF +++ b/bundles/org.pitest.pitclipse.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Pitclipse Core Bundle-SymbolicName: org.pitest.pitclipse.core;singleton:=true -Bundle-Version: 2.0.2 +Bundle-Version: 2.1.0 Bundle-Activator: org.pitest.pitclipse.core.PitCoreActivator Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)", org.eclipse.jdt.core;bundle-version="[3.11.2,4.0.0)", diff --git a/bundles/org.pitest.pitclipse.launch.ui/META-INF/MANIFEST.MF b/bundles/org.pitest.pitclipse.launch.ui/META-INF/MANIFEST.MF index d9239c25..50385755 100644 --- a/bundles/org.pitest.pitclipse.launch.ui/META-INF/MANIFEST.MF +++ b/bundles/org.pitest.pitclipse.launch.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Pitclipse Launch Configurations UI Bundle-SymbolicName: org.pitest.pitclipse.launch.ui;singleton:=true -Bundle-Version: 2.0.2 +Bundle-Version: 2.1.0 Bundle-Vendor: Pitest.org Automatic-Module-Name: org.pitest.pitclipse.launch.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.pitest.pitclipse.launch/META-INF/MANIFEST.MF b/bundles/org.pitest.pitclipse.launch/META-INF/MANIFEST.MF index 5ce37f08..13b08a67 100644 --- a/bundles/org.pitest.pitclipse.launch/META-INF/MANIFEST.MF +++ b/bundles/org.pitest.pitclipse.launch/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Pitclipse Launch Configurations Bundle-SymbolicName: org.pitest.pitclipse.launch;singleton:=true -Bundle-Version: 2.0.2 +Bundle-Version: 2.1.0 Bundle-Vendor: Pitest.org Automatic-Module-Name: org.pitest.pitclipse.launch Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.pitest.pitclipse.listeners/META-INF/MANIFEST.MF b/bundles/org.pitest.pitclipse.listeners/META-INF/MANIFEST.MF index b66410c7..fdd429c4 100644 --- a/bundles/org.pitest.pitclipse.listeners/META-INF/MANIFEST.MF +++ b/bundles/org.pitest.pitclipse.listeners/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Pitclipse's Pitest Listeners Bundle-SymbolicName: org.pitest.pitclipse.listeners -Bundle-Version: 2.0.2 +Bundle-Version: 2.1.0 Fragment-Host: org.pitest;bundle-version="1.4.11" Automatic-Module-Name: org.pitest.pitclipse.listeners Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.pitest.pitclipse.preferences.ui/META-INF/MANIFEST.MF b/bundles/org.pitest.pitclipse.preferences.ui/META-INF/MANIFEST.MF index a007a418..e6bac9f1 100644 --- a/bundles/org.pitest.pitclipse.preferences.ui/META-INF/MANIFEST.MF +++ b/bundles/org.pitest.pitclipse.preferences.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Pitclipse Preferences UI Bundle-SymbolicName: org.pitest.pitclipse.preferences.ui;singleton:=true -Bundle-Version: 2.0.2 +Bundle-Version: 2.1.0 Bundle-Vendor: Pitest.org Automatic-Module-Name: org.pitest.pitclipse.preferences.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.pitest.pitclipse.runner/META-INF/MANIFEST.MF b/bundles/org.pitest.pitclipse.runner/META-INF/MANIFEST.MF index ad6a9ed4..a25ad760 100644 --- a/bundles/org.pitest.pitclipse.runner/META-INF/MANIFEST.MF +++ b/bundles/org.pitest.pitclipse.runner/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Pitclipse Runner Bundle-SymbolicName: org.pitest.pitclipse.runner -Bundle-Version: 2.0.2 +Bundle-Version: 2.1.0 Bundle-Vendor: Pitest.org Automatic-Module-Name: org.pitest.pitclipse.runner Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/bundles/org.pitest.pitclipse.ui/META-INF/MANIFEST.MF b/bundles/org.pitest.pitclipse.ui/META-INF/MANIFEST.MF index 66bc6cd4..2c9a439b 100644 --- a/bundles/org.pitest.pitclipse.ui/META-INF/MANIFEST.MF +++ b/bundles/org.pitest.pitclipse.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Pitclipse UI Bundle-SymbolicName: org.pitest.pitclipse.ui;singleton:=true -Bundle-Version: 2.0.2 +Bundle-Version: 2.1.0 Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)", org.eclipse.core.resources;bundle-version="[3.10.1,4.0.0)", diff --git a/bundles/org.pitest.pitest-junit5-plugin/pom.xml b/bundles/org.pitest.pitest-junit5-plugin/pom.xml index 97b879ae..e9da6cc7 100644 --- a/bundles/org.pitest.pitest-junit5-plugin/pom.xml +++ b/bundles/org.pitest.pitest-junit5-plugin/pom.xml @@ -5,7 +5,7 @@ org.pitest org.pitest.pitclipse.bundles - 2.0.2 + 2.1.0 org.pitest.pitest-junit5-plugin diff --git a/bundles/org.pitest/pom.xml b/bundles/org.pitest/pom.xml index f7c08db7..8f25feb1 100644 --- a/bundles/org.pitest/pom.xml +++ b/bundles/org.pitest/pom.xml @@ -5,7 +5,7 @@ org.pitest org.pitest.pitclipse.bundles - 2.0.2 + 2.1.0 org.pitest diff --git a/bundles/pom.xml b/bundles/pom.xml index 85bf0b90..198efa32 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -5,7 +5,7 @@ org.pitest org.pitest.pitclipse - 2.0.2 + 2.1.0 org.pitest.pitclipse.bundles diff --git a/features/org.pitest.pitclipse.core.feature/feature.xml b/features/org.pitest.pitclipse.core.feature/feature.xml index db52070c..75988eaa 100644 --- a/features/org.pitest.pitclipse.core.feature/feature.xml +++ b/features/org.pitest.pitclipse.core.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/org.pitest.pitclipse.ui.feature/feature.xml b/features/org.pitest.pitclipse.ui.feature/feature.xml index 0cae11a6..d52506d8 100644 --- a/features/org.pitest.pitclipse.ui.feature/feature.xml +++ b/features/org.pitest.pitclipse.ui.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/pom.xml b/features/pom.xml index eac5f2cf..379be413 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -5,7 +5,7 @@ org.pitest org.pitest.pitclipse - 2.0.2 + 2.1.0 org.pitest.pitclipse.features diff --git a/pom.xml b/pom.xml index ddd0ab4a..d8c066c0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.pitest org.pitest.pitclipse - 2.0.2 + 2.1.0 pom Pitclipse @@ -79,7 +79,7 @@ org.pitest org.pitest.pitclipse.target - 2.0.2 + 2.1.0 diff --git a/releng/org.pitest.pitclipse.p2/pom.xml b/releng/org.pitest.pitclipse.p2/pom.xml index 794d5083..4b428418 100644 --- a/releng/org.pitest.pitclipse.p2/pom.xml +++ b/releng/org.pitest.pitclipse.p2/pom.xml @@ -7,7 +7,7 @@ org.pitest org.pitest.pitclipse.releng - 2.0.2 + 2.1.0 org.pitest.pitclipse.p2 diff --git a/releng/org.pitest.pitclipse.target/pom.xml b/releng/org.pitest.pitclipse.target/pom.xml index 8b6bc597..6cab3d99 100644 --- a/releng/org.pitest.pitclipse.target/pom.xml +++ b/releng/org.pitest.pitclipse.target/pom.xml @@ -5,7 +5,7 @@ org.pitest org.pitest.pitclipse.releng - 2.0.2 + 2.1.0 org.pitest.pitclipse.target diff --git a/releng/pom.xml b/releng/pom.xml index 63c2f9a7..980143af 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -5,7 +5,7 @@ org.pitest org.pitest.pitclipse - 2.0.2 + 2.1.0 org.pitest.pitclipse.releng diff --git a/tests/io.cucumber/pom.xml b/tests/io.cucumber/pom.xml index 2d060cec..cbed4b27 100644 --- a/tests/io.cucumber/pom.xml +++ b/tests/io.cucumber/pom.xml @@ -5,7 +5,7 @@ org.pitest org.pitest.pitclipse.tests - 2.0.2 + 2.1.0 io.cucumber diff --git a/tests/org.pitest.pitclipse.runner.tests/META-INF/MANIFEST.MF b/tests/org.pitest.pitclipse.runner.tests/META-INF/MANIFEST.MF index 4fbc17d7..69a81c0e 100644 --- a/tests/org.pitest.pitclipse.runner.tests/META-INF/MANIFEST.MF +++ b/tests/org.pitest.pitclipse.runner.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Pitclipse Runner Tests Bundle-SymbolicName: org.pitest.pitclipse.runner.tests -Bundle-Version: 2.0.2 +Bundle-Version: 2.1.0 Bundle-Vendor: Pitest.org Fragment-Host: org.pitest.pitclipse.runner;bundle-version="2.0.0" Automatic-Module-Name: org.pitest.pitclipse.runner.tests diff --git a/tests/org.pitest.pitclipse.runner.tests/pom.xml b/tests/org.pitest.pitclipse.runner.tests/pom.xml index fb8b4195..1b41b195 100644 --- a/tests/org.pitest.pitclipse.runner.tests/pom.xml +++ b/tests/org.pitest.pitclipse.runner.tests/pom.xml @@ -9,7 +9,7 @@ org.pitest org.pitest.pitclipse.tests - 2.0.2 + 2.1.0 diff --git a/tests/org.pitest.pitclipse.tests.coverage.report/pom.xml b/tests/org.pitest.pitclipse.tests.coverage.report/pom.xml index 3bbd4411..798fedb7 100644 --- a/tests/org.pitest.pitclipse.tests.coverage.report/pom.xml +++ b/tests/org.pitest.pitclipse.tests.coverage.report/pom.xml @@ -5,7 +5,7 @@ org.pitest org.pitest.pitclipse.tests - 2.0.2 + 2.1.0 org.pitest.pitclipse.tests.coverage.report @@ -43,25 +43,25 @@ org.pitest org.pitest.pitclipse.runner - 2.0.2 + 2.1.0 compile org.pitest org.pitest.pitclipse.runner.tests - 2.0.2 + 2.1.0 test org.pitest org.pitest.pitclipse.ui - 2.0.2 + 2.1.0 compile org.pitest org.pitest.pitclipse.ui.tests - 2.0.2 + 2.1.0 test diff --git a/tests/org.pitest.pitclipse.ui.tests/META-INF/MANIFEST.MF b/tests/org.pitest.pitclipse.ui.tests/META-INF/MANIFEST.MF index c22b7f53..00880b42 100644 --- a/tests/org.pitest.pitclipse.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.pitest.pitclipse.ui.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Pitclipse UI Tests Bundle-SymbolicName: org.pitest.pitclipse.ui.tests;singleton:=true -Bundle-Version: 2.0.2 +Bundle-Version: 2.1.0 Bundle-Vendor: Pitest.org Fragment-Host: org.pitest.pitclipse.ui;bundle-version="2.0.0" Automatic-Module-Name: org.pitest.pitclipse.ui.tests diff --git a/tests/org.pitest.pitclipse.ui.tests/pom.xml b/tests/org.pitest.pitclipse.ui.tests/pom.xml index 993e1cde..eb2a2371 100644 --- a/tests/org.pitest.pitclipse.ui.tests/pom.xml +++ b/tests/org.pitest.pitclipse.ui.tests/pom.xml @@ -8,7 +8,7 @@ org.pitest org.pitest.pitclipse.tests - 2.0.2 + 2.1.0 diff --git a/tests/pom.xml b/tests/pom.xml index 082ad3e3..61b7918a 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -5,7 +5,7 @@ org.pitest org.pitest.pitclipse - 2.0.2 + 2.1.0 org.pitest.pitclipse.tests