Replace usage of MeasureRepositoryImpl by MeasureRepositoryRule

3 files changed, 85 insertions, 182 deletions

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueCounterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueCounterTest.java
index 681fca07e0b..9e8e4688584 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueCounterTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/issue/IssueCounterTest.java
@@ -26,22 +26,19 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.core.issue.DefaultIssue;
+import org.sonar.db.rule.RuleTesting;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.batch.TreeRootHolderRule;
 import org.sonar.server.computation.component.Component;
-import org.sonar.server.computation.measure.MeasureRepository;
-import org.sonar.server.computation.measure.MeasureRepositoryImpl;
+import org.sonar.server.computation.measure.MeasureRepositoryRule;
 import org.sonar.server.computation.measure.MeasureVariations;
 import org.sonar.server.computation.metric.Metric;
 import org.sonar.server.computation.metric.MetricImpl;
-import org.sonar.server.computation.metric.MetricRepository;
+import org.sonar.server.computation.metric.MetricRepositoryRule;
 import org.sonar.server.computation.period.Period;
 import org.sonar.server.computation.period.PeriodsHolderRule;
-import org.sonar.db.rule.RuleTesting;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 import static org.sonar.api.issue.Issue.RESOLUTION_FALSE_POSITIVE;
 import static org.sonar.api.issue.Issue.RESOLUTION_FIXED;
 import static org.sonar.api.issue.Issue.STATUS_CLOSED;
