SONAR-5216 Rename new metric profiles -> quality_profiles

6 files changed, 41 insertions, 41 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/QProfileDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/rule/QProfileDecorator.java
index b51dcf8a9c0..1bde76fbd45 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/QProfileDecorator.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/rule/QProfileDecorator.java
@@ -36,7 +36,7 @@ public class QProfileDecorator implements Decorator {
 
   @DependedUpon
   public Metric provides() {
-    return CoreMetrics.PROFILES;
+    return CoreMetrics.QUALITY_PROFILES;
   }
 
   public boolean shouldExecuteOnProject(Project project) {
@@ -49,12 +49,12 @@ public class QProfileDecorator implements Decorator {
       return;
     }
     UsedQProfiles profiles = UsedQProfiles.empty();
-    for (Measure childProfilesMeasure : context.getChildrenMeasures(CoreMetrics.PROFILES)) {
+    for (Measure childProfilesMeasure : context.getChildrenMeasures(CoreMetrics.QUALITY_PROFILES)) {
       UsedQProfiles childProfiles = UsedQProfiles.fromJSON(childProfilesMeasure.getData());
       profiles = profiles.merge(childProfiles);
     }
 
-    Measure detailsMeasure = new Measure(CoreMetrics.PROFILES, profiles.toJSON());
+    Measure detailsMeasure = new Measure(CoreMetrics.QUALITY_PROFILES, profiles.toJSON());
     context.saveMeasure(detailsMeasure);
   }
 
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/QProfileEventsDecorator.java b/sonar-batch/src/main/java/org/sonar/batch/rule/QProfileEventsDecorator.java
index 0410ee5501f..ee67fcb31cd 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/QProfileEventsDecorator.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/rule/QProfileEventsDecorator.java
@@ -56,7 +56,7 @@ public class QProfileEventsDecorator implements Decorator {
 
   @DependsUpon
   public Metric dependsUpon() {
-    return CoreMetrics.PROFILES;
+    return CoreMetrics.QUALITY_PROFILES;
   }
 
   public boolean shouldExecuteOnProject(Project project) {
@@ -70,13 +70,13 @@ public class QProfileEventsDecorator implements Decorator {
     }
 
     // Load current profiles
-    Measure profilesMeasure = context.getMeasure(CoreMetrics.PROFILES);
+    Measure profilesMeasure = context.getMeasure(CoreMetrics.QUALITY_PROFILES);
     UsedQProfiles currentProfiles = UsedQProfiles.fromJSON(profilesMeasure.getData());
 
     // Now load previous profiles
     UsedQProfiles pastProfiles;
     // First try with new metric
-    Measure pastProfilesMeasure = getPreviousMeasure(resource, CoreMetrics.PROFILES);
+    Measure pastProfilesMeasure = getPreviousMeasure(resource, CoreMetrics.QUALITY_PROFILES);
     if (pastProfilesMeasure != null) {
       pastProfiles = UsedQProfiles.fromJSON(pastProfilesMeasure.getData());
     } else {
diff --git a/sonar-batch/src/main/java/org/sonar/batch/rule/QProfileSensor.java b/sonar-batch/src/main/java/org/sonar/batch/rule/QProfileSensor.java
index 8f40db77132..0773a3c6472 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/rule/QProfileSensor.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/rule/QProfileSensor.java
@@ -60,7 +60,7 @@ public class QProfileSensor implements Sensor {
       }
     }
     UsedQProfiles used = UsedQProfiles.fromProfiles(profiles);
-    Measure detailsMeasure = new Measure(CoreMetrics.PROFILES, used.toJSON());
+    Measure detailsMeasure = new Measure(CoreMetrics.QUALITY_PROFILES, used.toJSON());
     context.saveMeasure(detailsMeasure);
 
     // For backward compatibility
diff --git a/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileDecoratorTest.java
index 30c8023002b..93bd0c1c348 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileDecoratorTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileDecoratorTest.java
@@ -55,9 +55,9 @@ public class QProfileDecoratorTest {
 
   @Test
   public void aggregate() throws Exception {
-    Measure measureModuleA = new Measure(CoreMetrics.PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]");
-    Measure measureModuleB = new Measure(CoreMetrics.PROFILES, "[{\"id\":3,\"name\":\"Php One\",\"version\":30,\"language\":\"php\"}]");
-    when(decoratorContext.getChildrenMeasures(CoreMetrics.PROFILES)).thenReturn(Arrays.asList(measureModuleA, measureModuleB));
+    Measure measureModuleA = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]");
+    Measure measureModuleB = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":3,\"name\":\"Php One\",\"version\":30,\"language\":\"php\"}]");
+    when(decoratorContext.getChildrenMeasures(CoreMetrics.QUALITY_PROFILES)).thenReturn(Arrays.asList(measureModuleA, measureModuleB));
 
     when(project.getScope()).thenReturn(Scopes.PROJECT);
 
@@ -65,15 +65,15 @@ public class QProfileDecoratorTest {
     decorator.decorate(project, decoratorContext);
 
     verify(decoratorContext).saveMeasure(
-      argThat(new IsMeasure(CoreMetrics.PROFILES,
+      argThat(new IsMeasure(CoreMetrics.QUALITY_PROFILES,
         "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"},{\"id\":3,\"name\":\"Php One\",\"version\":30,\"language\":\"php\"}]")));
   }
 
   @Test
   public void aggregate_several_profile_same_language() throws Exception {
-    Measure measureModuleA = new Measure(CoreMetrics.PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]");
-    Measure measureModuleB = new Measure(CoreMetrics.PROFILES, "[{\"id\":3,\"name\":\"Java Three\",\"version\":30,\"language\":\"java\"}]");
-    when(decoratorContext.getChildrenMeasures(CoreMetrics.PROFILES)).thenReturn(Arrays.asList(measureModuleA, measureModuleB));
+    Measure measureModuleA = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]");
+    Measure measureModuleB = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":3,\"name\":\"Java Three\",\"version\":30,\"language\":\"java\"}]");
+    when(decoratorContext.getChildrenMeasures(CoreMetrics.QUALITY_PROFILES)).thenReturn(Arrays.asList(measureModuleA, measureModuleB));
 
     when(project.getScope()).thenReturn(Scopes.PROJECT);
 
@@ -81,15 +81,15 @@ public class QProfileDecoratorTest {
     decorator.decorate(project, decoratorContext);
 
     verify(decoratorContext).saveMeasure(
-      argThat(new IsMeasure(CoreMetrics.PROFILES,
+      argThat(new IsMeasure(CoreMetrics.QUALITY_PROFILES,
         "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"},{\"id\":3,\"name\":\"Java Three\",\"version\":30,\"language\":\"java\"}]")));
   }
 
   @Test
   public void aggregate_several_profile_same_id() throws Exception {
-    Measure measureModuleA = new Measure(CoreMetrics.PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]");
-    Measure measureModuleB = new Measure(CoreMetrics.PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":30,\"language\":\"java\"}]");
-    when(decoratorContext.getChildrenMeasures(CoreMetrics.PROFILES)).thenReturn(Arrays.asList(measureModuleA, measureModuleB));
+    Measure measureModuleA = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]");
+    Measure measureModuleB = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":30,\"language\":\"java\"}]");
+    when(decoratorContext.getChildrenMeasures(CoreMetrics.QUALITY_PROFILES)).thenReturn(Arrays.asList(measureModuleA, measureModuleB));
 
     when(project.getScope()).thenReturn(Scopes.PROJECT);
 
@@ -97,7 +97,7 @@ public class QProfileDecoratorTest {
     decorator.decorate(project, decoratorContext);
 
     verify(decoratorContext).saveMeasure(
-      argThat(new IsMeasure(CoreMetrics.PROFILES,
+      argThat(new IsMeasure(CoreMetrics.QUALITY_PROFILES,
         "[{\"id\":2,\"name\":\"Java Two\",\"version\":30,\"language\":\"java\"}]")));
   }
 }
diff --git a/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileEventsDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileEventsDecoratorTest.java
index 3fe9497050c..ba20e0a1f98 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileEventsDecoratorTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileEventsDecoratorTest.java
@@ -62,12 +62,12 @@ public class QProfileEventsDecoratorTest {
 
   @Test
   public void shouldDoNothingIfNoProfileChange() {
-    Measure previousMeasure = new Measure(CoreMetrics.PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]");
-    Measure newMeasure = new Measure(CoreMetrics.PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]");
+    Measure previousMeasure = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]");
+    Measure newMeasure = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]");
 
     when(timeMachine.getMeasures(any(TimeMachineQuery.class)))
       .thenReturn(Arrays.asList(previousMeasure));
-    when(decoratorContext.getMeasure(CoreMetrics.PROFILES)).thenReturn(newMeasure);
+    when(decoratorContext.getMeasure(CoreMetrics.QUALITY_PROFILES)).thenReturn(newMeasure);
 
     decorator.decorate(project, decoratorContext);
 
@@ -78,9 +78,9 @@ public class QProfileEventsDecoratorTest {
   public void shouldDoNothingIfNoProfileChange_fallbackOldProfileMeasure() {
     mockTMWithDeprecatedProfileMeasures(2, "Java Two", 20);
     when(qualityProfileDao.selectById(20)).thenReturn(new QualityProfileDto().setLanguage("java"));
-    Measure newMeasure = new Measure(CoreMetrics.PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]");
+    Measure newMeasure = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]");
 
-    when(decoratorContext.getMeasure(CoreMetrics.PROFILES)).thenReturn(newMeasure);
+    when(decoratorContext.getMeasure(CoreMetrics.QUALITY_PROFILES)).thenReturn(newMeasure);
 
     when(languages.get("java")).thenReturn(Java.INSTANCE);
 
@@ -91,13 +91,13 @@ public class QProfileEventsDecoratorTest {
 
   @Test
   public void shouldCreateEventIfProfileChange() {
-    Measure previousMeasure = new Measure(CoreMetrics.PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]");
+    Measure previousMeasure = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]");
     // Different profile
-    Measure newMeasure = new Measure(CoreMetrics.PROFILES, "[{\"id\":3,\"name\":\"Java Other\",\"version\":1,\"language\":\"java\"}]");
+    Measure newMeasure = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":3,\"name\":\"Java Other\",\"version\":1,\"language\":\"java\"}]");
 
     when(timeMachine.getMeasures(any(TimeMachineQuery.class)))
       .thenReturn(Arrays.asList(previousMeasure));
-    when(decoratorContext.getMeasure(CoreMetrics.PROFILES)).thenReturn(newMeasure);
+    when(decoratorContext.getMeasure(CoreMetrics.QUALITY_PROFILES)).thenReturn(newMeasure);
 
     when(languages.get("java")).thenReturn(Java.INSTANCE);
 
@@ -114,9 +114,9 @@ public class QProfileEventsDecoratorTest {
     mockTMWithDeprecatedProfileMeasures(2, "Java Two", 20);
     when(qualityProfileDao.selectById(20)).thenReturn(new QualityProfileDto().setLanguage("java"));
     // Different profile
-    Measure newMeasure = new Measure(CoreMetrics.PROFILES, "[{\"id\":3,\"name\":\"Java Other\",\"version\":1,\"language\":\"java\"}]");
+    Measure newMeasure = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":3,\"name\":\"Java Other\",\"version\":1,\"language\":\"java\"}]");
 
-    when(decoratorContext.getMeasure(CoreMetrics.PROFILES)).thenReturn(newMeasure);
+    when(decoratorContext.getMeasure(CoreMetrics.QUALITY_PROFILES)).thenReturn(newMeasure);
 
     when(languages.get("java")).thenReturn(Java.INSTANCE);
 
@@ -130,13 +130,13 @@ public class QProfileEventsDecoratorTest {
 
   @Test
   public void shouldCreateEventIfProfileVersionChange() {
-    Measure previousMeasure = new Measure(CoreMetrics.PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]");
+    Measure previousMeasure = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]");
     // Same profile, different version
-    Measure newMeasure = new Measure(CoreMetrics.PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":21,\"language\":\"java\"}]");
+    Measure newMeasure = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":21,\"language\":\"java\"}]");
 
     when(timeMachine.getMeasures(any(TimeMachineQuery.class)))
       .thenReturn(Arrays.asList(previousMeasure));
-    when(decoratorContext.getMeasure(CoreMetrics.PROFILES)).thenReturn(newMeasure);
+    when(decoratorContext.getMeasure(CoreMetrics.QUALITY_PROFILES)).thenReturn(newMeasure);
 
     when(languages.get("java")).thenReturn(Java.INSTANCE);
 
@@ -153,9 +153,9 @@ public class QProfileEventsDecoratorTest {
     mockTMWithDeprecatedProfileMeasures(2, "Java Two", 20);
     when(qualityProfileDao.selectById(20)).thenReturn(new QualityProfileDto().setLanguage("java"));
     // Same profile, different version
-    Measure newMeasure = new Measure(CoreMetrics.PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":21,\"language\":\"java\"}]");
+    Measure newMeasure = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":21,\"language\":\"java\"}]");
 
-    when(decoratorContext.getMeasure(CoreMetrics.PROFILES)).thenReturn(newMeasure);
+    when(decoratorContext.getMeasure(CoreMetrics.QUALITY_PROFILES)).thenReturn(newMeasure);
 
     when(languages.get("java")).thenReturn(Java.INSTANCE);
 
@@ -172,9 +172,9 @@ public class QProfileEventsDecoratorTest {
     mockTMWithDeprecatedProfileMeasures(2, "Java Two", null);
     when(qualityProfileDao.selectById(20)).thenReturn(new QualityProfileDto().setLanguage("java"));
     // Same profile, different version
-    Measure newMeasure = new Measure(CoreMetrics.PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":21,\"language\":\"java\"}]");
+    Measure newMeasure = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":21,\"language\":\"java\"}]");
 
-    when(decoratorContext.getMeasure(CoreMetrics.PROFILES)).thenReturn(newMeasure);
+    when(decoratorContext.getMeasure(CoreMetrics.QUALITY_PROFILES)).thenReturn(newMeasure);
 
     when(languages.get("java")).thenReturn(Java.INSTANCE);
 
@@ -188,9 +188,9 @@ public class QProfileEventsDecoratorTest {
 
   @Test
   public void shouldNotCreateEventIfFirstAnalysis() {
-    Measure newMeasure = new Measure(CoreMetrics.PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":21,\"language\":\"java\"}]");
+    Measure newMeasure = new Measure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":21,\"language\":\"java\"}]");
 
-    when(decoratorContext.getMeasure(CoreMetrics.PROFILES)).thenReturn(newMeasure);
+    when(decoratorContext.getMeasure(CoreMetrics.QUALITY_PROFILES)).thenReturn(newMeasure);
 
     when(languages.get("java")).thenReturn(Java.INSTANCE);
 
diff --git a/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileSensorTest.java b/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileSensorTest.java
index ff6c824ca1f..a074f7185df 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileSensorTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/rule/QProfileSensorTest.java
@@ -61,7 +61,7 @@ public class QProfileSensorTest extends AbstractDaoTestCase {
     sensor.analyse(project, sensorContext);
 
     // measures are not saved
-    verify(sensorContext).saveMeasure(argThat(new IsMeasure(CoreMetrics.PROFILES, "[]")));
+    verify(sensorContext).saveMeasure(argThat(new IsMeasure(CoreMetrics.QUALITY_PROFILES, "[]")));
   }
 
   @Test
@@ -98,7 +98,7 @@ public class QProfileSensorTest extends AbstractDaoTestCase {
     verify(sensorContext).saveMeasure(argThat(new IsMeasure(CoreMetrics.PROFILE, "Java Two")));
     verify(sensorContext).saveMeasure(argThat(new IsMeasure(CoreMetrics.PROFILE_VERSION, 20.0)));
     verify(sensorContext).saveMeasure(
-      argThat(new IsMeasure(CoreMetrics.PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]")));
+      argThat(new IsMeasure(CoreMetrics.QUALITY_PROFILES, "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"}]")));
   }
 
   @Test
@@ -116,7 +116,7 @@ public class QProfileSensorTest extends AbstractDaoTestCase {
     sensor.analyse(project, sensorContext);
 
     verify(sensorContext).saveMeasure(
-      argThat(new IsMeasure(CoreMetrics.PROFILES,
+      argThat(new IsMeasure(CoreMetrics.QUALITY_PROFILES,
         "[{\"id\":2,\"name\":\"Java Two\",\"version\":20,\"language\":\"java\"},{\"id\":3,\"name\":\"Php One\",\"version\":30,\"language\":\"php\"}]")));
   }
 }