diff --git a/.travis.yml b/.travis.yml index 23623d55..ed2ebebe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: java jdk: - - openjdk6 + - openjdk8 script: cd guava-bundle && mvn install && cd ../pitest-bundles && mvn install && cd ../pitrunner && mvn install && cd ../pitclipse-plugin && mvn install diff --git a/pitclipse-plugin/org.pitest.pitclipse.core/META-INF/MANIFEST.MF b/pitclipse-plugin/org.pitest.pitclipse.core/META-INF/MANIFEST.MF index 697b7017..7e02dd12 100644 --- a/pitclipse-plugin/org.pitest.pitclipse.core/META-INF/MANIFEST.MF +++ b/pitclipse-plugin/org.pitest.pitclipse.core/META-INF/MANIFEST.MF @@ -13,12 +13,12 @@ Require-Bundle: org.eclipse.ui, org.eclipse.jdt.launching;bundle-version="3.6.101", org.eclipse.jdt.ui;bundle-version="3.8.2", org.pitest.pitrunner;bundle-version="1.1.6", - org.pitest.osgi;bundle-version="1.1.9", - org.pitest.command-line-osgi;bundle-version="1.1.9", - org.pitest.html-report-osgi;bundle-version="1.1.9", + org.pitest.osgi;bundle-version="1.4.0", + org.pitest.command-line-osgi;bundle-version="1.4.0", + org.pitest.html-report-osgi;bundle-version="1.4.0", org.pitest.guava-shade-osgi;bundle-version="18.0.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Pitest.org Bundle-ClassPath: . Export-Package: org.pitest.pitclipse.core, diff --git a/pitclipse-plugin/org.pitest.pitclipse.ui/META-INF/MANIFEST.MF b/pitclipse-plugin/org.pitest.pitclipse.ui/META-INF/MANIFEST.MF index 5ea1f11c..caffc53b 100644 --- a/pitclipse-plugin/org.pitest.pitclipse.ui/META-INF/MANIFEST.MF +++ b/pitclipse-plugin/org.pitest.pitclipse.ui/META-INF/MANIFEST.MF @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.workbench.texteditor;bundle-version="3.6.1", org.eclipse.jface.text;bundle-version="3.6.1" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Pitest.org Bundle-ClassPath: . Export-Package: org.pitest.pitclipse.ui.extension.point diff --git a/pitclipse-plugin/pitclipse-ui.tests/META-INF/MANIFEST.MF b/pitclipse-plugin/pitclipse-ui.tests/META-INF/MANIFEST.MF index a1adce35..61258abc 100644 --- a/pitclipse-plugin/pitclipse-ui.tests/META-INF/MANIFEST.MF +++ b/pitclipse-plugin/pitclipse-ui.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Pitclipse UI Tests Bundle-SymbolicName: org.pitest.pitclipse-ui.tests;singleton:=true Bundle-Version: 1.1.6.201607050705 -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.ui, org.eclipse.core.resources, org.eclipse.core.runtime, diff --git a/pitclipse-plugin/pom.xml b/pitclipse-plugin/pom.xml index 610c07f8..33c8f3a7 100644 --- a/pitclipse-plugin/pom.xml +++ b/pitclipse-plugin/pom.xml @@ -25,7 +25,7 @@ 3.3 1.4 1.9.5 - 1.1.9 + 1.4.0 ${project.version} 0.22.0 diff --git a/pitest-bundles/pitest-command-line-osgi/pom.xml b/pitest-bundles/pitest-command-line-osgi/pom.xml index 4b99872b..c858afd1 100644 --- a/pitest-bundles/pitest-command-line-osgi/pom.xml +++ b/pitest-bundles/pitest-command-line-osgi/pom.xml @@ -6,12 +6,12 @@ pitest-bundles org.pitest - 1.1.9 + 1.4.0 pitest-command-line-osgi pitest-command-line-osgi bundle - 1.1.9 + 1.4.0 org.pitest diff --git a/pitest-bundles/pitest-html-report-osgi/pom.xml b/pitest-bundles/pitest-html-report-osgi/pom.xml index 2b047e69..a9775563 100644 --- a/pitest-bundles/pitest-html-report-osgi/pom.xml +++ b/pitest-bundles/pitest-html-report-osgi/pom.xml @@ -6,12 +6,12 @@ pitest-bundles org.pitest - 1.1.9 + 1.4.0 pitest-html-report-osgi pitest-html-report-osgi bundle - 1.1.9 + 1.4.0 org.pitest diff --git a/pitest-bundles/pitest-osgi/pom.xml b/pitest-bundles/pitest-osgi/pom.xml index d07e4233..3d5a3d8f 100644 --- a/pitest-bundles/pitest-osgi/pom.xml +++ b/pitest-bundles/pitest-osgi/pom.xml @@ -6,12 +6,12 @@ pitest-bundles org.pitest - 1.1.9 + 1.4.0 pitest-osgi pitest-osgi bundle - 1.1.9 + 1.4.0 org.pitest diff --git a/pitest-bundles/pom.xml b/pitest-bundles/pom.xml index 37a0860c..144cdca2 100644 --- a/pitest-bundles/pom.xml +++ b/pitest-bundles/pom.xml @@ -7,7 +7,7 @@ pitest-bundles pitest-bundles pom - 1.1.9 + 1.4.0 Pitest.org http://pitest.org/ @@ -17,7 +17,7 @@ 2.5.3 3.3 1.4 - 1.1.9 + 1.4.0 1.4 diff --git a/pitrunner/pom.xml b/pitrunner/pom.xml index 54ca5037..5e700c4c 100644 --- a/pitrunner/pom.xml +++ b/pitrunner/pom.xml @@ -21,7 +21,7 @@ 3.3 1.4 1.9.5 - 1.1.9 + 1.4.0 0.15.0 3.1 @@ -102,8 +102,8 @@ maven-compiler-plugin ${maven.compiler.version} - 1.6 - 1.6 + 1.8 + 1.8 diff --git a/pitrunner/src/main/java/org/pitest/pitclipse/pitrunner/results/mutations/PitclipseMutationsResultListener.java b/pitrunner/src/main/java/org/pitest/pitclipse/pitrunner/results/mutations/PitclipseMutationsResultListener.java index dffd723f..653eef88 100644 --- a/pitrunner/src/main/java/org/pitest/pitclipse/pitrunner/results/mutations/PitclipseMutationsResultListener.java +++ b/pitrunner/src/main/java/org/pitest/pitclipse/pitrunner/results/mutations/PitclipseMutationsResultListener.java @@ -33,12 +33,7 @@ public void handleMutationResult(ClassMutationResults results) { MutationDetails details = result.getDetails(); final Mutation mutation = OBJECT_FACTORY.createMutationsMutation(); mutation.setIndex(BigInteger.valueOf(details.getFirstIndex())); - result.getKillingTest().forEach(new SideEffect1() { - @Override - public void apply(String killingTest) { - mutation.setKillingTest(killingTest); - } - }); + result.getKillingTest().ifPresent((String killingTest) -> mutation.setKillingTest(killingTest)); mutation.setLineNumber(BigInteger.valueOf(details.getLineNumber())); mutation.setMutatedClass(details.getClassName().asJavaName()); mutation.setMutatedMethod(details.getMethod().name()); diff --git a/pitrunner/src/test/java/org/pitest/pitclipse/pitrunner/results/mutations/PitclipseMutationsResultListenerTest.java b/pitrunner/src/test/java/org/pitest/pitclipse/pitrunner/results/mutations/PitclipseMutationsResultListenerTest.java index a2709694..ba7c69e2 100644 --- a/pitrunner/src/test/java/org/pitest/pitclipse/pitrunner/results/mutations/PitclipseMutationsResultListenerTest.java +++ b/pitrunner/src/test/java/org/pitest/pitclipse/pitrunner/results/mutations/PitclipseMutationsResultListenerTest.java @@ -32,6 +32,7 @@ import org.pitest.mutationtest.engine.MethodName; import org.pitest.mutationtest.engine.MutationDetails; import org.pitest.mutationtest.engine.MutationIdentifier; +import org.pitest.mutationtest.engine.PoisonStatus; import org.pitest.pitclipse.example.Foo; import org.pitest.pitclipse.pitrunner.results.DetectionStatus; import org.pitest.pitclipse.pitrunner.results.Mutations; @@ -75,7 +76,7 @@ public static final ClassMutationResults aClassMutationResult() { Location location = new Location(ClassName.fromClass(Foo.class), MethodName.fromString("doFoo"), "doFoo"); MutationIdentifier id = new MutationIdentifier(location, 1, "SomeMutator"); MutationDetails md = new MutationDetails(id, "org/pitest/pitclipse/example/Foo.java", TEST_FACTORY.aString(), - 20, TEST_FACTORY.aRandomInt(), TEST_FACTORY.aRandomBoolean(), TEST_FACTORY.aRandomBoolean()); + 20, TEST_FACTORY.aRandomInt(), TEST_FACTORY.aRandomBoolean(), TEST_FACTORY.aRandomBoolean() ? PoisonStatus.MAY_POISON_JVM : PoisonStatus.NORMAL); MutationStatusTestPair status = new MutationStatusTestPair(TEST_FACTORY.aRandomInt(), org.pitest.mutationtest.DetectionStatus.KILLED, "org.pitest.pitclipse.example.ExampleTest"); MutationResult mutation = new MutationResult(md, status); diff --git a/pitrunner/src/test/java/org/pitest/pitclipse/pitrunner/results/summary/SummaryResultListenerTestData.java b/pitrunner/src/test/java/org/pitest/pitclipse/pitrunner/results/summary/SummaryResultListenerTestData.java index 1bdbbff5..447136dd 100644 --- a/pitrunner/src/test/java/org/pitest/pitclipse/pitrunner/results/summary/SummaryResultListenerTestData.java +++ b/pitrunner/src/test/java/org/pitest/pitclipse/pitrunner/results/summary/SummaryResultListenerTestData.java @@ -27,6 +27,7 @@ import org.pitest.mutationtest.engine.MethodName; import org.pitest.mutationtest.engine.MutationDetails; import org.pitest.mutationtest.engine.MutationIdentifier; +import org.pitest.mutationtest.engine.PoisonStatus; import org.pitest.pitclipse.example.Foo; import org.pitest.pitclipse.pitrunner.results.summary.SummaryResultListenerTestSugar.SummaryResultWrapper; import org.pitest.pitclipse.reloc.guava.base.Function; @@ -63,7 +64,7 @@ private static final ClassMutationResults aClassMutationResultForFooWithStatus(D Location location = new Location(ClassName.fromClass(Foo.class), MethodName.fromString("doFoo"), "doFoo"); MutationIdentifier id = new MutationIdentifier(location, 1, "SomeMutator"); MutationDetails md = new MutationDetails(id, "org/pitest/pitclipse/example/Foo.java", TEST_FACTORY.aString(), - 9, TEST_FACTORY.aRandomInt(), TEST_FACTORY.aRandomBoolean(), TEST_FACTORY.aRandomBoolean()); + 9, TEST_FACTORY.aRandomInt(), TEST_FACTORY.aRandomBoolean(), TEST_FACTORY.aRandomBoolean() ? PoisonStatus.MAY_POISON_JVM : PoisonStatus.NORMAL); MutationStatusTestPair status = new MutationStatusTestPair(TEST_FACTORY.aRandomInt(), detectionStatus, "org.pitest.pitclipse.example.ExampleTest"); MutationResult mutation = new MutationResult(md, status);