@@ -103,15 +100,32 @@ public class IssueCounterTest {
   @Rule
   public PeriodsHolderRule periodsHolder = new PeriodsHolderRule();
 
-  MetricRepository metricRepository = mock(MetricRepository.class);
-  MeasureRepository measureRepository;
+  @Rule
+  public MetricRepositoryRule metricRepository = new MetricRepositoryRule()
+    .add(ISSUES_METRIC)
+    .add(OPEN_ISSUES_METRIC)
+    .add(REOPENED_ISSUES_METRIC)
+    .add(CONFIRMED_ISSUES_METRIC)
+    .add(BLOCKER_ISSUES_METRIC)
+    .add(CRITICAL_ISSUES_METRIC)
+    .add(MAJOR_ISSUES_METRIC)
+    .add(MINOR_ISSUES_METRIC)
+    .add(INFO_ISSUES_METRIC)
+    .add(NEW_ISSUES_METRIC)
+    .add(NEW_BLOCKER_ISSUES_METRIC)
+    .add(NEW_CRITICAL_ISSUES_METRIC)
+    .add(NEW_MAJOR_ISSUES_METRIC)
+    .add(NEW_MINOR_ISSUES_METRIC)
+    .add(NEW_INFO_ISSUES_METRIC)
+    .add(FALSE_POSITIVE_ISSUES_METRIC);
+
+  @Rule
+  public MeasureRepositoryRule measureRepository = MeasureRepositoryRule.create(treeRootHolder, metricRepository);
+
   IssueCounter sut;
 
   @Before
   public void setUp() {
-    initMetrics();
-    measureRepository = new MeasureRepositoryImpl(null, reportReader, metricRepository);
-
     sut = new IssueCounter(periodsHolder, metricRepository, measureRepository);
   }
 
@@ -243,22 +257,4 @@ public class IssueCounterTest {
     return new Period(index, "mode", null, date, 42l);
   }
 
-  private void initMetrics() {
-    when(metricRepository.getByKey(ISSUES_METRIC.getKey())).thenReturn(ISSUES_METRIC);
-    when(metricRepository.getByKey(OPEN_ISSUES_METRIC.getKey())).thenReturn(OPEN_ISSUES_METRIC);
-    when(metricRepository.getByKey(REOPENED_ISSUES_METRIC.getKey())).thenReturn(REOPENED_ISSUES_METRIC);
-    when(metricRepository.getByKey(CONFIRMED_ISSUES_METRIC.getKey())).thenReturn(CONFIRMED_ISSUES_METRIC);
-    when(metricRepository.getByKey(BLOCKER_ISSUES_METRIC.getKey())).thenReturn(BLOCKER_ISSUES_METRIC);
-    when(metricRepository.getByKey(CRITICAL_ISSUES_METRIC.getKey())).thenReturn(CRITICAL_ISSUES_METRIC);
-    when(metricRepository.getByKey(MAJOR_ISSUES_METRIC.getKey())).thenReturn(MAJOR_ISSUES_METRIC);
-    when(metricRepository.getByKey(MINOR_ISSUES_METRIC.getKey())).thenReturn(MINOR_ISSUES_METRIC);
-    when(metricRepository.getByKey(INFO_ISSUES_METRIC.getKey())).thenReturn(INFO_ISSUES_METRIC);
-    when(metricRepository.getByKey(NEW_ISSUES_METRIC.getKey())).thenReturn(NEW_ISSUES_METRIC);
-    when(metricRepository.getByKey(NEW_BLOCKER_ISSUES_METRIC.getKey())).thenReturn(NEW_BLOCKER_ISSUES_METRIC);
-    when(metricRepository.getByKey(NEW_CRITICAL_ISSUES_METRIC.getKey())).thenReturn(NEW_CRITICAL_ISSUES_METRIC);
-    when(metricRepository.getByKey(NEW_MAJOR_ISSUES_METRIC.getKey())).thenReturn(NEW_MAJOR_ISSUES_METRIC);
-    when(metricRepository.getByKey(NEW_MINOR_ISSUES_METRIC.getKey())).thenReturn(NEW_MINOR_ISSUES_METRIC);
-    when(metricRepository.getByKey(NEW_INFO_ISSUES_METRIC.getKey())).thenReturn(NEW_INFO_ISSUES_METRIC);
-    when(metricRepository.getByKey(FALSE_POSITIVE_ISSUES_METRIC.getKey())).thenReturn(FALSE_POSITIVE_ISSUES_METRIC);
-  }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStepTest.java
index 6ae1e9f71d9..66f84f92e36 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/FillMeasuresWithVariationsStepTest.java
@@ -20,58 +20,42 @@
 
 package org.sonar.server.computation.step;
 
-import java.util.Collections;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.sonar.api.utils.System2;
-import org.sonar.batch.protocol.output.BatchReport;
+import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.DbTester;
-import org.sonar.db.component.ComponentDao;
 import org.sonar.db.component.ComponentDto;
-import org.sonar.db.component.SnapshotDao;
 import org.sonar.db.component.SnapshotDto;
-import org.sonar.db.debt.CharacteristicDao;
-import org.sonar.db.measure.MeasureDao;
 import org.sonar.db.measure.MeasureDto;
-import org.sonar.db.metric.MetricDto;
 import org.sonar.server.component.ComponentTesting;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.batch.TreeRootHolderRule;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DumbComponent;
 import org.sonar.server.computation.measure.Measure;
-import org.sonar.server.computation.measure.MeasureRepository;
-import org.sonar.server.computation.measure.MeasureRepositoryImpl;
+import org.sonar.server.computation.measure.MeasureRepositoryRule;
 import org.sonar.server.computation.metric.Metric;
-import org.sonar.server.computation.metric.Metric.MetricType;
 import org.sonar.server.computation.metric.MetricImpl;
-import org.sonar.server.computation.metric.MetricRepositoryImpl;
+import org.sonar.server.computation.metric.MetricRepositoryRule;
 import org.sonar.server.computation.period.Period;
 import org.sonar.server.computation.period.PeriodsHolderRule;
-import org.sonar.server.db.DbClient;
-import org.sonar.server.metric.persistence.MetricDao;
-import org.sonar.server.rule.db.RuleDao;
 import org.sonar.test.DbTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.server.component.SnapshotTesting.createForComponent;
 import static org.sonar.server.component.SnapshotTesting.createForProject;
-import static org.sonar.server.computation.metric.Metric.MetricType.BOOL;
-import static org.sonar.server.computation.metric.Metric.MetricType.FLOAT;
-import static org.sonar.server.computation.metric.Metric.MetricType.INT;
-import static org.sonar.server.metric.ws.MetricTesting.newMetricDto;
 
 @Category(DbTests.class)
 public class FillMeasuresWithVariationsStepTest {
 
-  static final MetricDto ISSUES_METRIC = newMetricDto().setKey("violations").setValueType(INT.name()).setEnabled(true);
-  static final MetricDto DEBT_METRIC = newMetricDto().setKey("sqale_index").setValueType(MetricType.WORK_DUR.name()).setEnabled(true);
-  static final MetricDto FILE_COMPLEXITY_METRIC = newMetricDto().setKey("file_complexity").setValueType(FLOAT.name()).setEnabled(true);
-  static final MetricDto BUILD_BREAKER_METRIC = newMetricDto().setKey("build_breaker").setValueType(BOOL.name()).setEnabled(true);
+  static final Metric ISSUES_METRIC = new MetricImpl(1, "violations", "violations", Metric.MetricType.INT);
+  static final Metric DEBT_METRIC = new MetricImpl(2, "sqale_index", "sqale_index", Metric.MetricType.WORK_DUR);
+  static final Metric FILE_COMPLEXITY_METRIC = new MetricImpl(3, "file_complexity", "file_complexity", Metric.MetricType.FLOAT);
+  static final Metric BUILD_BREAKER_METRIC = new MetricImpl(4, "build_breaker", "build_breaker", Metric.MetricType.BOOL);
 
   static final ComponentDto PROJECT_DTO = ComponentTesting.newProjectDto();
 
@@ -89,39 +73,31 @@ public class FillMeasuresWithVariationsStepTest {
   @Rule
   public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule();
 
-  MeasureRepository measureRepository;
+  @Rule
+  public MetricRepositoryRule metricRepository = new MetricRepositoryRule()
+    .add(ISSUES_METRIC)
+    .add(DEBT_METRIC)
+    .add(FILE_COMPLEXITY_METRIC)
+    .add(BUILD_BREAKER_METRIC);
 
-  MetricRepositoryImpl metricRepository;
+  @Rule
+  public MeasureRepositoryRule measureRepository = MeasureRepositoryRule.create(treeRootHolder, metricRepository);
 
-  DbSession session;
+  DbSession session = dbTester.getSession();
 
-  DbClient dbClient;
+  DbClient dbClient = dbTester.getDbClient();
 
   FillMeasuresWithVariationsStep sut;
 
   @Before
   public void setUp() {
     dbTester.truncateTables();
-    session = dbTester.myBatis().openSession(false);
-    dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new ComponentDao(), new SnapshotDao(), new MetricDao(), new MeasureDao(), new RuleDao(System2.INSTANCE),
-      new CharacteristicDao(dbTester.myBatis()));
-
-    dbClient.metricDao().insert(session, ISSUES_METRIC, DEBT_METRIC, FILE_COMPLEXITY_METRIC, BUILD_BREAKER_METRIC);
     dbClient.componentDao().insert(session, PROJECT_DTO);
     session.commit();
 
-    metricRepository = new MetricRepositoryImpl(dbClient);
-    metricRepository.start();
-    measureRepository = new MeasureRepositoryImpl(dbClient, reportReader, metricRepository);
-
     sut = new FillMeasuresWithVariationsStep(dbClient, treeRootHolder, periodsHolder, metricRepository, measureRepository);
   }
 
-  @After
-  public void tearDown() {
-    session.close();
-  }
-
   @Test
   public void do_nothing_when_no_raw_measure() {
     SnapshotDto period1ProjectSnapshot = createForProject(PROJECT_DTO);
@@ -175,8 +151,8 @@ public class FillMeasuresWithVariationsStepTest {
 
     sut.execute();
 
-    assertThat(measureRepository.getRawMeasure(project, toMetric(ISSUES_METRIC)).get().getVariations().getVariation1()).isEqualTo(20d);
-    assertThat(measureRepository.getRawMeasure(directory, toMetric(ISSUES_METRIC)).get().getVariations().getVariation1()).isEqualTo(10d);
+    assertThat(measureRepository.getRawMeasure(project, ISSUES_METRIC).get().getVariations().getVariation1()).isEqualTo(20d);
+    assertThat(measureRepository.getRawMeasure(directory, ISSUES_METRIC).get().getVariations().getVariation1()).isEqualTo(10d);
   }
 
   @Test
@@ -210,7 +186,7 @@ public class FillMeasuresWithVariationsStepTest {
 
     assertThat(measureRepository.getRawMeasures(PROJECT).keys()).hasSize(1);
 
-    Measure measure = measureRepository.getRawMeasure(PROJECT, toMetric(ISSUES_METRIC)).get();
+    Measure measure = measureRepository.getRawMeasure(PROJECT, ISSUES_METRIC).get();
     assertThat(measure.hasVariations()).isTrue();
     assertThat(measure.getVariations().getVariation1()).isEqualTo(80d);
     assertThat(measure.getVariations().getVariation2()).isEqualTo(60d);
@@ -244,31 +220,10 @@ public class FillMeasuresWithVariationsStepTest {
 
     assertThat(measureRepository.getRawMeasures(PROJECT).keys()).hasSize(4);
 
-    assertThat(measureRepository.getRawMeasure(PROJECT, toMetric(ISSUES_METRIC)).get().getVariations().getVariation1()).isEqualTo(20d);
-    assertThat(measureRepository.getRawMeasure(PROJECT, toMetric(DEBT_METRIC)).get().getVariations().getVariation1()).isEqualTo(-5d);
-    assertThat(measureRepository.getRawMeasure(PROJECT, toMetric(FILE_COMPLEXITY_METRIC)).get().getVariations().getVariation1()).isEqualTo(1d);
-    assertThat(measureRepository.getRawMeasure(PROJECT, toMetric(BUILD_BREAKER_METRIC)).get().getVariations().getVariation1()).isEqualTo(-1d);
-  }
-
-  @Test
-  public void read_measure_from_batch() {
-    // Project
-    SnapshotDto period1ProjectSnapshot = createForProject(PROJECT_DTO);
-    dbClient.snapshotDao().insert(session, period1ProjectSnapshot);
-    dbClient.measureDao().insert(session, newMeasureDto(ISSUES_METRIC.getId(), PROJECT_DTO.getId(), period1ProjectSnapshot.getId(), 60d));
-    session.commit();
-
-    periodsHolder.setPeriods(newPeriod(1, period1ProjectSnapshot));
-
-    treeRootHolder.setRoot(PROJECT);
-
-    reportReader.putMeasures(PROJECT.getRef(), Collections.singletonList(
-        BatchReport.Measure.newBuilder().setIntValue(80).setMetricKey(ISSUES_METRIC.getKey()).build())
-    );
-
-    sut.execute();
-
-    assertThat(measureRepository.getRawMeasure(PROJECT, toMetric(ISSUES_METRIC)).get().getVariations().getVariation1()).isEqualTo(20d);
+    assertThat(measureRepository.getRawMeasure(PROJECT, ISSUES_METRIC).get().getVariations().getVariation1()).isEqualTo(20d);
+    assertThat(measureRepository.getRawMeasure(PROJECT, DEBT_METRIC).get().getVariations().getVariation1()).isEqualTo(-5d);
+    assertThat(measureRepository.getRawMeasure(PROJECT, FILE_COMPLEXITY_METRIC).get().getVariations().getVariation1()).isEqualTo(1d);
+    assertThat(measureRepository.getRawMeasure(PROJECT, BUILD_BREAKER_METRIC).get().getVariations().getVariation1()).isEqualTo(-1d);
   }
 
   private static MeasureDto newMeasureDto(int metricId, long projectId, long snapshotId, double value) {
@@ -279,11 +234,7 @@ public class FillMeasuresWithVariationsStepTest {
     return new Period(index, "mode", null, snapshotDto.getCreatedAt(), snapshotDto.getId());
   }
 
-  private void addRawMeasure(Component component, MetricDto metric, Measure measure) {
-    measureRepository.add(component, new MetricImpl(metric.getId(), metric.getKey(), metric.getShortName(), MetricType.valueOf(metric.getValueType())), measure);
-  }
-
-  private static Metric toMetric(MetricDto metric) {
-    return new MetricImpl(metric.getId(), metric.getKey(), metric.getShortName(), Metric.MetricType.valueOf(metric.getValueType()));
+  private void addRawMeasure(Component component, Metric metric, Measure measure) {
+    measureRepository.addRawMeasure(component.getRef(), metric.getKey(), measure);
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java
index ec8c4d651a5..b15f3172f69 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.computation.step;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import org.junit.After;
@@ -30,21 +29,19 @@ import org.junit.experimental.categories.Category;
 import org.sonar.api.measures.Metric;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.internal.Uuids;
-import org.sonar.batch.protocol.Constants.MeasureValueType;
-import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.db.DbSession;
 import org.sonar.db.DbTester;
 import org.sonar.db.component.ComponentDao;
 import org.sonar.db.component.ComponentDto;
 import org.sonar.db.measure.MeasureDao;
 import org.sonar.db.rule.RuleDto;
-import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.batch.TreeRootHolderRule;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DbIdsRepository;
 import org.sonar.server.computation.component.DumbComponent;
-import org.sonar.server.computation.measure.MeasureRepository;
-import org.sonar.server.computation.measure.MeasureRepositoryImpl;
+import org.sonar.server.computation.measure.Measure;
+import org.sonar.server.computation.measure.MeasureRepositoryRule;
+import org.sonar.server.computation.measure.MeasureVariations;
 import org.sonar.server.computation.metric.MetricRepositoryRule;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.metric.persistence.MetricDao;
@@ -80,10 +77,10 @@ public class PersistMeasuresStepTest extends BaseStepTest {
   public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule();
 
   @Rule
-  public BatchReportReaderRule reportReader = new BatchReportReaderRule();
+  public MetricRepositoryRule metricRepository = new MetricRepositoryRule();
 
   @Rule
-  public MetricRepositoryRule metricRepository = new MetricRepositoryRule();
+  public MeasureRepositoryRule measureRepository = MeasureRepositoryRule.create(treeRootHolder, metricRepository);
 
   DbClient dbClient;
   DbSession session;
@@ -101,7 +98,6 @@ public class PersistMeasuresStepTest extends BaseStepTest {
     dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new MeasureDao(), new ComponentDao(), new MetricDao(), new RuleDao(System2.INSTANCE));
     session = dbClient.openSession(false);
 
-    MeasureRepository measureRepository = new MeasureRepositoryImpl(dbClient, reportReader, metricRepository);
     session.commit();
 
     sut = new PersistMeasuresStep(dbClient, metricRepository, dbIdsRepository, treeRootHolder, measureRepository);
@@ -129,31 +125,28 @@ public class PersistMeasuresStepTest extends BaseStepTest {
     metricRepository.add(1, STRING_METRIC);
     metricRepository.add(2, DOUBLE_METRIC);
 
-    reportReader.putMeasures(PROJECT_REF, Arrays.asList(
-      BatchReport.Measure.newBuilder()
-        .setValueType(MeasureValueType.STRING)
-        .setStringValue("measure-data")
-        .setVariationValue1(1.1d)
-        .setVariationValue2(2.2d)
-        .setVariationValue3(3.3d)
-        .setVariationValue4(4.4d)
-        .setVariationValue5(5.5d)
-        .setDescription("measure-description")
-        .setMetricKey(STRING_METRIC_KEY)
-        .build()));
-
-    reportReader.putMeasures(FILE_REF, Arrays.asList(
-      BatchReport.Measure.newBuilder()
-        .setValueType(MeasureValueType.DOUBLE)
-        .setDoubleValue(123.123d)
-        .setVariationValue1(1.1d)
-        .setVariationValue2(2.2d)
-        .setVariationValue3(3.3d)
-        .setVariationValue4(4.4d)
-        .setVariationValue5(5.5d)
-        .setDescription("measure-description")
-        .setMetricKey(DOUBLE_METRIC_KEY)
-        .build()));
+    measureRepository.addRawMeasure(PROJECT_REF, STRING_METRIC_KEY,
+      Measure.newMeasureBuilder().setVariations(
+        MeasureVariations.newMeasureVariationsBuilder()
+          .setVariation(1, 1.1d)
+          .setVariation(2, 2.2d)
+          .setVariation(3, 3.3d)
+          .setVariation(4, 4.4d)
+          .setVariation(5, 5.5d)
+          .build()
+      ).create("measure-data")
+    );
+    measureRepository.addRawMeasure(FILE_REF, DOUBLE_METRIC_KEY,
+      Measure.newMeasureBuilder().setVariations(
+        MeasureVariations.newMeasureVariationsBuilder()
+          .setVariation(1, 1.1d)
+          .setVariation(2, 2.2d)
+          .setVariation(3, 3.3d)
+          .setVariation(4, 4.4d)
+          .setVariation(5, 5.5d)
+          .build()
+      ).create(123.123d)
+    );
 
     sut.execute();
     session.commit();
@@ -187,12 +180,7 @@ public class PersistMeasuresStepTest extends BaseStepTest {
   public void bestValue_measure_of_bestValueOptimized_metrics_are_not_persisted() {
     metricRepository.add(1, new Metric.Builder(OPTIMIZED_METRIC_KEY, "Optimized metric", Metric.ValueType.BOOL).setOptimizedBestValue(true).setBestValue(1d).create());
 
-    reportReader.putMeasures(FILE_REF, Arrays.asList(
-      BatchReport.Measure.newBuilder()
-        .setValueType(MeasureValueType.BOOLEAN)
-        .setBooleanValue(true)
-        .setMetricKey(OPTIMIZED_METRIC_KEY)
-        .build()));
+    measureRepository.addRawMeasure(FILE_REF, OPTIMIZED_METRIC_KEY, Measure.newMeasureBuilder().create(true));
 
     sut.execute();
     session.commit();
@@ -205,16 +193,8 @@ public class PersistMeasuresStepTest extends BaseStepTest {
     metricRepository.add(1, STRING_METRIC);
     metricRepository.add(2, DOUBLE_METRIC);
 
-    reportReader.putMeasures(FILE_REF, Arrays.asList(
-      BatchReport.Measure.newBuilder()
-        .setValueType(MeasureValueType.STRING)
-        .setMetricKey(STRING_METRIC_KEY)
-        .build(),
-      BatchReport.Measure.newBuilder()
-        .setValueType(MeasureValueType.DOUBLE)
-        .setMetricKey(DOUBLE_METRIC_KEY)
-        .build()
-    ));
+    measureRepository.addRawMeasure(FILE_REF, STRING_METRIC_KEY, Measure.newMeasureBuilder().createNoValue());
+    measureRepository.addRawMeasure(FILE_REF, DOUBLE_METRIC_KEY, Measure.newMeasureBuilder().createNoValue());
 
     sut.execute();
     session.commit();
@@ -240,20 +220,8 @@ public class PersistMeasuresStepTest extends BaseStepTest {
   public void do_not_insert_file_complexity_distribution_metric_on_files() {
     metricRepository.add(1, FILE_COMPLEXITY_DISTRIBUTION);
 
-    reportReader.putMeasures(PROJECT_REF, Arrays.asList(
-      BatchReport.Measure.newBuilder()
-        .setValueType(MeasureValueType.STRING)
-        .setStringValue("0=1;2=10")
-        .setMetricKey(FILE_COMPLEXITY_DISTRIBUTION_KEY)
-        .build()));
-
-    // Should not be persisted
-    reportReader.putMeasures(FILE_REF, Arrays.asList(
-      BatchReport.Measure.newBuilder()
-        .setValueType(MeasureValueType.STRING)
-        .setStringValue("0=1;2=10")
-        .setMetricKey(FILE_COMPLEXITY_DISTRIBUTION_KEY)
-        .build()));
+    measureRepository.addRawMeasure(PROJECT_REF, FILE_COMPLEXITY_DISTRIBUTION_KEY, Measure.newMeasureBuilder().create("0=1;2=10"));
+    measureRepository.addRawMeasure(FILE_REF, FILE_COMPLEXITY_DISTRIBUTION_KEY, Measure.newMeasureBuilder().create("0=1;2=10"));
 
     sut.execute();
 
@@ -273,20 +241,8 @@ public class PersistMeasuresStepTest extends BaseStepTest {
   public void do_not_insert_function_complexity_distribution_metric_on_files() {
     metricRepository.add(1, FUNCTION_COMPLEXITY_DISTRIBUTION);
 
-    reportReader.putMeasures(PROJECT_REF, Arrays.asList(
-      BatchReport.Measure.newBuilder()
-        .setValueType(MeasureValueType.STRING)
-        .setStringValue("0=1;2=10")
-        .setMetricKey(FUNCTION_COMPLEXITY_DISTRIBUTION_KEY)
-        .build()));
-
-    // Should not be persisted
-    reportReader.putMeasures(FILE_REF, Arrays.asList(
-      BatchReport.Measure.newBuilder()
-        .setValueType(MeasureValueType.STRING)
-        .setStringValue("0=1;2=10")
-        .setMetricKey(FUNCTION_COMPLEXITY_DISTRIBUTION_KEY)
-        .build()));
+    measureRepository.addRawMeasure(PROJECT_REF, FUNCTION_COMPLEXITY_DISTRIBUTION_KEY, Measure.newMeasureBuilder().create("0=1;2=10"));
+    measureRepository.addRawMeasure(FILE_REF, FUNCTION_COMPLEXITY_DISTRIBUTION_KEY, Measure.newMeasureBuilder().create("0=1;2=10"));
 
     sut.execute();