2 files changed, 17 insertions, 17 deletions
diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/measure/MeasureDbTester.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/measure/MeasureDbTester.java
index d51698bba4d..1c6cf9abcd3 100644
--- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/measure/MeasureDbTester.java
+++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/measure/MeasureDbTester.java
@@ -31,7 +31,7 @@ import org.sonar.db.component.SnapshotDto;
 import org.sonar.db.metric.MetricDto;
 
 import static org.sonar.db.measure.MeasureTesting.newLiveMeasure;
-import static org.sonar.db.measure.MeasureTesting.newMeasureDto;
+import static org.sonar.db.measure.MeasureTesting.newProjectMeasureDto;
 import static org.sonar.db.metric.MetricTesting.newMetricDto;
 
 public class MeasureDbTester {
@@ -44,21 +44,21 @@ public class MeasureDbTester {
   }
 
   @SafeVarargs
-  public final MeasureDto insertMeasure(ComponentDto component, SnapshotDto analysis, MetricDto metricDto, Consumer<MeasureDto>... consumers) {
-    MeasureDto measureDto = newMeasureDto(metricDto, component, analysis);
-    Arrays.stream(consumers).forEach(c -> c.accept(measureDto));
-    dbClient.measureDao().insert(dbSession, measureDto);
+  public final ProjectMeasureDto insertProjectMeasure(ComponentDto component, SnapshotDto analysis, MetricDto metricDto, Consumer<ProjectMeasureDto>... consumers) {
+    ProjectMeasureDto projectMeasureDto = newProjectMeasureDto(metricDto, component, analysis);
+    Arrays.stream(consumers).forEach(c -> c.accept(projectMeasureDto));
+    dbClient.projectMeasureDao().insert(dbSession, projectMeasureDto);
     dbSession.commit();
-    return measureDto;
+    return projectMeasureDto;
   }
 
   @SafeVarargs
-  public final MeasureDto insertMeasure(BranchDto branchDto, SnapshotDto analysis, MetricDto metricDto, Consumer<MeasureDto>... consumers) {
-    MeasureDto measureDto = newMeasureDto(metricDto, branchDto.getUuid(), analysis);
-    Arrays.stream(consumers).forEach(c -> c.accept(measureDto));
-    dbClient.measureDao().insert(dbSession, measureDto);
+  public final ProjectMeasureDto insertProjectMeasure(BranchDto branchDto, SnapshotDto analysis, MetricDto metricDto, Consumer<ProjectMeasureDto>... consumers) {
+    ProjectMeasureDto projectMeasureDto = MeasureTesting.newProjectMeasureDto(metricDto, branchDto.getUuid(), analysis);
+    Arrays.stream(consumers).forEach(c -> c.accept(projectMeasureDto));
+    dbClient.projectMeasureDao().insert(dbSession, projectMeasureDto);
     dbSession.commit();
-    return measureDto;
+    return projectMeasureDto;
   }
 
   @SafeVarargs
diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/measure/MeasureTesting.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/measure/MeasureTesting.java
index 1beb000887c..a01b6d5ba26 100644
--- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/measure/MeasureTesting.java
+++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/measure/MeasureTesting.java
@@ -38,23 +38,23 @@ public class MeasureTesting {
     // static methods only
   }
 
-  public static MeasureDto newMeasureDto(MetricDto metricDto, ComponentDto component, SnapshotDto analysis) {
-    return newMeasureDto(metricDto, component.uuid(), analysis);
+  public static ProjectMeasureDto newProjectMeasureDto(MetricDto metricDto, ComponentDto component, SnapshotDto analysis) {
+    return newProjectMeasureDto(metricDto, component.uuid(), analysis);
   }
 
-  public static MeasureDto newMeasureDto(MetricDto metricDto, String branchUuid, SnapshotDto analysis) {
+  public static ProjectMeasureDto newProjectMeasureDto(MetricDto metricDto, String branchUuid, SnapshotDto analysis) {
     checkNotNull(metricDto.getUuid());
     checkNotNull(metricDto.getKey());
     checkNotNull(branchUuid);
     checkNotNull(analysis.getUuid());
-    return new MeasureDto()
+    return new ProjectMeasureDto()
       .setMetricUuid(metricDto.getUuid())
       .setComponentUuid(branchUuid)
       .setAnalysisUuid(analysis.getUuid());
   }
 
-  public static MeasureDto newMeasure() {
-    return new MeasureDto()
+  public static ProjectMeasureDto newProjectMeasure() {
+    return new ProjectMeasureDto()
       .setMetricUuid(String.valueOf(cursor++))
       .setComponentUuid(String.valueOf(cursor++))
       .setAnalysisUuid(String.valueOf(cursor++))