From 7876f3c9723e6072e7968282f62027ab677e456f Mon Sep 17 00:00:00 2001 From: Henry Coles Date: Fri, 4 Dec 2020 10:29:25 +0000 Subject: [PATCH] Maven verifier version bump and minor code inspection issues --- .../org/pitest/coverage/execute/Receive.java | 18 +++-- .../mutationtest/build/WorkerFactory.java | 15 ++--- .../ExcludedAnnotationInterceptor.java | 18 +++-- .../TryWithResourcesMethodVisitor.java | 22 +++---- .../ObjectOutputStreamHistoryStore.java | 2 +- .../tooling/MutationCoverage.java | 20 ++---- .../execute/CoverageProcessSystemTest.java | 65 +++++++++---------- .../pitest/coverage/execute/ReceiveTest.java | 11 ++-- .../mutationtest/MutationMetaDataTest.java | 22 +++---- .../build/MutationSourceTest.java | 27 ++++---- .../ExcludedAnnotationInterceptorTest.java | 23 ++++--- .../EquivalentReturnMutationFilterTest.java | 22 +++---- .../intercept/javafeatures/FilterTester.java | 31 +++++---- .../incremental/HistoryListenerTest.java | 7 +- .../report/xml/XMLReportListenerTest.java | 22 +++---- .../MutationStatisticsListenerTest.java | 11 ++-- .../MutationStatisticsPrecursorTest.java | 6 +- .../mutationtest/statistics/ScoreTest.java | 17 +++-- .../tooling/JarCreatingJarFinderTest.java | 32 +++++---- .../html/MutationTestSummaryDataTest.java | 1 - pitest-maven-verification/pom.xml | 6 +- .../test/resources/pit-158-coverage/pom.xml | 2 +- .../test/resources/pit-263-yatspec/pom.xml | 2 +- .../pit-33-setUserDir-subModule/pom.xml | 2 +- .../test/resources/pit-33-setUserDir/pom.xml | 2 +- .../pit-deterministic-coverage/pom.xml | 2 +- .../pit-findOccupiedTestPackages/pom.xml | 2 +- .../resources/pit-junit-categories/pom.xml | 2 +- .../src/test/resources/pit-powermock/pom.xml | 2 +- .../test/resources/pit-process-hang/pom.xml | 2 +- .../resources/pit-site-reportonly/pom.xml | 2 +- .../src/test/resources/pit-sub-module/pom.xml | 2 +- .../pit-sub-module/sub-module-1/pom.xml | 2 +- .../pit-sub-module/sub-module-2/pom.xml | 2 +- .../resources/pit-surefire-excludes/pom.xml | 2 +- pitest-maven/pom.xml | 6 -- .../org/pitest/maven/AbstractPitMojo.java | 2 +- .../MojoToReportOptionsConverterTest.java | 35 +++++----- .../java/org/pitest/maven/PitMojoTest.java | 24 +++---- .../java/org/pitest/classpath/ClassPath.java | 8 +-- .../coverage/execute/CoverageMinion.java | 30 ++++----- .../execute/JavassistCoverageInterceptor.java | 15 ++--- .../dependency/DependencyExtractor.java | 19 +++--- .../org/pitest/functional/FCollection.java | 12 ---- .../execute/MutationTestMinion.java | 2 +- .../execute/MutationTestWorker.java | 25 ++++--- .../mocksupport/JavassistInterceptor.java | 9 ++- .../org/pitest/sequence/SequenceQuery.java | 4 +- .../java/org/pitest/util/ManifestUtils.java | 12 ++-- .../pitest/coverage/CoverageResultTest.java | 13 ++-- .../coverage/CoverageTransformerTest.java | 32 +++++---- .../engine/gregor/MutatorTestBase.java | 36 +++++----- .../engine/gregor/TestGregorMutater.java | 26 ++++---- .../mutators/ConstructorCallMutatorTest.java | 18 ++--- .../mutators/EmptyObjectReturnValsTest.java | 14 ++-- .../NonVoidMethodCallMutatorTest.java | 18 ++--- .../mutators/VoidMethodCallMutatorTest.java | 12 ++-- .../experimental/ReturnValuesMutatorTest.java | 14 ++-- .../execute/DefaultReporterTest.java | 17 +++-- .../execute/MutationTimeoutDecoratorTest.java | 16 ++--- pom.xml | 1 - 61 files changed, 389 insertions(+), 457 deletions(-) diff --git a/pitest-entry/src/main/java/org/pitest/coverage/execute/Receive.java b/pitest-entry/src/main/java/org/pitest/coverage/execute/Receive.java index 28c32aee6..91bf158ef 100644 --- a/pitest-entry/src/main/java/org/pitest/coverage/execute/Receive.java +++ b/pitest-entry/src/main/java/org/pitest/coverage/execute/Receive.java @@ -1,12 +1,5 @@ package org.pitest.coverage.execute; -import java.util.Collection; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Consumer; - import org.pitest.classinfo.ClassName; import org.pitest.coverage.BlockLocation; import org.pitest.coverage.CoverageResult; @@ -16,9 +9,15 @@ import org.pitest.util.Id; import org.pitest.util.ReceiveStrategy; import org.pitest.util.SafeDataInputStream; - import sun.pitest.CodeCoverageStore; +import java.util.Collection; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Consumer; + final class Receive implements ReceiveStrategy { private final Map classIdToName = new ConcurrentHashMap<>(); @@ -93,9 +92,8 @@ private CoverageResult createCoverageResult(final SafeDataInputStream is, final Description d, Collection visitedBlocks) { final boolean isGreen = is.readBoolean(); final int executionTime = is.readInt(); - final CoverageResult cr = new CoverageResult(d, executionTime, isGreen, + return new CoverageResult(d, executionTime, isGreen, visitedBlocks); - return cr; } } \ No newline at end of file diff --git a/pitest-entry/src/main/java/org/pitest/mutationtest/build/WorkerFactory.java b/pitest-entry/src/main/java/org/pitest/mutationtest/build/WorkerFactory.java index df2fa9a88..50c5fd6bf 100644 --- a/pitest-entry/src/main/java/org/pitest/mutationtest/build/WorkerFactory.java +++ b/pitest-entry/src/main/java/org/pitest/mutationtest/build/WorkerFactory.java @@ -1,11 +1,5 @@ package org.pitest.mutationtest.build; -import static org.pitest.functional.prelude.Prelude.printWith; - -import java.io.File; -import java.util.Collection; -import java.util.function.Consumer; - import org.pitest.classinfo.ClassName; import org.pitest.functional.prelude.Prelude; import org.pitest.mutationtest.EngineArguments; @@ -19,6 +13,12 @@ import org.pitest.util.Log; import org.pitest.util.SocketFinder; +import java.io.File; +import java.util.Collection; +import java.util.function.Consumer; + +import static org.pitest.functional.prelude.Prelude.printWith; + public class WorkerFactory { private final String classPath; @@ -61,9 +61,8 @@ public MutationTestProcess createWorker( .andStderr(printWith("stderr ")); final SocketFinder sf = new SocketFinder(); - final MutationTestProcess worker = new MutationTestProcess( + return new MutationTestProcess( sf.getNextAvailableServerSocket(), args, fileArgs); - return worker; } private Consumer captureStdOutIfVerbose() { diff --git a/pitest-entry/src/main/java/org/pitest/mutationtest/build/intercept/annotations/ExcludedAnnotationInterceptor.java b/pitest-entry/src/main/java/org/pitest/mutationtest/build/intercept/annotations/ExcludedAnnotationInterceptor.java index 9aa94a79b..cffeb1c1a 100644 --- a/pitest-entry/src/main/java/org/pitest/mutationtest/build/intercept/annotations/ExcludedAnnotationInterceptor.java +++ b/pitest-entry/src/main/java/org/pitest/mutationtest/build/intercept/annotations/ExcludedAnnotationInterceptor.java @@ -1,11 +1,5 @@ package org.pitest.mutationtest.build.intercept.annotations; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Collectors; - import org.objectweb.asm.tree.AnnotationNode; import org.pitest.bytecode.analysis.AnalysisFunctions; import org.pitest.bytecode.analysis.ClassTree; @@ -17,6 +11,12 @@ import org.pitest.mutationtest.engine.Mutater; import org.pitest.mutationtest.engine.MutationDetails; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Collectors; + public class ExcludedAnnotationInterceptor implements MutationInterceptor { private final List configuredAnnotations; @@ -37,8 +37,7 @@ public InterceptorType type() { @Override public void begin(ClassTree clazz) { this.skipClass = clazz.annotations().stream() - .filter(avoidedAnnotation()) - .findFirst().isPresent(); + .anyMatch(avoidedAnnotation()); if (!this.skipClass) { final List> methods = clazz.methods().stream() .filter(hasAvoidedAnnotation()) @@ -50,8 +49,7 @@ public void begin(ClassTree clazz) { private Predicate hasAvoidedAnnotation() { return a -> a.annotations().stream() - .filter(avoidedAnnotation()) - .findFirst().isPresent(); + .anyMatch(avoidedAnnotation()); } private Predicate avoidedAnnotation() { diff --git a/pitest-entry/src/main/java/org/pitest/mutationtest/build/intercept/javafeatures/TryWithResourcesMethodVisitor.java b/pitest-entry/src/main/java/org/pitest/mutationtest/build/intercept/javafeatures/TryWithResourcesMethodVisitor.java index aa26530a5..c8168a903 100644 --- a/pitest-entry/src/main/java/org/pitest/mutationtest/build/intercept/javafeatures/TryWithResourcesMethodVisitor.java +++ b/pitest-entry/src/main/java/org/pitest/mutationtest/build/intercept/javafeatures/TryWithResourcesMethodVisitor.java @@ -14,6 +14,16 @@ */ package org.pitest.mutationtest.build.intercept.javafeatures; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.pitest.bytecode.ASMVersion; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; + import static org.objectweb.asm.Opcodes.ALOAD; import static org.objectweb.asm.Opcodes.ASTORE; import static org.objectweb.asm.Opcodes.ATHROW; @@ -24,16 +34,6 @@ import static org.objectweb.asm.Opcodes.INVOKEINTERFACE; import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Set; - -import org.objectweb.asm.Label; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; -import org.pitest.bytecode.ASMVersion; - /** * Example of code that was generated by 1.7 compiler for try-with-resources * block: @@ -169,7 +169,7 @@ class TryWithResourcesMethodVisitor extends MethodVisitor { private int currentLineNumber; /** - * @param context + * @param lines * to store detected line numbers */ TryWithResourcesMethodVisitor(final Set lines) { diff --git a/pitest-entry/src/main/java/org/pitest/mutationtest/incremental/ObjectOutputStreamHistoryStore.java b/pitest-entry/src/main/java/org/pitest/mutationtest/incremental/ObjectOutputStreamHistoryStore.java index f64c7f593..5d05752c7 100644 --- a/pitest-entry/src/main/java/org/pitest/mutationtest/incremental/ObjectOutputStreamHistoryStore.java +++ b/pitest-entry/src/main/java/org/pitest/mutationtest/incremental/ObjectOutputStreamHistoryStore.java @@ -109,7 +109,7 @@ private void restoreResults() { private void restoreClassPath() { try { - final long classPathSize = Long.parseLong(this.input.readLine()); + final long classPathSize = Long.valueOf(this.input.readLine()); for (int i = 0; i != classPathSize; i++) { final ClassHistory coverage = deserialize(this.input.readLine(), ClassHistory.class); diff --git a/pitest-entry/src/main/java/org/pitest/mutationtest/tooling/MutationCoverage.java b/pitest-entry/src/main/java/org/pitest/mutationtest/tooling/MutationCoverage.java index 6baa50edc..9c136c3db 100644 --- a/pitest-entry/src/main/java/org/pitest/mutationtest/tooling/MutationCoverage.java +++ b/pitest-entry/src/main/java/org/pitest/mutationtest/tooling/MutationCoverage.java @@ -35,7 +35,6 @@ import org.pitest.classpath.CodeSource; import org.pitest.coverage.CoverageDatabase; import org.pitest.coverage.CoverageGenerator; -import org.pitest.coverage.CoverageSummary; import org.pitest.coverage.TestInfo; import org.pitest.functional.FCollection; import org.pitest.help.Help; @@ -61,7 +60,6 @@ import org.pitest.mutationtest.incremental.DefaultCodeHistory; import org.pitest.mutationtest.incremental.HistoryListener; import org.pitest.mutationtest.incremental.IncrementalAnalyser; -import org.pitest.mutationtest.statistics.MutationStatistics; import org.pitest.mutationtest.statistics.MutationStatisticsListener; import org.pitest.mutationtest.statistics.Score; import org.pitest.util.Log; @@ -156,10 +154,10 @@ public CombinedStatistics runReport() throws IOException { LOG.info("Completed in " + timeSpan(t0)); - final CombinedStatistics combinedStatistics = new CombinedStatistics(stats.getStatistics(), + printStats(stats); + + return new CombinedStatistics(stats.getStatistics(), coverageData.createSummary()); - printStats(combinedStatistics); - return combinedStatistics; } @@ -225,14 +223,13 @@ private void verifyBuildSuitableForMutationTesting() { this.strategies.buildVerifier().verify(this.code); } - private void printStats(final CombinedStatistics stats) { + private void printStats(final MutationStatisticsListener stats) { final PrintStream ps = System.out; ps.println(StringUtil.separatorLine('=')); ps.println("- Mutators"); ps.println(StringUtil.separatorLine('=')); - final MutationStatistics mutationStat = stats.getMutationStatistics(); - for (final Score each : mutationStat.getScores()) { + for (final Score each : stats.getStatistics().getScores()) { each.report(ps); ps.println(StringUtil.separatorLine()); } @@ -245,12 +242,7 @@ private void printStats(final CombinedStatistics stats) { ps.println(StringUtil.separatorLine('=')); ps.println("- Statistics"); ps.println(StringUtil.separatorLine('=')); - final CoverageSummary coverage = stats.getCoverageSummary(); - if (coverage != null) { - ps.println(String.format(">> Line Coverage: %d/%d (%d%%)", coverage.getNumberOfCoveredLines(), - coverage.getNumberOfLines(), coverage.getCoverage())); - } - mutationStat.report(ps); + stats.getStatistics().report(ps); } private List buildMutationTests( diff --git a/pitest-entry/src/test/java/org/pitest/coverage/execute/CoverageProcessSystemTest.java b/pitest-entry/src/test/java/org/pitest/coverage/execute/CoverageProcessSystemTest.java index b31a79436..1fe5a1729 100644 --- a/pitest-entry/src/test/java/org/pitest/coverage/execute/CoverageProcessSystemTest.java +++ b/pitest-entry/src/test/java/org/pitest/coverage/execute/CoverageProcessSystemTest.java @@ -1,24 +1,18 @@ package org.pitest.coverage.execute; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.function.Consumer; -import java.util.function.Predicate; -import java.util.stream.Collectors; - +import com.example.coverage.execute.samples.exceptions.CoveredBeforeExceptionTestee; +import com.example.coverage.execute.samples.exceptions.TestThrowsExceptionFromLargeMethodTestee; +import com.example.coverage.execute.samples.exceptions.TestThrowsExceptionInFinallyBlock; +import com.example.coverage.execute.samples.exceptions.TestsClassWithException; +import com.example.coverage.execute.samples.exceptions.ThrowsExceptionFromLargeMethodTestee; +import com.example.coverage.execute.samples.exceptions.ThrowsExceptionInFinallyBlockTestee; +import com.example.coverage.execute.samples.exceptions.ThrowsExceptionTestee; +import com.example.coverage.execute.samples.simple.Testee; +import com.example.coverage.execute.samples.simple.Testee2; +import com.example.coverage.execute.samples.simple.TesteeWithComplexConstructorsTest; +import com.example.coverage.execute.samples.simple.TesteeWithMultipleLines; +import com.example.coverage.execute.samples.simple.Tests; +import com.example.coverage.execute.samples.simple.TestsForMultiBlockCoverage; import org.junit.Test; import org.junit.experimental.categories.Category; import org.pitest.SystemTest; @@ -38,19 +32,24 @@ import org.pitest.util.SocketFinder; import org.pitest.util.XStreamCloning; -import com.example.coverage.execute.samples.exceptions.CoveredBeforeExceptionTestee; -import com.example.coverage.execute.samples.exceptions.TestThrowsExceptionFromLargeMethodTestee; -import com.example.coverage.execute.samples.exceptions.TestThrowsExceptionInFinallyBlock; -import com.example.coverage.execute.samples.exceptions.TestsClassWithException; -import com.example.coverage.execute.samples.exceptions.ThrowsExceptionFromLargeMethodTestee; -import com.example.coverage.execute.samples.exceptions.ThrowsExceptionInFinallyBlockTestee; -import com.example.coverage.execute.samples.exceptions.ThrowsExceptionTestee; -import com.example.coverage.execute.samples.simple.Testee; -import com.example.coverage.execute.samples.simple.Testee2; -import com.example.coverage.execute.samples.simple.TesteeWithComplexConstructorsTest; -import com.example.coverage.execute.samples.simple.TesteeWithMultipleLines; -import com.example.coverage.execute.samples.simple.Tests; -import com.example.coverage.execute.samples.simple.TestsForMultiBlockCoverage; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.function.Consumer; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; @Category(SystemTest.class) public class CoverageProcessSystemTest { @@ -402,7 +401,7 @@ private void assertCoverage( private boolean coversBlock( final List coveredClasses, final String testName, final int block) { - return coveredClasses.stream().filter(hitsBlock(testName, block)).findFirst().isPresent(); + return coveredClasses.stream().anyMatch(hitsBlock(testName, block)); } private Predicate hitsBlock(final String testName, diff --git a/pitest-entry/src/test/java/org/pitest/coverage/execute/ReceiveTest.java b/pitest-entry/src/test/java/org/pitest/coverage/execute/ReceiveTest.java index 2667fb619..657c4318e 100644 --- a/pitest-entry/src/test/java/org/pitest/coverage/execute/ReceiveTest.java +++ b/pitest-entry/src/test/java/org/pitest/coverage/execute/ReceiveTest.java @@ -1,9 +1,5 @@ package org.pitest.coverage.execute; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.mockito.Mockito.when; - import org.junit.Before; import org.junit.Test; import org.mockito.Mock; @@ -12,11 +8,14 @@ import org.pitest.testapi.Description; import org.pitest.util.Id; import org.pitest.util.SafeDataInputStream; - import sun.pitest.CodeCoverageStore; import java.util.function.Consumer; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.when; + // does this test add any value? public class ReceiveTest { @@ -69,7 +68,7 @@ private void recordTestCoverage(final int executionTime, final int classId, when(this.is.read(Description.class)).thenReturn(this.description); when(this.is.readInt()).thenReturn(1); - when(this.is.readLong()).thenReturn(1l, + when(this.is.readLong()).thenReturn(1L, CodeCoverageStore.encode(classId, probeNumber)); when(this.is.readBoolean()).thenReturn(testPassed); this.testee.apply(Id.OUTCOME, this.is); diff --git a/pitest-entry/src/test/java/org/pitest/mutationtest/MutationMetaDataTest.java b/pitest-entry/src/test/java/org/pitest/mutationtest/MutationMetaDataTest.java index 843e1b2a8..4025b9632 100644 --- a/pitest-entry/src/test/java/org/pitest/mutationtest/MutationMetaDataTest.java +++ b/pitest-entry/src/test/java/org/pitest/mutationtest/MutationMetaDataTest.java @@ -1,21 +1,20 @@ package org.pitest.mutationtest; -import static org.assertj.core.api.Assertions.assertThat; -import static org.pitest.mutationtest.LocationMother.aMutationId; -import static org.pitest.mutationtest.engine.MutationDetailsMother.aMutationDetail; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; - +import nl.jqno.equalsverifier.EqualsVerifier; import org.junit.Test; import org.pitest.classinfo.ClassName; import org.pitest.mutationtest.engine.Location; import org.pitest.mutationtest.engine.MethodName; import org.pitest.mutationtest.engine.MutationDetails; -import nl.jqno.equalsverifier.EqualsVerifier; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.pitest.mutationtest.LocationMother.aMutationId; +import static org.pitest.mutationtest.engine.MutationDetailsMother.aMutationDetail; public class MutationMetaDataTest { @@ -60,9 +59,8 @@ private MutationResult makeResult(String clazz, String method) { MethodName.fromString(method), "()V"); final MutationDetails md = aMutationDetail().withId( aMutationId().withLocation(location)).build(); - final MutationResult mr = new MutationResult(md, + return new MutationResult(md, MutationStatusTestPair.notAnalysed(0, DetectionStatus.KILLED)); - return mr; } } diff --git a/pitest-entry/src/test/java/org/pitest/mutationtest/build/MutationSourceTest.java b/pitest-entry/src/test/java/org/pitest/mutationtest/build/MutationSourceTest.java index 0f98d3d20..ae4bbe54d 100644 --- a/pitest-entry/src/test/java/org/pitest/mutationtest/build/MutationSourceTest.java +++ b/pitest-entry/src/test/java/org/pitest/mutationtest/build/MutationSourceTest.java @@ -1,16 +1,5 @@ package org.pitest.mutationtest.build; -import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.when; -import static org.pitest.mutationtest.LocationMother.aLocation; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.function.Function; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -21,7 +10,6 @@ import org.pitest.classpath.ClassloaderByteArraySource; import org.pitest.coverage.TestInfo; import org.pitest.functional.FCollection; -import java.util.Optional; import org.pitest.mutationtest.MutationConfig; import org.pitest.mutationtest.engine.Mutater; import org.pitest.mutationtest.engine.MutationDetails; @@ -29,6 +17,18 @@ import org.pitest.mutationtest.engine.MutationIdentifier; import org.pitest.process.LaunchOptions; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import java.util.function.Function; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.when; +import static org.pitest.mutationtest.LocationMother.aLocation; + @RunWith(MockitoJUnitRunner.class) public class MutationSourceTest { @@ -86,8 +86,7 @@ private Function timeToTestInfo() { } private List makeMutations(final String method) { - final List mutations = Arrays.asList(makeMutation(method)); - return mutations; + return Arrays.asList(makeMutation(method)); } private MutationDetails makeMutation(final String method) { diff --git a/pitest-entry/src/test/java/org/pitest/mutationtest/build/intercept/annotations/ExcludedAnnotationInterceptorTest.java b/pitest-entry/src/test/java/org/pitest/mutationtest/build/intercept/annotations/ExcludedAnnotationInterceptorTest.java index 5abbd74c6..3fb29c27e 100644 --- a/pitest-entry/src/test/java/org/pitest/mutationtest/build/intercept/annotations/ExcludedAnnotationInterceptorTest.java +++ b/pitest-entry/src/test/java/org/pitest/mutationtest/build/intercept/annotations/ExcludedAnnotationInterceptorTest.java @@ -1,15 +1,5 @@ package org.pitest.mutationtest.build.intercept.annotations; -import static org.assertj.core.api.Assertions.assertThat; -import static org.pitest.mutationtest.engine.MutationDetailsMother.aMutationDetail; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - import org.junit.Before; import org.junit.Test; import org.pitest.bytecode.analysis.ClassTree; @@ -22,6 +12,16 @@ import org.pitest.mutationtest.engine.gregor.MethodMutatorFactory; import org.pitest.mutationtest.engine.gregor.mutators.VoidMethodCallMutator; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.pitest.mutationtest.engine.MutationDetailsMother.aMutationDetail; + public class ExcludedAnnotationInterceptorTest { ExcludedAnnotationInterceptor testee = new ExcludedAnnotationInterceptor(Arrays.asList("TestGeneratedAnnotation", "AnotherTestAnnotation")); @@ -70,8 +70,7 @@ public void shouldFilterMethodsWithGeneratedAnnotation() { private Collection runWithTestee( Collection input, Class clazz) { this.testee.begin(treeFor(clazz)); - final Collection actual = this.testee.intercept(input, this.mutator); - return actual; + return this.testee.intercept(input, this.mutator); } private Collection someMutations() { diff --git a/pitest-entry/src/test/java/org/pitest/mutationtest/build/intercept/equivalent/EquivalentReturnMutationFilterTest.java b/pitest-entry/src/test/java/org/pitest/mutationtest/build/intercept/equivalent/EquivalentReturnMutationFilterTest.java index 2e924bd31..40eeaea62 100644 --- a/pitest-entry/src/test/java/org/pitest/mutationtest/build/intercept/equivalent/EquivalentReturnMutationFilterTest.java +++ b/pitest-entry/src/test/java/org/pitest/mutationtest/build/intercept/equivalent/EquivalentReturnMutationFilterTest.java @@ -1,15 +1,5 @@ package org.pitest.mutationtest.build.intercept.equivalent; -import static org.assertj.core.api.Assertions.assertThat; -import static org.pitest.mutationtest.engine.gregor.mutators.BooleanFalseReturnValsMutator.BOOLEAN_FALSE_RETURN; -import static org.pitest.mutationtest.engine.gregor.mutators.BooleanTrueReturnValsMutator.BOOLEAN_TRUE_RETURN; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Optional; -import java.util.Set; - import org.junit.Test; import org.pitest.mutationtest.build.InterceptorType; import org.pitest.mutationtest.build.MutationInterceptor; @@ -18,6 +8,16 @@ import org.pitest.mutationtest.engine.gregor.mutators.NullReturnValsMutator; import org.pitest.mutationtest.engine.gregor.mutators.PrimitiveReturnsMutator; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import java.util.Set; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.pitest.mutationtest.engine.gregor.mutators.BooleanFalseReturnValsMutator.BOOLEAN_FALSE_RETURN; +import static org.pitest.mutationtest.engine.gregor.mutators.BooleanTrueReturnValsMutator.BOOLEAN_TRUE_RETURN; + public class EquivalentReturnMutationFilterTest { MutationInterceptor testee = new EquivalentReturnMutationFilter().createInterceptor(null); @@ -263,7 +263,7 @@ public long a() { class AlreadyReturnsBoxedZeroLong { public Long a() { - return 0l; + return 0L; } } diff --git a/pitest-entry/src/test/java/org/pitest/mutationtest/build/intercept/javafeatures/FilterTester.java b/pitest-entry/src/test/java/org/pitest/mutationtest/build/intercept/javafeatures/FilterTester.java index c187d2167..7d780770a 100755 --- a/pitest-entry/src/test/java/org/pitest/mutationtest/build/intercept/javafeatures/FilterTester.java +++ b/pitest-entry/src/test/java/org/pitest/mutationtest/build/intercept/javafeatures/FilterTester.java @@ -1,19 +1,5 @@ package org.pitest.mutationtest.build.intercept.javafeatures; -import static org.assertj.core.api.Assertions.assertThat; - -import java.text.MessageFormat; -import java.util.Arrays; -import java.util.Collection; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Optional; -import java.util.Set; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import org.assertj.core.api.Condition; import org.assertj.core.api.SoftAssertions; import org.pitest.bytecode.analysis.ClassTree; @@ -29,6 +15,20 @@ import org.pitest.mutationtest.engine.gregor.MethodMutatorFactory; import org.pitest.util.ResourceFolderByteArraySource; +import java.text.MessageFormat; +import java.util.Arrays; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static org.assertj.core.api.Assertions.assertThat; + public class FilterTester { private static final Collection COMPILERS = Arrays.asList("javac", @@ -262,8 +262,7 @@ private GregorMutater mutateFromClassLoader() { private String makeClassName(String sample, String compiler) { - final String clazz = MessageFormat.format(this.path, sample, compiler); - return clazz; + return MessageFormat.format(this.path, sample, compiler); } diff --git a/pitest-entry/src/test/java/org/pitest/mutationtest/incremental/HistoryListenerTest.java b/pitest-entry/src/test/java/org/pitest/mutationtest/incremental/HistoryListenerTest.java index 5ace77889..2148e6d02 100644 --- a/pitest-entry/src/test/java/org/pitest/mutationtest/incremental/HistoryListenerTest.java +++ b/pitest-entry/src/test/java/org/pitest/mutationtest/incremental/HistoryListenerTest.java @@ -1,7 +1,5 @@ package org.pitest.mutationtest.incremental; -import static org.mockito.Mockito.verify; - import org.junit.Before; import org.junit.Test; import org.mockito.Mock; @@ -13,6 +11,8 @@ import org.pitest.mutationtest.MutationStatusTestPair; import org.pitest.mutationtest.report.MutationTestResultMother; +import static org.mockito.Mockito.verify; + public class HistoryListenerTest { private HistoryListener testee; @@ -36,10 +36,9 @@ public void shouldRecordMutationResults() { } private MutationResult makeResult() { - final MutationResult mr = new MutationResult( + return new MutationResult( MutationTestResultMother.createDetails(), MutationStatusTestPair.notAnalysed(0, DetectionStatus.KILLED)); - return mr; } } diff --git a/pitest-entry/src/test/java/org/pitest/mutationtest/report/xml/XMLReportListenerTest.java b/pitest-entry/src/test/java/org/pitest/mutationtest/report/xml/XMLReportListenerTest.java index fcc18e567..eda8a1b0e 100644 --- a/pitest-entry/src/test/java/org/pitest/mutationtest/report/xml/XMLReportListenerTest.java +++ b/pitest-entry/src/test/java/org/pitest/mutationtest/report/xml/XMLReportListenerTest.java @@ -14,14 +14,6 @@ */ package org.pitest.mutationtest.report.xml; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.io.StringWriter; -import java.io.Writer; -import java.util.Arrays; - import org.junit.Before; import org.junit.Test; import org.pitest.mutationtest.DetectionStatus; @@ -29,6 +21,14 @@ import org.pitest.mutationtest.MutationStatusTestPair; import org.pitest.mutationtest.report.MutationTestResultMother; +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.util.Arrays; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class XMLReportListenerTest { private XMLReportListener testee; @@ -88,10 +88,9 @@ public void shouldEscapeNullBytes() { private MutationResult createdKilledMutationWithKillingTestOf( final String killingTest) { - final MutationResult mr = new MutationResult( + return new MutationResult( MutationTestResultMother.createDetails(), new MutationStatusTestPair(1, DetectionStatus.KILLED, killingTest)); - return mr; } @Test @@ -104,10 +103,9 @@ public void shouldOutputNoneWhenNoKillingTestFound() throws IOException { } private MutationResult createSurvivingMutant() { - final MutationResult mr = new MutationResult( + return new MutationResult( MutationTestResultMother.createDetails(), MutationStatusTestPair.notAnalysed(1, DetectionStatus.SURVIVED)); - return mr; } } diff --git a/pitest-entry/src/test/java/org/pitest/mutationtest/statistics/MutationStatisticsListenerTest.java b/pitest-entry/src/test/java/org/pitest/mutationtest/statistics/MutationStatisticsListenerTest.java index 9e5ff0f4b..b1ddbdd0f 100644 --- a/pitest-entry/src/test/java/org/pitest/mutationtest/statistics/MutationStatisticsListenerTest.java +++ b/pitest-entry/src/test/java/org/pitest/mutationtest/statistics/MutationStatisticsListenerTest.java @@ -14,10 +14,6 @@ */ package org.pitest.mutationtest.statistics; -import static org.junit.Assert.assertTrue; - -import java.util.function.Predicate; - import org.junit.Before; import org.junit.Test; import org.pitest.functional.FCollection; @@ -27,6 +23,10 @@ import org.pitest.mutationtest.MutationStatusTestPair; import org.pitest.mutationtest.report.MutationTestResultMother; +import java.util.function.Predicate; + +import static org.junit.Assert.assertTrue; + public class MutationStatisticsListenerTest { private MutationStatisticsListener testee; @@ -44,10 +44,9 @@ public void shouldGatherStatistics() { } private MutationResult makeResult() { - final MutationResult mr = new MutationResult( + return new MutationResult( MutationTestResultMother.createDetails("foo.java"), new MutationStatusTestPair(1, DetectionStatus.KILLED, "foo")); - return mr; } private boolean hasResultFor(final String mutator) { diff --git a/pitest-entry/src/test/java/org/pitest/mutationtest/statistics/MutationStatisticsPrecursorTest.java b/pitest-entry/src/test/java/org/pitest/mutationtest/statistics/MutationStatisticsPrecursorTest.java index cd4d0435c..0ab29dece 100644 --- a/pitest-entry/src/test/java/org/pitest/mutationtest/statistics/MutationStatisticsPrecursorTest.java +++ b/pitest-entry/src/test/java/org/pitest/mutationtest/statistics/MutationStatisticsPrecursorTest.java @@ -180,10 +180,9 @@ private MutationResult makeResult(final DetectionStatus status) { private MutationResult makeResult(final DetectionStatus status, final int numberOfTests) { - final MutationResult mr = new MutationResult( + return new MutationResult( MutationTestResultMother.createDetails("foo.java"), new MutationStatusTestPair(numberOfTests, status, "foo")); - return mr; } private String[] generateReportLines() { @@ -191,7 +190,6 @@ private String[] generateReportLines() { final PrintStream out = new PrintStream(s); this.testee.toStatistics().report(out); final String actual = new String(s.toByteArray()); - final String[] ss = actual.split(StringUtil.newLine()); - return ss; + return actual.split(StringUtil.newLine()); } } diff --git a/pitest-entry/src/test/java/org/pitest/mutationtest/statistics/ScoreTest.java b/pitest-entry/src/test/java/org/pitest/mutationtest/statistics/ScoreTest.java index ce9362d82..b2cad9908 100644 --- a/pitest-entry/src/test/java/org/pitest/mutationtest/statistics/ScoreTest.java +++ b/pitest-entry/src/test/java/org/pitest/mutationtest/statistics/ScoreTest.java @@ -14,19 +14,19 @@ */ package org.pitest.mutationtest.statistics; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; -import java.util.function.Predicate; - import org.junit.Before; import org.junit.Test; import org.pitest.functional.FCollection; import org.pitest.mutationtest.DetectionStatus; import org.pitest.util.StringUtil; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.function.Predicate; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class ScoreTest { private ScorePrecursor testee; @@ -75,8 +75,7 @@ private String[] generateReportLines() { final PrintStream out = new PrintStream(s); this.testee.toScore().report(out); final String actual = new String(s.toByteArray()); - final String[] ss = actual.split(StringUtil.newLine()); - return ss; + return actual.split(StringUtil.newLine()); } @Test diff --git a/pitest-entry/src/test/java/org/pitest/mutationtest/tooling/JarCreatingJarFinderTest.java b/pitest-entry/src/test/java/org/pitest/mutationtest/tooling/JarCreatingJarFinderTest.java index d9eb3199d..31ae0c235 100644 --- a/pitest-entry/src/test/java/org/pitest/mutationtest/tooling/JarCreatingJarFinderTest.java +++ b/pitest-entry/src/test/java/org/pitest/mutationtest/tooling/JarCreatingJarFinderTest.java @@ -14,19 +14,6 @@ */ package org.pitest.mutationtest.tooling; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.when; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.jar.Attributes; -import java.util.jar.JarInputStream; -import java.util.jar.Manifest; - import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -36,9 +23,22 @@ import org.mockito.MockitoAnnotations; import org.pitest.boot.HotSwapAgent; import org.pitest.classinfo.ClassByteArraySource; -import java.util.Optional; import org.pitest.util.PitError; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.Optional; +import java.util.jar.Attributes; +import java.util.jar.JarInputStream; +import java.util.jar.Manifest; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.when; + public class JarCreatingJarFinderTest { private JarCreatingJarFinder testee; @@ -136,9 +136,7 @@ private String getGeneratedManifestAttribute(final String key) try (JarInputStream jis = new JarInputStream(new FileInputStream(f))) { final Manifest m = jis.getManifest(); final Attributes a = m.getMainAttributes(); - final String am = a.getValue(key); - - return am; + return a.getValue(key); } } } diff --git a/pitest-html-report/src/test/java/org/pitest/mutationtest/report/html/MutationTestSummaryDataTest.java b/pitest-html-report/src/test/java/org/pitest/mutationtest/report/html/MutationTestSummaryDataTest.java index 9fa1088af..40d5cbff4 100644 --- a/pitest-html-report/src/test/java/org/pitest/mutationtest/report/html/MutationTestSummaryDataTest.java +++ b/pitest-html-report/src/test/java/org/pitest/mutationtest/report/html/MutationTestSummaryDataTest.java @@ -12,7 +12,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.List; import java.util.TreeSet; import java.util.stream.Collectors; diff --git a/pitest-maven-verification/pom.xml b/pitest-maven-verification/pom.xml index 050671ec3..40e73322b 100644 --- a/pitest-maven-verification/pom.xml +++ b/pitest-maven-verification/pom.xml @@ -95,15 +95,15 @@ - org.apache.maven.shared + org.apache.maven.plugin-testing maven-plugin-testing-harness - 1.1 + 3.3.0 test org.apache.maven.shared maven-verifier - ${maven-verifier} + 1.7.2 test diff --git a/pitest-maven-verification/src/test/resources/pit-158-coverage/pom.xml b/pitest-maven-verification/src/test/resources/pit-158-coverage/pom.xml index 62b649736..c6e1912e7 100644 --- a/pitest-maven-verification/src/test/resources/pit-158-coverage/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-158-coverage/pom.xml @@ -22,7 +22,7 @@ junit junit - 4.13.1 + 4.8.2 diff --git a/pitest-maven-verification/src/test/resources/pit-263-yatspec/pom.xml b/pitest-maven-verification/src/test/resources/pit-263-yatspec/pom.xml index f2768c584..b273c1dc8 100644 --- a/pitest-maven-verification/src/test/resources/pit-263-yatspec/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-263-yatspec/pom.xml @@ -47,7 +47,7 @@ junit junit - 4.13.1 + 4.12 test diff --git a/pitest-maven-verification/src/test/resources/pit-33-setUserDir/pit-33-setUserDir-subModule/pom.xml b/pitest-maven-verification/src/test/resources/pit-33-setUserDir/pit-33-setUserDir-subModule/pom.xml index c941dae55..bf34832ad 100644 --- a/pitest-maven-verification/src/test/resources/pit-33-setUserDir/pit-33-setUserDir-subModule/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-33-setUserDir/pit-33-setUserDir-subModule/pom.xml @@ -36,6 +36,6 @@ - 4.13.1 + 4.8.1 \ No newline at end of file diff --git a/pitest-maven-verification/src/test/resources/pit-33-setUserDir/pom.xml b/pitest-maven-verification/src/test/resources/pit-33-setUserDir/pom.xml index f51907c7a..69a28a7bc 100644 --- a/pitest-maven-verification/src/test/resources/pit-33-setUserDir/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-33-setUserDir/pom.xml @@ -39,7 +39,7 @@ - 4.13.1 + 4.8.1 pit-33-setUserDir-subModule diff --git a/pitest-maven-verification/src/test/resources/pit-deterministic-coverage/pom.xml b/pitest-maven-verification/src/test/resources/pit-deterministic-coverage/pom.xml index 6a77356df..ca60c0566 100644 --- a/pitest-maven-verification/src/test/resources/pit-deterministic-coverage/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-deterministic-coverage/pom.xml @@ -41,7 +41,7 @@ - 4.13.1 + 4.8.1 diff --git a/pitest-maven-verification/src/test/resources/pit-findOccupiedTestPackages/pom.xml b/pitest-maven-verification/src/test/resources/pit-findOccupiedTestPackages/pom.xml index 177a3fdc0..7877d7c93 100644 --- a/pitest-maven-verification/src/test/resources/pit-findOccupiedTestPackages/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-findOccupiedTestPackages/pom.xml @@ -16,7 +16,7 @@ junit junit - 4.13.1 + 4.8.2 diff --git a/pitest-maven-verification/src/test/resources/pit-junit-categories/pom.xml b/pitest-maven-verification/src/test/resources/pit-junit-categories/pom.xml index 8060a837e..9938e8d09 100644 --- a/pitest-maven-verification/src/test/resources/pit-junit-categories/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-junit-categories/pom.xml @@ -10,7 +10,7 @@ junit junit - 4.13.1 + 4.12 test diff --git a/pitest-maven-verification/src/test/resources/pit-powermock/pom.xml b/pitest-maven-verification/src/test/resources/pit-powermock/pom.xml index 9734b81d1..e125e3c09 100644 --- a/pitest-maven-verification/src/test/resources/pit-powermock/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-powermock/pom.xml @@ -69,7 +69,7 @@ - 4.13.1 + 4.12 1.7.3 diff --git a/pitest-maven-verification/src/test/resources/pit-process-hang/pom.xml b/pitest-maven-verification/src/test/resources/pit-process-hang/pom.xml index a2ce06dee..9ca5801f3 100644 --- a/pitest-maven-verification/src/test/resources/pit-process-hang/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-process-hang/pom.xml @@ -16,7 +16,7 @@ junit junit - 4.13.1 + 4.8.2 diff --git a/pitest-maven-verification/src/test/resources/pit-site-reportonly/pom.xml b/pitest-maven-verification/src/test/resources/pit-site-reportonly/pom.xml index 6507ae48c..dfcf6b3e2 100644 --- a/pitest-maven-verification/src/test/resources/pit-site-reportonly/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-site-reportonly/pom.xml @@ -10,7 +10,7 @@ junit junit - 4.13.1 + 4.11 test diff --git a/pitest-maven-verification/src/test/resources/pit-sub-module/pom.xml b/pitest-maven-verification/src/test/resources/pit-sub-module/pom.xml index 270f68520..a6d2db655 100644 --- a/pitest-maven-verification/src/test/resources/pit-sub-module/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-sub-module/pom.xml @@ -49,7 +49,7 @@ - 4.13.1 + 4.8.1 sub-module-1 diff --git a/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-1/pom.xml b/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-1/pom.xml index 4079993fc..845f89a4f 100644 --- a/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-1/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-1/pom.xml @@ -32,6 +32,6 @@ - 4.13.1 + 4.8.1 diff --git a/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-2/pom.xml b/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-2/pom.xml index 67c0723fb..92d6e17b5 100644 --- a/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-2/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-sub-module/sub-module-2/pom.xml @@ -32,6 +32,6 @@ - 4.13.1 + 4.8.1 diff --git a/pitest-maven-verification/src/test/resources/pit-surefire-excludes/pom.xml b/pitest-maven-verification/src/test/resources/pit-surefire-excludes/pom.xml index bc8c88979..febdb9941 100644 --- a/pitest-maven-verification/src/test/resources/pit-surefire-excludes/pom.xml +++ b/pitest-maven-verification/src/test/resources/pit-surefire-excludes/pom.xml @@ -10,7 +10,7 @@ junit junit - 4.13.1 + 4.11 test diff --git a/pitest-maven/pom.xml b/pitest-maven/pom.xml index 1610f865f..e405229c3 100644 --- a/pitest-maven/pom.xml +++ b/pitest-maven/pom.xml @@ -197,12 +197,6 @@ 1.1 test - - org.apache.maven.shared - maven-verifier - ${maven-verifier} - test - 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 7eee561e6..0203fa0c8 100644 --- a/pitest-maven/src/main/java/org/pitest/maven/AbstractPitMojo.java +++ b/pitest-maven/src/main/java/org/pitest/maven/AbstractPitMojo.java @@ -171,7 +171,7 @@ public class AbstractPitMojo extends AbstractMojo { /** * Arguments to pass to child processes */ - @Parameter(property = "jvmArgs") + @Parameter private ArrayList jvmArgs; /** 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 1543fcbe7..60b2b5a1a 100644 --- a/pitest-maven/src/test/java/org/pitest/maven/MojoToReportOptionsConverterTest.java +++ b/pitest-maven/src/test/java/org/pitest/maven/MojoToReportOptionsConverterTest.java @@ -14,12 +14,16 @@ */ package org.pitest.maven; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.AdditionalAnswers.returnsFirstArg; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.DependencyResolutionRequiredException; +import org.apache.maven.model.Build; +import org.apache.maven.model.Model; +import org.apache.maven.model.Plugin; +import org.codehaus.plexus.util.xml.Xpp3Dom; +import org.mockito.Mockito; +import org.pitest.mutationtest.config.ConfigOption; +import org.pitest.mutationtest.config.ReportOptions; +import org.pitest.util.Unchecked; import java.io.File; import java.util.ArrayList; @@ -31,16 +35,12 @@ import java.util.Set; import java.util.function.Predicate; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.DependencyResolutionRequiredException; -import org.apache.maven.model.Build; -import org.apache.maven.model.Model; -import org.apache.maven.model.Plugin; -import org.codehaus.plexus.util.xml.Xpp3Dom; -import org.mockito.Mockito; -import org.pitest.mutationtest.config.ConfigOption; -import org.pitest.mutationtest.config.ReportOptions; -import org.pitest.util.Unchecked; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.AdditionalAnswers.returnsFirstArg; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class MojoToReportOptionsConverterTest extends BasePitMojoTest { @@ -417,8 +417,7 @@ private ReportOptions parseConfig(final String xml) { any(Xpp3Dom.class))).then(returnsFirstArg()); this.testee = new MojoToReportOptionsConverter(mojo, this.surefireConverter, filter); - final ReportOptions actual = this.testee.convert(); - return actual; + return this.testee.convert(); } catch (final Exception ex) { throw Unchecked.translateCheckedException(ex); } diff --git a/pitest-maven/src/test/java/org/pitest/maven/PitMojoTest.java b/pitest-maven/src/test/java/org/pitest/maven/PitMojoTest.java index 2bc96d193..ff77171a8 100644 --- a/pitest-maven/src/test/java/org/pitest/maven/PitMojoTest.java +++ b/pitest-maven/src/test/java/org/pitest/maven/PitMojoTest.java @@ -1,15 +1,5 @@ package org.pitest.maven; -import static java.util.Arrays.asList; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import java.io.File; -import java.util.Collections; -import java.util.Map; - import org.apache.maven.model.Build; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -21,6 +11,16 @@ import org.pitest.mutationtest.statistics.Score; import org.pitest.mutationtest.tooling.CombinedStatistics; +import java.io.File; +import java.util.Collections; +import java.util.Map; + +import static java.util.Arrays.asList; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + public class PitMojoTest extends BasePitMojoTest { private AbstractPitMojo testee; @@ -130,7 +130,7 @@ public void testAllowsSurvivingMutantsThresholdToBeZero() public void testThrowsMojoFailureExceptionWhenCoverageBelowThreshold() throws Exception { this.testee = createPITMojo(createPomWithConfiguration("50")); - setupCoverage(100l, 100, 40); + setupCoverage(100L, 100, 40); try { this.testee.execute(); fail(); @@ -142,7 +142,7 @@ public void testThrowsMojoFailureExceptionWhenCoverageBelowThreshold() public void testDoesNotThrowMojoFailureExceptionWhenCoverageOnThreshold() throws Exception { this.testee = createPITMojo(createPomWithConfiguration("50")); - setupCoverage(100l, 100, 50); + setupCoverage(100L, 100, 50); try { this.testee.execute(); // pass diff --git a/pitest/src/main/java/org/pitest/classpath/ClassPath.java b/pitest/src/main/java/org/pitest/classpath/ClassPath.java index 053ff64e3..c1832f2e8 100644 --- a/pitest/src/main/java/org/pitest/classpath/ClassPath.java +++ b/pitest/src/main/java/org/pitest/classpath/ClassPath.java @@ -37,8 +37,6 @@ import org.pitest.util.PitError; import org.pitest.util.StreamUtil; -import static org.pitest.util.ManifestUtils.CLASSPATH_JAR_FILE_PREFIX; - public class ClassPath { private static final Logger LOG = Log.getLogger(); @@ -117,7 +115,7 @@ public URL findResource(final String name) { public static Collection getClassPathElementsAsPaths() { final Set filesAsString = new LinkedHashSet<>(); - FCollection.mapTo(getClassPathElementsAsFiles(), File::getPath, + FCollection.mapTo(getClassPathElementsAsFiles(), file -> file.getPath(), filesAsString); return filesAsString; } @@ -140,8 +138,8 @@ public static Collection getClassPathElementsAsFiles() { * @param elements existing elements */ private static void addEntriesFromClasspathManifest(final Set elements) { - Optional maybeJar = elements.stream().filter(f -> f.getName().startsWith(CLASSPATH_JAR_FILE_PREFIX) && f.getName().endsWith(".jar")) - .findFirst(); + Optional maybeJar = elements.stream().filter( f -> f.getName().startsWith("classpath") && f.getName().endsWith(".jar")) + .findFirst(); maybeJar.ifPresent(file -> elements.addAll(ManifestUtils.readClasspathManifest(file))); } diff --git a/pitest/src/main/java/org/pitest/coverage/execute/CoverageMinion.java b/pitest/src/main/java/org/pitest/coverage/execute/CoverageMinion.java index bcadbb929..6f530e853 100644 --- a/pitest/src/main/java/org/pitest/coverage/execute/CoverageMinion.java +++ b/pitest/src/main/java/org/pitest/coverage/execute/CoverageMinion.java @@ -14,19 +14,6 @@ */ package org.pitest.coverage.execute; -import static org.pitest.util.Unchecked.translateCheckedException; - -import java.io.BufferedOutputStream; -import java.io.IOException; -import java.net.Socket; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.function.Predicate; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - import org.pitest.boot.HotSwapAgent; import org.pitest.classinfo.ClassName; import org.pitest.classpath.ClassPathByteArraySource; @@ -47,9 +34,21 @@ import org.pitest.util.IsolationUtils; import org.pitest.util.Log; import org.pitest.util.SafeDataInputStream; - import sun.pitest.CodeCoverageStore; +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.net.Socket; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.function.Predicate; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +import static org.pitest.util.Unchecked.translateCheckedException; + public class CoverageMinion { private static final Logger LOG = Log.getLogger(); @@ -163,8 +162,7 @@ private static Configuration createTestPlugin( final CoverageOptions paramsFromParent) { final ClientPluginServices plugins = new ClientPluginServices(IsolationUtils.getContextClassLoader()); final MinionSettings factory = new MinionSettings(plugins); - final Configuration testPlugin = factory.getTestFrameworkPlugin(paramsFromParent.getPitConfig(), ClassloaderByteArraySource.fromContext()); - return testPlugin; + return factory.getTestFrameworkPlugin(paramsFromParent.getPitConfig(), ClassloaderByteArraySource.fromContext()); } private static void verifyEnvironment(Configuration config) { diff --git a/pitest/src/main/java/org/pitest/coverage/execute/JavassistCoverageInterceptor.java b/pitest/src/main/java/org/pitest/coverage/execute/JavassistCoverageInterceptor.java index 1f46c3def..ecb54d202 100644 --- a/pitest/src/main/java/org/pitest/coverage/execute/JavassistCoverageInterceptor.java +++ b/pitest/src/main/java/org/pitest/coverage/execute/JavassistCoverageInterceptor.java @@ -14,12 +14,6 @@ */ package org.pitest.coverage.execute; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.pitest.bytecode.FrameOptions; @@ -33,6 +27,12 @@ import org.pitest.util.Unchecked; import sun.pitest.CodeCoverageStore; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + public final class JavassistCoverageInterceptor { private static final Map COMPUTE_CACHE = new ConcurrentHashMap<>(); @@ -61,8 +61,7 @@ public static InputStream openClassfile(final Object classPath, // NO_UCD private static byte[] getOriginalBytes(final Object classPath, final String name) throws IOException { try (InputStream is = returnNormalBytes(classPath,name)) { - final byte[] bs = StreamUtil.streamToByteArray(is); - return bs; + return StreamUtil.streamToByteArray(is); } } diff --git a/pitest/src/main/java/org/pitest/dependency/DependencyExtractor.java b/pitest/src/main/java/org/pitest/dependency/DependencyExtractor.java index 2b6d154d8..ae3f6f8eb 100644 --- a/pitest/src/main/java/org/pitest/dependency/DependencyExtractor.java +++ b/pitest/src/main/java/org/pitest/dependency/DependencyExtractor.java @@ -14,7 +14,12 @@ */ package org.pitest.dependency; -import static org.pitest.functional.prelude.Prelude.and; +import org.objectweb.asm.ClassReader; +import org.pitest.bytecode.NullVisitor; +import org.pitest.classinfo.ClassByteArraySource; +import org.pitest.functional.FCollection; +import org.pitest.util.Functions; +import org.pitest.util.Log; import java.io.IOException; import java.util.ArrayList; @@ -25,6 +30,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.TreeSet; import java.util.function.BiFunction; @@ -32,13 +38,7 @@ import java.util.function.Predicate; import java.util.logging.Logger; -import org.objectweb.asm.ClassReader; -import org.pitest.bytecode.NullVisitor; -import org.pitest.classinfo.ClassByteArraySource; -import org.pitest.functional.FCollection; -import java.util.Optional; -import org.pitest.util.Functions; -import org.pitest.util.Log; +import static org.pitest.functional.prelude.Prelude.and; public class DependencyExtractor { private static final Logger LOG = Log.getLogger(); @@ -183,12 +183,11 @@ private static Predicate nameIsEqual(final String clazz) { private static Consumer constructCollectingSideEffectForVisitor( final List dependencies, final Predicate predicate) { - final Consumer se = a -> { + return a -> { if (predicate.test(a)) { dependencies.add(a); } }; - return se; } } diff --git a/pitest/src/main/java/org/pitest/functional/FCollection.java b/pitest/src/main/java/org/pitest/functional/FCollection.java index c2f672358..8e7397e20 100644 --- a/pitest/src/main/java/org/pitest/functional/FCollection.java +++ b/pitest/src/main/java/org/pitest/functional/FCollection.java @@ -82,18 +82,6 @@ public static void filter(final Iterable xs, } } - - public static java.util.Optional findFirst(final Iterable xs, - final Predicate predicate) { - for (final T x : xs) { - if (predicate.test(x)) { - return java.util.Optional.ofNullable(x); - } - } - return java.util.Optional.empty(); - } - - public static boolean contains(final Iterable xs, final Predicate predicate) { for (final T x : xs) { diff --git a/pitest/src/main/java/org/pitest/mutationtest/execute/MutationTestMinion.java b/pitest/src/main/java/org/pitest/mutationtest/execute/MutationTestMinion.java index 886e3612e..3db235917 100644 --- a/pitest/src/main/java/org/pitest/mutationtest/execute/MutationTestMinion.java +++ b/pitest/src/main/java/org/pitest/mutationtest/execute/MutationTestMinion.java @@ -121,7 +121,7 @@ public static void main(final String[] args) { enablePowerMockSupport(); - final int port = Integer.parseInt(args[0]); + final int port = Integer.valueOf(args[0]); Socket s = null; try { diff --git a/pitest/src/main/java/org/pitest/mutationtest/execute/MutationTestWorker.java b/pitest/src/main/java/org/pitest/mutationtest/execute/MutationTestWorker.java index 99a2cc0cf..e027cc1d1 100644 --- a/pitest/src/main/java/org/pitest/mutationtest/execute/MutationTestWorker.java +++ b/pitest/src/main/java/org/pitest/mutationtest/execute/MutationTestWorker.java @@ -14,17 +14,6 @@ */ package org.pitest.mutationtest.execute; -import static org.pitest.util.Unchecked.translateCheckedException; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.stream.Collectors; - import org.pitest.classinfo.ClassName; import org.pitest.functional.F3; import org.pitest.mutationtest.DetectionStatus; @@ -44,6 +33,17 @@ import org.pitest.testapi.execute.containers.UnContainer; import org.pitest.util.Log; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.stream.Collectors; + +import static org.pitest.util.Unchecked.translateCheckedException; + public class MutationTestWorker { private static final Logger LOG = Log @@ -156,7 +156,7 @@ private MutationStatusTestPair handleCoveredMutation( } private static Container createNewContainer() { - final Container c = new UnContainer() { + return new UnContainer() { @Override public List execute(final TestUnit group) { final List results = new ArrayList<>(); @@ -166,7 +166,6 @@ public List execute(final TestUnit group) { return results; } }; - return c; } diff --git a/pitest/src/main/java/org/pitest/mutationtest/mocksupport/JavassistInterceptor.java b/pitest/src/main/java/org/pitest/mutationtest/mocksupport/JavassistInterceptor.java index 5b888e1d4..ad9746407 100644 --- a/pitest/src/main/java/org/pitest/mutationtest/mocksupport/JavassistInterceptor.java +++ b/pitest/src/main/java/org/pitest/mutationtest/mocksupport/JavassistInterceptor.java @@ -14,14 +14,14 @@ */ package org.pitest.mutationtest.mocksupport; -import java.io.ByteArrayInputStream; -import java.io.InputStream; - import org.pitest.classinfo.ClassName; import org.pitest.mutationtest.engine.Mutant; import org.pitest.reflection.Reflection; import org.pitest.util.Unchecked; +import java.io.ByteArrayInputStream; +import java.io.InputStream; + public final class JavassistInterceptor { private JavassistInterceptor() { @@ -34,9 +34,8 @@ public static InputStream openClassfile(final Object classPath, // NO_UCD final String name) { if (isMutatedClass(name)) { - final ByteArrayInputStream bais = new ByteArrayInputStream( + return new ByteArrayInputStream( mutant.getBytes()); - return bais; } else { return returnNormalBytes(classPath, name); } diff --git a/pitest/src/main/java/org/pitest/sequence/SequenceQuery.java b/pitest/src/main/java/org/pitest/sequence/SequenceQuery.java index e8b813203..b086b03e1 100644 --- a/pitest/src/main/java/org/pitest/sequence/SequenceQuery.java +++ b/pitest/src/main/java/org/pitest/sequence/SequenceQuery.java @@ -114,9 +114,7 @@ static class Repeat implements Partial { public State make(State andThen) { final Split placeHolder = new Split<>(null, null); final State right = this.r.make(placeHolder); - final Split split = new Split<>(right, andThen); - - placeHolder.out1 = split; + placeHolder.out1 = new Split<>(right, andThen); return placeHolder; } diff --git a/pitest/src/main/java/org/pitest/util/ManifestUtils.java b/pitest/src/main/java/org/pitest/util/ManifestUtils.java index 403fb7405..38ba051f1 100644 --- a/pitest/src/main/java/org/pitest/util/ManifestUtils.java +++ b/pitest/src/main/java/org/pitest/util/ManifestUtils.java @@ -34,8 +34,6 @@ */ public class ManifestUtils { - public static final String CLASSPATH_JAR_FILE_PREFIX = "pitest-classpath-jar-file-"; - // Method based on // https://github.com/JetBrains/intellij-community/blob/master/java/java-runtime/src/com/intellij/rt/execution/testFrameworks/ForkedByModuleSplitter.java // JetBrains copyright notice and licence retained above. @@ -45,7 +43,7 @@ public static File createClasspathJarFile(String classpath) final Attributes attributes = manifest.getMainAttributes(); attributes.put(Attributes.Name.MANIFEST_VERSION, "1.0"); - StringBuilder classpathForManifest = new StringBuilder(); + String classpathForManifest = ""; int idx = 0; int endIdx = 0; while (endIdx >= 0) { @@ -53,15 +51,15 @@ public static File createClasspathJarFile(String classpath) String path = endIdx < 0 ? classpath.substring(idx) : classpath.substring(idx, endIdx); if (classpathForManifest.length() > 0) { - classpathForManifest.append(" "); + classpathForManifest += " "; } - classpathForManifest.append(new File(path).toURI().toURL().toString()); + classpathForManifest += new File(path).toURI().toURL().toString(); idx = endIdx + File.pathSeparator.length(); } - attributes.put(Attributes.Name.CLASS_PATH, classpathForManifest.toString()); + attributes.put(Attributes.Name.CLASS_PATH, classpathForManifest); - File jarFile = File.createTempFile(CLASSPATH_JAR_FILE_PREFIX, ".jar"); + File jarFile = File.createTempFile("classpath", ".jar"); try (BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(jarFile)); ZipOutputStream jarPlugin = new JarOutputStream(out, manifest); ) { diff --git a/pitest/src/test/java/org/pitest/coverage/CoverageResultTest.java b/pitest/src/test/java/org/pitest/coverage/CoverageResultTest.java index 1850c9203..748ddb025 100644 --- a/pitest/src/test/java/org/pitest/coverage/CoverageResultTest.java +++ b/pitest/src/test/java/org/pitest/coverage/CoverageResultTest.java @@ -1,15 +1,15 @@ package org.pitest.coverage; -import static org.junit.Assert.assertEquals; - -import java.util.Arrays; -import java.util.Collections; - import org.junit.Test; import org.pitest.classinfo.ClassName; import org.pitest.mutationtest.engine.Location; import org.pitest.mutationtest.engine.MethodName; +import java.util.Arrays; +import java.util.Collections; + +import static org.junit.Assert.assertEquals; + public class CoverageResultTest { private CoverageResult testee; @@ -38,8 +38,7 @@ public void shouldCalculateCorrectNumberOfCoveredBlocksWhenMultiplesClassesHaveC private BlockLocation makeCoverage(final String name, final int block) { final Location l = Location.location(ClassName.fromString(name), MethodName.fromString("amethod"), "methodDesc"); - final BlockLocation bl = new BlockLocation(l, block, 0, 1); - return bl; + return new BlockLocation(l, block, 0, 1); } } diff --git a/pitest/src/test/java/org/pitest/coverage/CoverageTransformerTest.java b/pitest/src/test/java/org/pitest/coverage/CoverageTransformerTest.java index 119831335..819124a1c 100644 --- a/pitest/src/test/java/org/pitest/coverage/CoverageTransformerTest.java +++ b/pitest/src/test/java/org/pitest/coverage/CoverageTransformerTest.java @@ -1,19 +1,5 @@ package org.pitest.coverage; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.lang.instrument.IllegalClassFormatException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Vector; -import java.util.concurrent.ConcurrentHashMap; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -29,10 +15,23 @@ import org.pitest.functional.predicate.False; import org.pitest.util.IsolationUtils; import org.pitest.util.StreamUtil; - import sun.pitest.CodeCoverageStore; import sun.pitest.InvokeReceiver; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.lang.instrument.IllegalClassFormatException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Vector; +import java.util.concurrent.ConcurrentHashMap; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class CoverageTransformerTest { private final ClassLoader loader = IsolationUtils @@ -110,9 +109,8 @@ private byte[] transform(final Class clazz) throws IllegalClassFormatException { final CoverageTransformer testee = new CoverageTransformer( s -> true); - final byte[] bs = testee.transform(this.loader, clazz.getName(), null, + return testee.transform(this.loader, clazz.getName(), null, null, this.bytes.getBytes(clazz.getName()).get()); - return bs; } } diff --git a/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/MutatorTestBase.java b/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/MutatorTestBase.java index cbac8390e..f9ab943a1 100644 --- a/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/MutatorTestBase.java +++ b/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/MutatorTestBase.java @@ -14,22 +14,6 @@ */ package org.pitest.mutationtest.engine.gregor; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.Arrays; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; - import org.objectweb.asm.ClassReader; import org.objectweb.asm.util.ASMifier; import org.objectweb.asm.util.CheckClassAdapter; @@ -46,6 +30,22 @@ import org.pitest.util.Unchecked; import org.pitest.util.XStreamCloning; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public abstract class MutatorTestBase { protected GregorMutater engine; @@ -114,10 +114,8 @@ protected T mutateAndCall(final Callable unmutated, final Mutant mutant) } private ClassLoader createClassLoader(final Mutant mutant) throws Exception { - final TransformingClassLoader loader = new TransformingClassLoader( + return new TransformingClassLoader( createTransformation(mutant), new ExcludedPrefixIsolationStrategy()); - - return loader; } private Transformation createTransformation(final Mutant mutant) { diff --git a/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/TestGregorMutater.java b/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/TestGregorMutater.java index fd5baefac..c3b60369f 100644 --- a/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/TestGregorMutater.java +++ b/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/TestGregorMutater.java @@ -14,15 +14,6 @@ */ package org.pitest.mutationtest.engine.gregor; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.util.Collection; -import java.util.List; -import java.util.function.Predicate; - import org.junit.Test; import org.pitest.functional.FCollection; import org.pitest.mutationtest.engine.MutationDetails; @@ -33,6 +24,15 @@ import org.pitest.mutationtest.engine.gregor.mutators.ReturnValsMutator; import org.pitest.util.ResourceFolderByteArraySource; +import java.util.Collection; +import java.util.List; +import java.util.function.Predicate; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class TestGregorMutater extends MutatorTestBase { public static class HasMultipleMutations { @@ -58,13 +58,13 @@ public void shouldFindMutationsFromAllSuppliedMutators() throws Exception { final List actualDetails = findMutationsFor(HasMultipleMutations.class); assertTrue(actualDetails.stream() - .filter(descriptionContaining("Replaced Shift Left with Shift Right")).findFirst().isPresent()); + .anyMatch(descriptionContaining("Replaced Shift Left with Shift Right"))); assertTrue(actualDetails.stream() - .filter(descriptionContaining("replaced return of integer")).findFirst().isPresent()); + .anyMatch(descriptionContaining("replaced return of integer"))); assertTrue(actualDetails.stream() - .filter(descriptionContaining("Changed increment")).findFirst().isPresent()); + .anyMatch(descriptionContaining("Changed increment"))); assertTrue(actualDetails.stream() - .filter(descriptionContaining("removed negation")).findFirst().isPresent()); + .anyMatch(descriptionContaining("removed negation"))); } @Test diff --git a/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/ConstructorCallMutatorTest.java b/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/ConstructorCallMutatorTest.java index 915ad3b82..96f96c236 100644 --- a/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/ConstructorCallMutatorTest.java +++ b/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/ConstructorCallMutatorTest.java @@ -15,14 +15,6 @@ package org.pitest.mutationtest.engine.gregor.mutators; -import static org.assertj.core.api.Assertions.assertThat; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.function.Predicate; - import org.junit.Before; import org.junit.Test; import org.pitest.mutationtest.engine.Mutant; @@ -31,6 +23,14 @@ import org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutatorTest.HasIntMethodCall; import org.pitest.mutationtest.engine.gregor.mutators.VoidMethodCallMutatorTest.HasVoidMethodCall; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.function.Predicate; + +import static org.assertj.core.api.Assertions.assertThat; + public class ConstructorCallMutatorTest extends MutatorTestBase { static class HasConstructorCall implements Callable { @@ -122,6 +122,6 @@ public void shouldCreateViableClassWhenMutatingArrayListConstructor() private static void assertDoesNotContain(Collection c, Predicate p) { - assertThat(c.stream().filter(p).findFirst().isPresent()).isFalse(); + assertThat(c.stream().anyMatch(p)).isFalse(); } } diff --git a/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/EmptyObjectReturnValsTest.java b/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/EmptyObjectReturnValsTest.java index bc6c2e72a..7ec693b1e 100644 --- a/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/EmptyObjectReturnValsTest.java +++ b/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/EmptyObjectReturnValsTest.java @@ -1,6 +1,9 @@ package org.pitest.mutationtest.engine.gregor.mutators; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.Before; +import org.junit.Test; +import org.pitest.mutationtest.engine.MutationDetails; +import org.pitest.mutationtest.engine.gregor.MutatorTestBase; import java.util.Collection; import java.util.Collections; @@ -8,10 +11,7 @@ import java.util.Set; import java.util.concurrent.Callable; -import org.junit.Before; -import org.junit.Test; -import org.pitest.mutationtest.engine.MutationDetails; -import org.pitest.mutationtest.engine.gregor.MutatorTestBase; +import static org.assertj.core.api.Assertions.assertThat; public class EmptyObjectReturnValsTest extends MutatorTestBase { @@ -71,7 +71,7 @@ public void describesMutationsToChars() { @Test public void mutatesBoxedLongsToZero() throws Exception { assertMutantCallableReturns(new BoxedLong(), - createFirstMutant(BoxedLong.class), 0l); + createFirstMutant(BoxedLong.class), 0L); } @Test @@ -193,7 +193,7 @@ public Character call() throws Exception { private static class BoxedLong implements Callable { @Override public Long call() throws Exception { - return 1l; + return 1L; } } diff --git a/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/NonVoidMethodCallMutatorTest.java b/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/NonVoidMethodCallMutatorTest.java index 308254fc1..cd1ff0cf0 100644 --- a/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/NonVoidMethodCallMutatorTest.java +++ b/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/NonVoidMethodCallMutatorTest.java @@ -15,14 +15,6 @@ package org.pitest.mutationtest.engine.gregor.mutators; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.util.Collection; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.logging.Logger; - import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -31,6 +23,14 @@ import org.pitest.mutationtest.engine.gregor.MutatorTestBase; import org.pitest.mutationtest.engine.gregor.mutators.ConstructorCallMutatorTest.HasConstructorCall; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.logging.Logger; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class NonVoidMethodCallMutatorTest extends MutatorTestBase { @Before @@ -69,7 +69,7 @@ public void shouldNotRemoveVoidMethodCalls() throws Exception { @Test public void shouldNotRemoveConstructorCalls() throws Exception { final List actual = findMutationsFor(HasConstructorCall.class); - assertFalse(actual.stream().filter(descriptionContaining("Integer")).findFirst().isPresent()); + assertFalse(actual.stream().anyMatch(descriptionContaining("Integer"))); } private static class HasObjectMethodCall implements Callable { diff --git a/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/VoidMethodCallMutatorTest.java b/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/VoidMethodCallMutatorTest.java index 50ccf1d5a..173da2c4c 100644 --- a/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/VoidMethodCallMutatorTest.java +++ b/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/VoidMethodCallMutatorTest.java @@ -15,10 +15,6 @@ package org.pitest.mutationtest.engine.gregor.mutators; -import static org.junit.Assert.assertTrue; - -import java.util.concurrent.Callable; - import org.junit.Before; import org.junit.Test; import org.pitest.mutationtest.engine.Mutant; @@ -26,6 +22,10 @@ import org.pitest.mutationtest.engine.gregor.mutators.ConstructorCallMutatorTest.HasConstructorCall; import org.pitest.mutationtest.engine.gregor.mutators.NonVoidMethodCallMutatorTest.HasIntMethodCall; +import java.util.concurrent.Callable; + +import static org.junit.Assert.assertTrue; + public class VoidMethodCallMutatorTest extends MutatorTestBase { @Before @@ -82,7 +82,7 @@ public String call() throws Exception { final double a = 1; final String b = "foo"; try { - set(1, 2l, a, this, b); + set(1, 2L, a, this, b); } finally { return "" + this.i; } @@ -112,7 +112,7 @@ public String call() throws Exception { final double a = 1; final String b = "foo"; try { - set(1, 2l, a, this, b); + set(1, 2L, a, this, b); } finally { return "" + i; } diff --git a/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/experimental/ReturnValuesMutatorTest.java b/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/experimental/ReturnValuesMutatorTest.java index 3b03a0431..794972f4a 100644 --- a/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/experimental/ReturnValuesMutatorTest.java +++ b/pitest/src/test/java/org/pitest/mutationtest/engine/gregor/mutators/experimental/ReturnValuesMutatorTest.java @@ -15,16 +15,16 @@ */ package org.pitest.mutationtest.engine.gregor.mutators.experimental; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.util.concurrent.Callable; - import org.junit.Before; import org.junit.Test; import org.pitest.mutationtest.engine.Mutant; import org.pitest.mutationtest.engine.gregor.MutatorTestBase; +import java.util.concurrent.Callable; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class ReturnValuesMutatorTest extends MutatorTestBase { @Before @@ -297,8 +297,8 @@ public Long call() throws Exception { public void shouldMutateReturnOfLongToValuePlus1() throws Exception { final Mutant mutant = getFirstMutant(HasLongReturn.class); assertMutantCallableReturns( - new HasLongReturn(Long.valueOf(Integer.MAX_VALUE + 5l)), mutant, - Long.valueOf(Integer.MAX_VALUE + 6l)); + new HasLongReturn(Long.valueOf(Integer.MAX_VALUE + 5L)), mutant, + Long.valueOf(Integer.MAX_VALUE + 6L)); } @Test diff --git a/pitest/src/test/java/org/pitest/mutationtest/execute/DefaultReporterTest.java b/pitest/src/test/java/org/pitest/mutationtest/execute/DefaultReporterTest.java index 0120619f9..1bb4c4975 100644 --- a/pitest/src/test/java/org/pitest/mutationtest/execute/DefaultReporterTest.java +++ b/pitest/src/test/java/org/pitest/mutationtest/execute/DefaultReporterTest.java @@ -1,12 +1,5 @@ package org.pitest.mutationtest.execute; -import static org.junit.Assert.assertEquals; -import static org.pitest.mutationtest.LocationMother.aMutationId; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; - import org.junit.Before; import org.junit.Test; import org.pitest.mutationtest.DetectionStatus; @@ -16,6 +9,13 @@ import org.pitest.util.Id; import org.pitest.util.SafeDataInputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; + +import static org.junit.Assert.assertEquals; +import static org.pitest.mutationtest.LocationMother.aMutationId; + public class DefaultReporterTest { private DefaultReporter testee; @@ -52,9 +52,8 @@ public void shouldSendDetectionStatus() throws IOException { } private SafeDataInputStream resultToStream() { - final SafeDataInputStream is = new SafeDataInputStream( + return new SafeDataInputStream( new ByteArrayInputStream(this.os.toByteArray())); - return is; } @Test diff --git a/pitest/src/test/java/org/pitest/mutationtest/execute/MutationTimeoutDecoratorTest.java b/pitest/src/test/java/org/pitest/mutationtest/execute/MutationTimeoutDecoratorTest.java index c2d3d1646..f055cd6e8 100644 --- a/pitest/src/test/java/org/pitest/mutationtest/execute/MutationTimeoutDecoratorTest.java +++ b/pitest/src/test/java/org/pitest/mutationtest/execute/MutationTimeoutDecoratorTest.java @@ -14,12 +14,6 @@ */ package org.pitest.mutationtest.execute; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -30,6 +24,12 @@ import org.pitest.testapi.ResultCollector; import org.pitest.testapi.TestUnit; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + public class MutationTimeoutDecoratorTest { private MutationTimeoutDecorator testee; @@ -58,7 +58,7 @@ public void setUp() { @Test public void shouldCompleteNormallyWhenChildExecutesWithinAllowedTime() { when(this.timeoutStrategy.getAllowedTime(NORMAL_EXECUTION)).thenReturn( - 1000l); + 1000L); this.testee.execute(this.rc); verify(this.child).execute(any(ResultCollector.class)); verify(this.sideEffect, never()).apply(); @@ -67,7 +67,7 @@ public void shouldCompleteNormallyWhenChildExecutesWithinAllowedTime() { @Test @Ignore("flakey") public void shouldApplySideEffectWhenChildRunsForLongerThanAllowedTime() { - when(this.timeoutStrategy.getAllowedTime(NORMAL_EXECUTION)).thenReturn(50l); + when(this.timeoutStrategy.getAllowedTime(NORMAL_EXECUTION)).thenReturn(50L); doAnswer(invocation -> { Thread.sleep(100); diff --git a/pom.xml b/pom.xml index ca5c13648..6f0c1c819 100644 --- a/pom.xml +++ b/pom.xml @@ -314,7 +314,6 @@ 1.9.4 1.3 4.11 - 1.5 2.2.1 1.7.3 2.17