package org.sonar.server.computation.step;
+import java.io.File;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
import org.sonar.server.rule.db.RuleDao;
import org.sonar.test.DbTests;
-import java.io.File;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
@Test
public void map_full_batch_measure() {
BatchReport.Component component = defaultComponent().build();
- addComponent(component.getRef(), "component-key");
+ ComponentDto componentDto = addComponent(component.getRef(), "component-key");
BatchReport.Measure batchMeasure = BatchReport.Measure.newBuilder()
.setValueType(MeasureValueType.DOUBLE)
MeasureDto measure = sut.toMeasureDto(batchMeasure, component);
- assertThat(measure).isEqualToComparingFieldByField(expectedFullMeasure());
+ assertThat(measure).isEqualToComparingFieldByField(new MeasureDto()
+ .setComponentId(componentDto.getId())
+ .setSnapshotId(3L)
+ .setCharacteristicId(123456)
+ .setPersonId(5432)
+ .setValue(123.123d)
+ .setVariation(1, 1.1d)
+ .setVariation(2, 2.2d)
+ .setVariation(3, 3.3d)
+ .setVariation(4, 4.4d)
+ .setVariation(5, 5.5d)
+ .setAlertStatus("WARN")
+ .setAlertText("Open issues > 0")
+ .setDescription("measure-description")
+ .setSeverity(Severity.CRITICAL)
+ .setMetricId(metric.getId())
+ .setRuleId(rule.getId()));
}
@Test
public void map_minimal_batch_measure() {
BatchReport.Component component = defaultComponent().build();
- addComponent(component.getRef(), "component-key");
+ ComponentDto componentDto = addComponent(component.getRef(), "component-key");
BatchReport.Measure batchMeasure = BatchReport.Measure.newBuilder()
.setValueType(MeasureValueType.INT)
MeasureDto measure = sut.toMeasureDto(batchMeasure, component);
- assertThat(measure).isEqualToComparingFieldByField(expectedMinimalistMeasure());
+ assertThat(measure).isEqualToComparingFieldByField(new MeasureDto()
+ .setComponentId(componentDto.getId())
+ .setSnapshotId(3L)
+ .setMetricId(metric.getId()));
}
@Test
.setRuleId(rule.getId());
}
- private MeasureDto expectedMinimalistMeasure() {
- return new MeasureDto()
- .setComponentId(2L)
- .setSnapshotId(3L)
- .setMetricId(metric.getId());
- }
-
private BatchReport.Component.Builder defaultComponent() {
return BatchReport.Component.newBuilder()
.setRef(1)
package org.sonar.core.measure.db;
-import org.sonar.api.rule.Severity;
-
+import java.nio.charset.StandardCharsets;
import javax.annotation.CheckForNull;
import javax.annotation.Nullable;
-
-import java.nio.charset.StandardCharsets;
+import org.sonar.api.rule.Severity;
import static com.google.common.base.Preconditions.checkArgument;
private String description;
private Integer severityIndex;
- private Long projectId;
+ private Long componentId;
private Long snapshotId;
private Integer metricId;
private Integer ruleId;
}
public Long getComponentId() {
- return projectId;
+ return componentId;
}
public MeasureDto setComponentId(Long componentId) {
- this.projectId = componentId;
+ this.componentId = componentId;
return this;
}
VALUES (
#{value, jdbcType=DOUBLE}, #{metricId, jdbcType=INTEGER}, #{snapshotId, jdbcType=INTEGER},
#{ruleId, jdbcType=INTEGER}, #{textValue, jdbcType=VARCHAR},
- #{projectId, jdbcType=INTEGER}, #{alertStatus, jdbcType=VARCHAR}, #{alertText, jdbcType=VARCHAR},
+ #{componentId, jdbcType=INTEGER}, #{alertStatus, jdbcType=VARCHAR}, #{alertText, jdbcType=VARCHAR},
#{description, jdbcType=VARCHAR}, #{severityIndex, jdbcType=INTEGER}, #{characteristicId, jdbcType=INTEGER},
#{personId, jdbcType=INTEGER}, #{variation1, jdbcType=DOUBLE}, #{variation2, jdbcType=DOUBLE}, #{variation3, jdbcType=DOUBLE},
#{variation4, jdbcType=DOUBLE}, #{variation5, jdbcType=DOUBLE}, #{dataValue, jdbcType=BINARY}