diff options
author | Simon Brandhof <simon.brandhof@gmail.com> | 2013-10-09 21:56:05 +0200 |
---|---|---|
committer | Simon Brandhof <simon.brandhof@gmail.com> | 2013-10-09 21:56:05 +0200 |
commit | c2a0f4f06564c1d62f08d4e20489f70f0f4ad223 (patch) | |
tree | 7d43998e7a05420ffa4562a30c41caf09f8200c9 /plugins/sonar-core-plugin | |
parent | 3161c7782de577a84d85b58f9aa52861a17e082f (diff) | |
download | sonarqube-c2a0f4f06564c1d62f08d4e20489f70f0f4ad223.tar.gz sonarqube-c2a0f4f06564c1d62f08d4e20489f70f0f4ad223.zip |
SONAR-3677 support deprecated FileSystemFilter
+ refactor SnapshotDataType
Diffstat (limited to 'plugins/sonar-core-plugin')
2 files changed, 6 insertions, 4 deletions
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/FileHashSensor.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/FileHashSensor.java index 74af986d814..40212eb910f 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/FileHashSensor.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/sensors/FileHashSensor.java @@ -28,7 +28,7 @@ import org.sonar.api.scan.filesystem.InputFile; import org.sonar.api.utils.KeyValueFormat; import org.sonar.batch.index.ComponentDataCache; import org.sonar.batch.scan.filesystem.InputFileCache; -import org.sonar.core.source.SnapshotDataType; +import org.sonar.core.source.SnapshotDataTypes; import java.util.Map; @@ -64,7 +64,7 @@ public final class FileHashSensor implements Sensor { } if (!map.isEmpty()) { String data = KeyValueFormat.format(map); - componentDataCache.setStringData(project.getKey(), SnapshotDataType.FILE_HASH.getValue(), data); + componentDataCache.setStringData(project.getKey(), SnapshotDataTypes.FILE_HASHES, data); } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/FileHashSensorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/FileHashSensorTest.java index 7e11a61698c..c763efd4919 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/FileHashSensorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/FileHashSensorTest.java @@ -21,7 +21,6 @@ package org.sonar.plugins.core.sensors; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import edu.emory.mathcs.backport.java.util.Collections; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -31,6 +30,9 @@ import org.sonar.api.resources.Project; import org.sonar.api.scan.filesystem.InputFile; import org.sonar.batch.index.ComponentDataCache; import org.sonar.batch.scan.filesystem.InputFileCache; +import org.sonar.core.source.SnapshotDataTypes; + +import java.util.Collections; import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Mockito.*; @@ -58,7 +60,7 @@ public class FileHashSensorTest { SensorContext sensorContext = mock(SensorContext.class); sensor.analyse(project, sensorContext); - verify(componentDataCache).setStringData("struts", "file_hash", "src/Foo.java=ABC;src/Bar.java=DEF"); + verify(componentDataCache).setStringData("struts", SnapshotDataTypes.FILE_HASHES, "src/Foo.java=ABC;src/Bar.java=DEF"); verifyZeroInteractions(sensorContext); } |