Maven verifier version bump and minor code inspection issues

hcoles · Dec 4, 2020 · 7876f3c · 7876f3c
1 parent b3d7529
commit 7876f3c
Show file tree

Hide file tree

Showing 61 changed files with 389 additions and 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
@@ -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<Integer, ClassName>     classIdToName = new ConcurrentHashMap<>();
@@ -93,9 +92,8 @@ private CoverageResult createCoverageResult(final SafeDataInputStream is,
       final Description d, Collection<BlockLocation> 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;
   }
 
 }
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
@@ -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<String> captureStdOutIfVerbose() {

diff --git a/...va/org/pitest/mutationtest/build/intercept/annotations/ExcludedAnnotationInterceptor.java b/...va/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<String> 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<Predicate<MutationDetails>> methods = clazz.methods().stream()
           .filter(hasAvoidedAnnotation())
@@ -50,8 +49,7 @@ public void begin(ClassTree clazz) {
 
   private Predicate<MethodTree> hasAvoidedAnnotation() {
     return a -> a.annotations().stream()
-        .filter(avoidedAnnotation())
-        .findFirst().isPresent();
+        .anyMatch(avoidedAnnotation());
   }
 
   private Predicate<AnnotationNode> avoidedAnnotation() {

diff --git a/...a/org/pitest/mutationtest/build/intercept/javafeatures/TryWithResourcesMethodVisitor.java b/...a/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<Integer> lines) {

diff --git a/...try/src/main/java/org/pitest/mutationtest/incremental/ObjectOutputStreamHistoryStore.java b/...try/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
@@ -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<MutationAnalysisUnit> 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
@@ -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<CoverageResult> 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<CoverageResult> 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
@@ -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
@@ -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;
   }
 
 }