Merge pull request #125 from Hugal31/fix/persistence-mode

fix: Add Sonar 7 compatibility
Idean · Mar 27, 2018 · 9f3180f · 9f3180f
2 parents 2e03b52 + 7bad24c
commit 9f3180f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 54 deletions.
diff --git a/...wift-plugin/src/main/java/org/sonar/plugins/swift/colorizer/SwiftCodeColorizerFormat.java b/...wift-plugin/src/main/java/org/sonar/plugins/swift/colorizer/SwiftCodeColorizerFormat.java
diff --git a/sonar-swift-plugin/src/main/java/org/sonar/plugins/swift/complexity/LizardReportParser.java b/sonar-swift-plugin/src/main/java/org/sonar/plugins/swift/complexity/LizardReportParser.java
@@ -20,7 +20,6 @@
 import org.slf4j.LoggerFactory;
 import org.sonar.api.measures.CoreMetrics;
 import org.sonar.api.measures.Measure;
-import org.sonar.api.measures.PersistenceMode;
 import org.sonar.api.measures.RangeDistributionBuilder;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -125,7 +124,6 @@ private List<Measure> buildMeasureList(int complexity, double fileComplexity, in
         list.add(new Measure(CoreMetrics.FILE_COMPLEXITY, fileComplexity));
         RangeDistributionBuilder complexityDistribution = new RangeDistributionBuilder(CoreMetrics.FILE_COMPLEXITY_DISTRIBUTION, FILES_DISTRIB_BOTTOM_LIMITS);
         complexityDistribution.add(fileComplexity);
-        list.add(complexityDistribution.build().setPersistenceMode(PersistenceMode.MEMORY));
         return list;
     }
 
@@ -175,7 +173,6 @@ public List<Measure> buildFuncionMeasuresList(double complexMean, int complexity
         List<Measure> list = new ArrayList<Measure>();
         list.add(new Measure(CoreMetrics.FUNCTION_COMPLEXITY, complexMean));
         list.add(new Measure(CoreMetrics.COMPLEXITY_IN_FUNCTIONS).setIntValue(complexityInFunctions));
-        list.add(builder.build().setPersistenceMode(PersistenceMode.MEMORY));
         return list;
     }
 

diff --git a/...swift-plugin/src/test/java/org/sonar/plugins/swift/complexity/LizardReportParserTest.java b/...swift-plugin/src/test/java/org/sonar/plugins/swift/complexity/LizardReportParserTest.java
@@ -131,7 +131,7 @@ public void parseReportShouldReturnMapWhenXMLFileIsCorrect() {
 
         assertTrue("Key is not there", report.containsKey("App/Controller/Accelerate/AccelerationViewController.h"));
         List<Measure> list1 = report.get("App/Controller/Accelerate/AccelerationViewController.h");
-        assertEquals(4, list1.size());
+        assertEquals(3, list1.size());
 
         for (Measure measure : list1) {
             String s = measure.getMetric().getKey();
@@ -152,7 +152,7 @@ public void parseReportShouldReturnMapWhenXMLFileIsCorrect() {
         assertTrue("Key is not there", report.containsKey("App/Controller/Accelerate/AccelerationViewController.m"));
 
         List<Measure> list2 = report.get("App/Controller/Accelerate/AccelerationViewController.m");
-        assertEquals(7, list2.size());
+        assertEquals(5, list2.size());
         for (Measure measure : list2) {
             String s = measure.getMetric().getKey();