aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-scanner-engine/src/test/java/org/sonar/scanner
diff options
context:
space:
mode:
authorDuarte Meneses <duarte.meneses@sonarsource.com>2017-07-24 16:32:53 +0200
committerJulien HENRY <julien.henry@sonarsource.com>2017-08-07 11:44:06 +0200
commit8c44c26a5ec721b87f3626c1194f787e4bfc061d (patch)
tree16c3ea7a130b1bd25e124df26d12748a3b1b793e /sonar-scanner-engine/src/test/java/org/sonar/scanner
parent4ae8b49d7960957c6b4de2f3470d9c71eb933d54 (diff)
downloadsonarqube-8c44c26a5ec721b87f3626c1194f787e4bfc061d.tar.gz
sonarqube-8c44c26a5ec721b87f3626c1194f787e4bfc061d.zip
SONAR-9602 Don't persist sources of unchanged files
Diffstat (limited to 'sonar-scanner-engine/src/test/java/org/sonar/scanner')
-rw-r--r--sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/InputComponentStoreTest.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/InputComponentStoreTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/InputComponentStoreTest.java
index 777af5ef52b..8d3f530c25f 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/InputComponentStoreTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/scan/filesystem/InputComponentStoreTest.java
@@ -103,11 +103,7 @@ public class InputComponentStoreTest {
static class InputComponentStoreTester extends InputComponentStore {
InputComponentStoreTester() throws IOException {
-<<<<<<< HEAD
- super(TestInputFileBuilder.newDefaultInputModule("root", temp.newFolder()));
-=======
- super(new PathResolver(), TestInputFileBuilder.newDefaultInputModule("root", temp.newFolder()), mock(AnalysisMode.class));
->>>>>>> SONAR-9607 Do not copy unchanged source files in scanner report
+ super(TestInputFileBuilder.newDefaultInputModule("root", temp.newFolder()), mock(AnalysisMode.class));
}
InputFile addFile(String moduleKey, String relpath, String language) {