diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/Location.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/Location.java
index 465bc13607a08f02e8f68af4bf79cbaf9b17924c..ba4b19ed1d8c8bf08645123cfc3b48077ef4201e 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/Location.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/Location.java
@@ -40,4 +40,37 @@ public class Location {
return file + "(" + (lineNr + 1) + ")";
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((file == null) ? 0 : file.hashCode());
+ result = prime * result + lineNr;
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ Location other = (Location) obj;
+ if (lineNr != other.lineNr) {
+ return false;
+ }
+ if (file == null) {
+ if (other.file != null) {
+ return false;
+ }
+ } else if (!file.equals(other.file)) {
+ return false;
+ }
+ return true;
+ }
}
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/Problem.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/Problem.java
index 273df22d8ff44b4cd3140abaaf0b7f0edfcfd260..5aeb19aef390a62bb570048197c01df058ae8490 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/Problem.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/Problem.java
@@ -25,6 +25,7 @@ package com.oracle.truffle.r.test.packages.analyzer;
import java.util.Comparator;
import java.util.Objects;
+import com.oracle.truffle.r.test.packages.analyzer.detectors.Detector;
import com.oracle.truffle.r.test.packages.analyzer.model.RPackage;
import com.oracle.truffle.r.test.packages.analyzer.model.RPackageTestRun;
@@ -35,10 +36,12 @@ public abstract class Problem {
private final RPackageTestRun pkgTestRun;
private final Location location;
+ private final Detector<?> detector;
- protected Problem(RPackageTestRun pkg, Location location) {
+ protected Problem(RPackageTestRun pkg, Detector<?> detector, Location location) {
this.pkgTestRun = Objects.requireNonNull(pkg);
this.location = Objects.requireNonNull(location);
+ this.detector = Objects.requireNonNull(detector);
}
public RPackage getPackage() {
@@ -53,6 +56,10 @@ public abstract class Problem {
return location;
}
+ public Detector<?> getDetector() {
+ return detector;
+ }
+
/**
* Returns a one-line summary of the problem (e.g.
* <q>RuntimeException occurred</q>).
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/Detector.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/Detector.java
index b904fd36eff91bf02a70ca8c6301002b5d562706..b71512b5e51415511a5add23996e8ed1c71343a0 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/Detector.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/Detector.java
@@ -23,6 +23,7 @@
package com.oracle.truffle.r.test.packages.analyzer.detectors;
import java.util.Collection;
+import java.util.LinkedList;
import com.oracle.truffle.r.test.packages.analyzer.Location;
import com.oracle.truffle.r.test.packages.analyzer.Problem;
@@ -33,14 +34,23 @@ public abstract class Detector<T> {
/** Semantics: If a child reports an error for a particular location, the parent doesn't. */
protected Detector<?> parent;
+ protected final Collection<Detector<?>> children = new LinkedList<>();
+
public Detector(Detector<?> parent) {
this.parent = parent;
+ if (parent != null) {
+ parent.children.add(this);
+ }
}
public Detector<?> getParent() {
return parent;
}
+ public Collection<Detector<?>> getChildren() {
+ return children;
+ }
+
public abstract String getName();
/**
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/DiffDetector.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/DiffDetector.java
index 87f184b6bf576bdcedc86894d6debe93f4b37937..8cd40a6d7176a75ebbad84e15cd8e042eaf1f5a9 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/DiffDetector.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/DiffDetector.java
@@ -60,7 +60,7 @@ public class DiffDetector extends Detector<List<DiffChunk>> {
} else {
summary = "Major difference in test output";
}
- problems.add(new DiffProblem(pkg, diffChunk.getLocation(), summary, diffChunk));
+ problems.add(new DiffProblem(pkg, this, diffChunk.getLocation(), summary, diffChunk));
}
return problems;
}
@@ -78,8 +78,8 @@ public class DiffDetector extends Detector<List<DiffChunk>> {
private final String summary;
private final DiffChunk diffChunk;
- protected DiffProblem(RPackageTestRun pkg, Location location, String summary, DiffChunk diffChunk) {
- super(pkg, location);
+ protected DiffProblem(RPackageTestRun pkg, DiffDetector detector, Location location, String summary, DiffChunk diffChunk) {
+ super(pkg, detector, location);
this.summary = Objects.requireNonNull(summary);
this.diffChunk = Objects.requireNonNull(diffChunk);
}
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/DummyDetector.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/DummyDetector.java
new file mode 100644
index 0000000000000000000000000000000000000000..c9c7e2a50775cd3b65c2f9f2db737a552e29f617
--- /dev/null
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/DummyDetector.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.r.test.packages.analyzer.detectors;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import com.oracle.truffle.r.test.packages.analyzer.Location;
+import com.oracle.truffle.r.test.packages.analyzer.Problem;
+import com.oracle.truffle.r.test.packages.analyzer.model.RPackageTestRun;
+
+public final class DummyDetector extends Detector<Void> {
+
+ public static final DummyDetector INSTANCE = new DummyDetector();
+
+ private DummyDetector() {
+ super(null);
+ }
+
+ @Override
+ public String getName() {
+ return "Dummy detector";
+ }
+
+ @Override
+ public Collection<Problem> detect(RPackageTestRun pkgTestRun, Location startLineLocation, Void body) {
+ return Collections.emptyList();
+ }
+
+}
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/InstallationProblemDetector.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/InstallationProblemDetector.java
index 0e44c19aa6f47c95d7b492f7235000385a642347..b63d31b1d5a274a6fcc4bee78685afc50b058885 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/InstallationProblemDetector.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/InstallationProblemDetector.java
@@ -52,8 +52,7 @@ public class InstallationProblemDetector extends LineDetector {
for (String line : body) {
Matcher matcher = pattern.matcher(line);
if (matcher.matches()) {
- return Collections.singletonList(
- new PackageInstallationProblem(pkg, new Location(startLocation.file, lineNr), line));
+ return Collections.singletonList(new PackageInstallationProblem(pkg, this, new Location(startLocation.file, lineNr), line));
}
++lineNr;
}
@@ -64,8 +63,8 @@ public class InstallationProblemDetector extends LineDetector {
private final String message;
- public PackageInstallationProblem(RPackageTestRun pkg, Location location, String message) {
- super(pkg, location);
+ public PackageInstallationProblem(RPackageTestRun pkg, InstallationProblemDetector detector, Location location, String message) {
+ super(pkg, detector, location);
this.message = message;
}
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/RErrorDetector.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/RErrorDetector.java
index 4208e2f90de8dc47da6738eab3289a690a30dfab..6f304037442499e61d0c18c2ed1673139cc08996 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/RErrorDetector.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/RErrorDetector.java
@@ -68,7 +68,7 @@ public class RErrorDetector extends LineDetector {
message = it.next();
++i;
}
- problems.add(new RErrorProblem(pkg, new Location(startLocation.file, i + lineOffset), callString, message));
+ problems.add(new RErrorProblem(pkg, this, new Location(startLocation.file, i + lineOffset), callString, message));
}
}
@@ -80,8 +80,8 @@ public class RErrorDetector extends LineDetector {
private final String callString;
private final String message;
- protected RErrorProblem(RPackageTestRun pkg, Location location, String callString, String message) {
- super(pkg, location);
+ protected RErrorProblem(RPackageTestRun pkg, RErrorDetector detector, Location location, String callString, String message) {
+ super(pkg, detector, location);
this.callString = callString;
this.message = message;
}
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/RInternalErrorDetector.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/RInternalErrorDetector.java
index 43793ec9c94d366454a64a58afe0eeeb5d0bfa55..56b5e78cedd8a748cc08ebf527e7f1632dedea1d 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/RInternalErrorDetector.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/RInternalErrorDetector.java
@@ -54,7 +54,7 @@ public class RInternalErrorDetector extends LineDetector {
int indexOf = line.indexOf(P);
if (indexOf != -1) {
String message = line.substring(indexOf + P.length());
- problems.add(new RInternalErrorProblem(pkg, new Location(startLocation.file, lineNr), message));
+ problems.add(new RInternalErrorProblem(pkg, this, new Location(startLocation.file, lineNr), message));
}
++lineNr;
}
@@ -65,8 +65,8 @@ public class RInternalErrorDetector extends LineDetector {
private final String message;
- protected RInternalErrorProblem(RPackageTestRun pkg, Location location, String message) {
- super(pkg, location);
+ protected RInternalErrorProblem(RPackageTestRun pkg, RInternalErrorDetector detector, Location location, String message) {
+ super(pkg, detector, location);
this.message = message;
}
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/SegfaultDetector.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/SegfaultDetector.java
index 94e508b463e94e78f97489f2d6d258c80fdd5d8f..7e3c2ebbc09f66003d3d816d376bcf2f185efd8b 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/SegfaultDetector.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/SegfaultDetector.java
@@ -63,7 +63,7 @@ public class SegfaultDetector extends LineDetector {
++lineNr;
}
if (collect) {
- return Collections.singleton(new SegfaultProblem(pkg, new Location(startLocation.file, lineNr), segfaultMessage.toString()));
+ return Collections.singleton(new SegfaultProblem(pkg, this, new Location(startLocation.file, lineNr), segfaultMessage.toString()));
}
return Collections.emptyList();
}
@@ -72,8 +72,8 @@ public class SegfaultDetector extends LineDetector {
private final String message;
- protected SegfaultProblem(RPackageTestRun pkg, Location location, String message) {
- super(pkg, location);
+ protected SegfaultProblem(RPackageTestRun pkg, SegfaultDetector detector, Location location, String message) {
+ super(pkg, detector, location);
this.message = message;
}
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/UnsupportedSpecializationDetector.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/UnsupportedSpecializationDetector.java
index d9e2379809f60ad71c826ccf0a1a7798d52ac380..99f270940e23845ce25a4c3b260b9f278ca748d4 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/UnsupportedSpecializationDetector.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/UnsupportedSpecializationDetector.java
@@ -60,7 +60,7 @@ public class UnsupportedSpecializationDetector extends LineDetector {
if (matcher.find()) {
message = matcher.group("MSG");
problemStartLine = lineNr;
- problems.add(new UnsupportedSpecializationProblem(pkg, new Location(startLocation.file, problemStartLine), message));
+ problems.add(new UnsupportedSpecializationProblem(pkg, this, new Location(startLocation.file, problemStartLine), message));
}
++lineNr;
}
@@ -69,8 +69,8 @@ public class UnsupportedSpecializationDetector extends LineDetector {
private static class UnsupportedSpecializationProblem extends Problem {
- protected UnsupportedSpecializationProblem(RPackageTestRun pkg, Location location, String message) {
- super(pkg, location);
+ protected UnsupportedSpecializationProblem(RPackageTestRun pkg, UnsupportedSpecializationDetector detector, Location location, String message) {
+ super(pkg, detector, location);
this.message = message;
}
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/AbstractDumper.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/AbstractDumper.java
index ff4ef7de99fc87760a21bca94bc92b85dbc588cc..58f85539eebd4eae9cdd6807fa52d8f81aa8d74f 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/AbstractDumper.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/AbstractDumper.java
@@ -24,11 +24,15 @@ package com.oracle.truffle.r.test.packages.analyzer.dump;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.stream.Collectors;
import com.oracle.truffle.r.test.packages.analyzer.Problem;
+import com.oracle.truffle.r.test.packages.analyzer.detectors.Detector;
import com.oracle.truffle.r.test.packages.analyzer.model.RPackage;
import com.oracle.truffle.r.test.packages.analyzer.model.RPackageTestRun;
import com.oracle.truffle.r.test.packages.analyzer.parser.LogFileParseException;
@@ -60,6 +64,42 @@ public abstract class AbstractDumper {
return problems.stream().collect(Collectors.groupingBy(p -> new ProblemContent(p)));
}
+ protected static Collection<Problem> eliminateRedundantProblems(Collection<Problem> problems) {
+ // build detector hierarchy
+ Set<Detector<?>> collect = problems.stream().map(p -> p.getDetector()).collect(Collectors.toSet());
+ Map<Detector<?>, Collection<Detector<?>>> hierarchy = new HashMap<>();
+ for (Detector<?> detector : collect) {
+ hierarchy.put(detector, collectChildrenRecursive(detector));
+ }
+
+ Map<Detector<?>, List<Problem>> collect2 = problems.stream().collect(Collectors.groupingBy(p -> p.getDetector()));
+
+ return problems.stream().filter(p -> isIncluded(p, hierarchy, collect2)).collect(Collectors.toList());
+ }
+
+ /**
+ * Returns {@code false} if any of the problem detector's children has reported a problem in the
+ * same location. Returns {@code true} otherwise.
+ */
+ private static boolean isIncluded(Problem p, Map<Detector<?>, Collection<Detector<?>>> hierarchy, Map<Detector<?>, List<Problem>> collect2) {
+ Collection<Detector<?>> children = hierarchy.get(p.getDetector());
+ for (Detector<?> childDetector : children) {
+ for (Problem childProblem : collect2.get(childDetector)) {
+ if (childProblem.getLocation().equals(p.getLocation())) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ private static Collection<Detector<?>> collectChildrenRecursive(Detector<?> detector) {
+ Collection<Detector<?>> all = new LinkedList<>();
+ all.addAll(detector.getChildren());
+ detector.getChildren().stream().forEach(c -> all.addAll(collectChildrenRecursive(c)));
+ return all;
+ }
+
protected static class ProblemContent {
final Problem representitive;
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/HTMLDumper.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/HTMLDumper.java
index 876c5fae56f88bc933d8d305a16e3970824a2049..ccb9666c6ddfa27accffd3f98c7889a6a9c6b701 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/HTMLDumper.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/HTMLDumper.java
@@ -70,23 +70,25 @@ public class HTMLDumper extends AbstractDumper {
}
@Override
- public void dump(Collection<RPackage> problems, Collection<LogFileParseException> parseErrors) {
+ public void dump(Collection<RPackage> packages, Collection<LogFileParseException> parseErrors) {
try {
createAndCheckOutDir();
- dumpIndexFile(problems, parseErrors);
+ dumpIndexFile(packages, parseErrors);
} catch (IOException e) {
e.printStackTrace();
}
}
- private void dumpIndexFile(Collection<RPackage> problems, Collection<LogFileParseException> parseErrors) {
+ private void dumpIndexFile(Collection<RPackage> packages, Collection<LogFileParseException> parseErrors) {
Path indexFile = destDir.resolve("index.html");
try (BufferedWriter bw = Files.newBufferedWriter(indexFile, CREATE, TRUNCATE_EXISTING, WRITE)) {
HTMLBuilder builder = new HTMLBuilder(new PrintWriter(bw));
- Collection<Problem> allProblems = collectAllProblems(problems);
- Collection<RPackageTestRun> allTestRuns = collectTestRuns(problems);
+ Collection<Problem> allProblems = collectAllProblems(packages);
+ Collection<RPackageTestRun> allTestRuns = collectTestRuns(packages);
+
+ allProblems = eliminateRedundantProblems(allProblems);
Tag errorDistributionTable = generateTypeDistributionTable(builder, groupByType(allProblems));
Tag pkgDistributionTable = generateTestRunDistributionTable(builder, groupByTestRuns(allTestRuns, allProblems));
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/parser/LogFileParser.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/parser/LogFileParser.java
index 9aacf507de06db38cfb78969224820351eb58d33..1ebc0e56abc69511d62503bed73256228061495e 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/parser/LogFileParser.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/parser/LogFileParser.java
@@ -30,16 +30,20 @@ import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Set;
import java.util.logging.Logger;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import com.oracle.truffle.r.test.packages.analyzer.Location;
import com.oracle.truffle.r.test.packages.analyzer.Problem;
import com.oracle.truffle.r.test.packages.analyzer.detectors.Detector;
+import com.oracle.truffle.r.test.packages.analyzer.detectors.DummyDetector;
import com.oracle.truffle.r.test.packages.analyzer.detectors.LineDetector;
import com.oracle.truffle.r.test.packages.analyzer.model.RPackageTestRun;
import com.oracle.truffle.r.test.packages.analyzer.parser.DiffParser.DiffChunk;
@@ -139,7 +143,7 @@ public class LogFileParser {
consumeLine();
int idx = curLine.text.indexOf(Token.CONTENT_MALFORMED.linePrefix);
String fileNameStr = curLine.text.substring(idx + Token.CONTENT_MALFORMED.linePrefix.length()).trim();
- checkResults.problems.add(new ContentMalformedProblem(pkg, getCurrentLocation(), fileNameStr));
+ checkResults.problems.add(new ContentMalformedProblem(pkg, DummyDetector.INSTANCE, getCurrentLocation(), fileNameStr));
} else if (la.text.contains(Token.OUTPUT_MISMATCH_FASTR.linePrefix)) {
consumeLine();
// extract file name of output file
@@ -149,7 +153,7 @@ public class LogFileParser {
Path outputFile = logFile.path.resolveSibling(Paths.get("testfiles", "fastr", fileNameStr));
// report the problem
- checkResults.problems.add(new OutputMismatchProblem(pkg, getCurrentLocation(), fileNameStr));
+ checkResults.problems.add(new OutputMismatchProblem(pkg, DummyDetector.INSTANCE, getCurrentLocation(), fileNameStr));
if (!Files.isReadable(outputFile)) {
LOGGER.warning("Cannot read output file " + outputFile);
@@ -352,23 +356,25 @@ public class LogFileParser {
assert startLineNr >= 0;
startLocation = new Location(file, startLineNr);
}
- List<Problem> problems = new LinkedList<>();
+// List<Problem> problems = new LinkedList<>();
+ Map<LineDetector, Collection<Problem>> problems = new HashMap<>();
Collection<LineDetector> collection = detectorsTable.get(start.name());
if (collection != null) {
for (LineDetector detector : collection) {
Collection<Problem> detectedProblems = detector.detect(pkg, startLocation, body);
if (detectedProblems != null) {
- problems.addAll(detectedProblems);
+ problems.put(detector, detectedProblems);
}
}
}
for (LineDetector detector : anyDetectors) {
Collection<Problem> detectedProblems = detector.detect(pkg, startLocation, body);
if (detectedProblems != null) {
- problems.addAll(detectedProblems);
+ problems.put(detector, detectedProblems);
}
}
- return problems;
+
+ return problems.values().stream().flatMap(p -> p.stream()).collect(Collectors.toList());
}
private Collection<Problem> applyTestResultDetectors(List<DiffChunk> diffChunk) {
@@ -663,8 +669,8 @@ public class LogFileParser {
private final String details;
- protected OutputMismatchProblem(RPackageTestRun pkg, Location location, String details) {
- super(pkg, location);
+ protected OutputMismatchProblem(RPackageTestRun pkg, Detector<?> detector, Location location, String details) {
+ super(pkg, detector, location);
this.details = details;
}
@@ -698,8 +704,8 @@ public class LogFileParser {
private final String details;
- protected ContentMalformedProblem(RPackageTestRun pkg, Location location, String details) {
- super(pkg, location);
+ protected ContentMalformedProblem(RPackageTestRun pkg, Detector<?> detector, Location location, String details) {
+ super(pkg, detector, location);
this.details = details;
}