mirrors
/
sonarqube
mirror of https://github.com/SonarSource/sonarqube.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 237 Wiki Activity
Browse Source

better name for Measure methods returning a builder

tags/5.2-RC1
Sébastien Lesaint 9 years ago
parent
3aa8352581
commit
424cd7bea4
8 changed files with 91 additions and 91 deletions
Split View Show Diff Stats
  1. 3
    3
      server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchMeasureToMeasure.java
  2. 2
    2
      server/sonar-server/src/main/java/org/sonar/server/computation/measure/Measure.java
  3. 7
    7
      server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java
  4. 13
    13
      server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java
  5. 37
    37
      server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureTest.java
  6. 18
    18
      server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureToMeasureDtoTest.java
  7. 10
    10
      server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityGateEventsStepTest.java
  8. 1
    1
      server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java

+ 3
- 3
server/sonar-server/src/main/java/org/sonar/server/computation/measure/BatchMeasureToMeasure.java View File

@@ -70,13 +70,13 @@ public class BatchMeasureToMeasure {
throw new IllegalArgumentException("Measure with both characteristicId and ruleKey are not supported");
}
if (batchMeasure.hasCharactericId()) {
return Measure.newMeasure().forCharacteristic(batchMeasure.getCharactericId());
return Measure.newMeasureBuilder().forCharacteristic(batchMeasure.getCharactericId());
}
if (batchMeasure.hasRuleKey()) {
RuleDto ruleDto = ruleCache.get(RuleKey.parse(batchMeasure.getRuleKey()));
return Measure.newMeasure().forRule(ruleDto.getId());
return Measure.newMeasureBuilder().forRule(ruleDto.getId());
}
return Measure.newMeasure();
return Measure.newMeasureBuilder();
}

private static Optional<Measure> toIntegerMeasure(Measure.NewMeasureBuilder builder, BatchReport.Measure batchMeasure, @Nullable String data) {

+ 2
- 2
server/sonar-server/src/main/java/org/sonar/server/computation/measure/Measure.java View File

@@ -94,11 +94,11 @@ public final class Measure {
this.variations = variations;
}

public static NewMeasureBuilder newMeasure() {
public static NewMeasureBuilder newMeasureBuilder() {
return new NewMeasureBuilder();
}

public static UpdateMeasureBuilder updateMeasure(Measure measure) {
public static UpdateMeasureBuilder updatedMeasureBuilder(Measure measure) {
return new UpdateMeasureBuilder(measure);
}


+ 7
- 7
server/sonar-server/src/main/java/org/sonar/server/computation/measure/MeasureDtoToMeasure.java View File

@@ -65,35 +65,35 @@ public class MeasureDtoToMeasure {
if (value == null) {
return toNoValueMeasure(measureDto);
}
return of(setCommonProperties(Measure.newMeasure(), measureDto).create(value.intValue(), data));
return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(value.intValue(), data));
}

private static Optional<Measure> toLongMeasure(MeasureDto measureDto, @Nullable Double value, String data) {
if (value == null) {
return toNoValueMeasure(measureDto);
}
return of(setCommonProperties(Measure.newMeasure(), measureDto).create(value.longValue(), data));
return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(value.longValue(), data));
}

private static Optional<Measure> toDoubleMeasure(MeasureDto measureDto, @Nullable Double value, String data) {
if (value == null) {
return toNoValueMeasure(measureDto);
}
return of(setCommonProperties(Measure.newMeasure(), measureDto).create(value.doubleValue(), data));
return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(value.doubleValue(), data));
}

private static Optional<Measure> toBooleanMeasure(MeasureDto measureDto, @Nullable Double value, String data) {
if (value == null) {
return toNoValueMeasure(measureDto);
}
return of(setCommonProperties(Measure.newMeasure(), measureDto).create(value == 1.0d, data));
return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(value == 1.0d, data));
}

private static Optional<Measure> toStringMeasure(MeasureDto measureDto, @Nullable String data) {
if (data == null) {
return toNoValueMeasure(measureDto);
}
return of(setCommonProperties(Measure.newMeasure(), measureDto).create(data));
return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(data));
}

private static Optional<Measure> toLevelMeasure(MeasureDto measureDto, @Nullable String data) {
@@ -104,11 +104,11 @@ public class MeasureDtoToMeasure {
if (!level.isPresent()) {
return toNoValueMeasure(measureDto);
}
return of(setCommonProperties(Measure.newMeasure(), measureDto).create(level.get()));
return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).create(level.get()));
}

private static Optional<Measure> toNoValueMeasure(MeasureDto measureDto) {
return of(setCommonProperties(Measure.newMeasure(), measureDto).createNoValue());
return of(setCommonProperties(Measure.newMeasureBuilder(), measureDto).createNoValue());
}

private static Measure.NewMeasureBuilder setCommonProperties(Measure.NewMeasureBuilder builder, MeasureDto measureDto) {

+ 13
- 13
server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureRepositoryImplTest.java View File

@@ -74,7 +74,7 @@ public class MeasureRepositoryImplTest {
private static final long LAST_SNAPSHOT_ID = 123;
private static final long OTHER_SNAPSHOT_ID = 369;
private static final long COMPONENT_ID = 567;
private static final Measure SOME_MEASURE = Measure.newMeasure().create(Measure.Level.OK);
private static final Measure SOME_MEASURE = Measure.newMeasureBuilder().create(Measure.Level.OK);
private static final String SOME_DATA = "some data";
private static final RuleDto SOME_RULE = RuleDto.createFor(RuleKey.of("A", "1")).setId(963);
private static final Characteristic SOME_CHARACTERISTIC = new Characteristic(741, "key");
@@ -206,7 +206,7 @@ public class MeasureRepositoryImplTest {

@Test
public void update_updates_the_stored_value() {
Measure newMeasure = Measure.updateMeasure(SOME_MEASURE).create();
Measure newMeasure = Measure.updatedMeasureBuilder(SOME_MEASURE).create();

underTest.add(FILE_COMPONENT, metric1, SOME_MEASURE);
underTest.update(FILE_COMPONENT, metric1, newMeasure);
@@ -216,8 +216,8 @@ public class MeasureRepositoryImplTest {

@Test
public void update_updates_the_stored_value_for_rule() {
Measure initialMeasure = Measure.newMeasure().forRule(123).createNoValue();
Measure newMeasure = Measure.updateMeasure(initialMeasure).create();
Measure initialMeasure = Measure.newMeasureBuilder().forRule(123).createNoValue();
Measure newMeasure = Measure.updatedMeasureBuilder(initialMeasure).create();

underTest.add(FILE_COMPONENT, metric1, initialMeasure);
underTest.update(FILE_COMPONENT, metric1, newMeasure);
@@ -227,8 +227,8 @@ public class MeasureRepositoryImplTest {

@Test
public void update_updates_the_stored_value_for_characteristic() {
Measure initialMeasure = Measure.newMeasure().forCharacteristic(952).createNoValue();
Measure newMeasure = Measure.updateMeasure(initialMeasure).create();
Measure initialMeasure = Measure.newMeasureBuilder().forCharacteristic(952).createNoValue();
Measure newMeasure = Measure.updatedMeasureBuilder(initialMeasure).create();

underTest.add(FILE_COMPONENT, metric1, initialMeasure);
underTest.update(FILE_COMPONENT, metric1, newMeasure);
@@ -311,7 +311,7 @@ public class MeasureRepositoryImplTest {

Optional<Measure> measure = underTest.getRawMeasure(FILE_COMPONENT, metric1);

underTest.update(FILE_COMPONENT, metric1, Measure.updateMeasure(measure.get()).create());
underTest.update(FILE_COMPONENT, metric1, Measure.updatedMeasureBuilder(measure.get()).create());
}

@Test(expected = NullPointerException.class)
@@ -336,10 +336,10 @@ public class MeasureRepositoryImplTest {

@Test
public void getRawMeasure_for_rule_returns_measure_for_specified_rule() {
Measure measure = Measure.newMeasure().forRule(SOME_RULE.getId()).createNoValue();
Measure measure = Measure.newMeasureBuilder().forRule(SOME_RULE.getId()).createNoValue();

underTest.add(FILE_COMPONENT, metric1, measure);
underTest.add(FILE_COMPONENT, metric1, Measure.newMeasure().forRule(222).createNoValue());
underTest.add(FILE_COMPONENT, metric1, Measure.newMeasureBuilder().forRule(222).createNoValue());

assertThat(underTest.getRawMeasure(FILE_COMPONENT, metric1, SOME_RULE).get()).isSameAs(measure);
}
@@ -366,10 +366,10 @@ public class MeasureRepositoryImplTest {

@Test
public void getRawMeasure_for_characteristic_returns_measure_for_specified_rule() {
Measure measure = Measure.newMeasure().forCharacteristic(SOME_CHARACTERISTIC.getId()).createNoValue();
Measure measure = Measure.newMeasureBuilder().forCharacteristic(SOME_CHARACTERISTIC.getId()).createNoValue();

underTest.add(FILE_COMPONENT, metric1, measure);
underTest.add(FILE_COMPONENT, metric1, Measure.newMeasure().forCharacteristic(333).createNoValue());
underTest.add(FILE_COMPONENT, metric1, Measure.newMeasureBuilder().forCharacteristic(333).createNoValue());

assertThat(underTest.getRawMeasure(FILE_COMPONENT, metric1, SOME_CHARACTERISTIC).get()).isSameAs(measure);
}
@@ -382,14 +382,14 @@ public class MeasureRepositoryImplTest {

Measure addedMeasure = SOME_MEASURE;
underTest.add(FILE_COMPONENT, metric1, addedMeasure);
Measure addedMeasure2 = Measure.newMeasure().forCharacteristic(SOME_CHARACTERISTIC.getId()).createNoValue();
Measure addedMeasure2 = Measure.newMeasureBuilder().forCharacteristic(SOME_CHARACTERISTIC.getId()).createNoValue();
underTest.add(FILE_COMPONENT, metric1, addedMeasure2);

SetMultimap<String, Measure> rawMeasures = underTest.getRawMeasures(FILE_COMPONENT);

assertThat(rawMeasures.keySet()).hasSize(2);
assertThat(rawMeasures.get(METRIC_KEY_1)).containsOnly(addedMeasure, addedMeasure2);
assertThat(rawMeasures.get(METRIC_KEY_2)).containsOnly(Measure.newMeasure().create("some value"));
assertThat(rawMeasures.get(METRIC_KEY_2)).containsOnly(Measure.newMeasureBuilder().create("some value"));
}

private static MeasureDto createMeasureDto(int metricId, long snapshotId) {

+ 37
- 37
server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureTest.java View File

@@ -40,14 +40,14 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(DataProviderRunner.class)
public class MeasureTest {

private static final Measure INT_MEASURE = Measure.newMeasure().create((int) 1);
private static final Measure LONG_MEASURE = Measure.newMeasure().create(1l);
private static final Measure DOUBLE_MEASURE = Measure.newMeasure().create(1d);
private static final Measure STRING_MEASURE = Measure.newMeasure().create("some_sT ring");
private static final Measure TRUE_MEASURE = Measure.newMeasure().create(true);
private static final Measure FALSE_MEASURE = Measure.newMeasure().create(false);
private static final Measure LEVEL_MEASURE = Measure.newMeasure().create(Measure.Level.OK);
private static final Measure NO_VALUE_MEASURE = Measure.newMeasure().createNoValue();
private static final Measure INT_MEASURE = Measure.newMeasureBuilder().create((int) 1);
private static final Measure LONG_MEASURE = Measure.newMeasureBuilder().create(1l);
private static final Measure DOUBLE_MEASURE = Measure.newMeasureBuilder().create(1d);
private static final Measure STRING_MEASURE = Measure.newMeasureBuilder().create("some_sT ring");
private static final Measure TRUE_MEASURE = Measure.newMeasureBuilder().create(true);
private static final Measure FALSE_MEASURE = Measure.newMeasureBuilder().create(false);
private static final Measure LEVEL_MEASURE = Measure.newMeasureBuilder().create(Measure.Level.OK);
private static final Measure NO_VALUE_MEASURE = Measure.newMeasureBuilder().createNoValue();

private static final List<Measure> MEASURES = ImmutableList.of(
INT_MEASURE, LONG_MEASURE, DOUBLE_MEASURE, STRING_MEASURE, TRUE_MEASURE, FALSE_MEASURE, NO_VALUE_MEASURE, LEVEL_MEASURE
@@ -109,7 +109,7 @@ public class MeasureTest {
executionException.expect(UnsupportedOperationException.class);
executionException.expectMessage("A measure can not be associated to both a Characteristic and a Rule");

Measure.newMeasure().forCharacteristic(SOME_CHARACTERISTIC_ID).forRule(SOME_RULE_ID);
Measure.newMeasureBuilder().forCharacteristic(SOME_CHARACTERISTIC_ID).forRule(SOME_RULE_ID);
}

@Test
@@ -117,34 +117,34 @@ public class MeasureTest {
executionException.expect(UnsupportedOperationException.class);
executionException.expectMessage("A measure can not be associated to both a Characteristic and a Rule");

Measure.newMeasure().forRule(SOME_RULE_ID).forCharacteristic(SOME_CHARACTERISTIC_ID);
Measure.newMeasureBuilder().forRule(SOME_RULE_ID).forCharacteristic(SOME_CHARACTERISTIC_ID);
}

@Test
public void getRuleId_returns_null_when_ruleKey_has_not_been_set() {
assertThat(Measure.newMeasure().createNoValue().getRuleId()).isNull();
assertThat(Measure.newMeasure().forCharacteristic(SOME_CHARACTERISTIC_ID).createNoValue().getRuleId()).isNull();
assertThat(Measure.newMeasureBuilder().createNoValue().getRuleId()).isNull();
assertThat(Measure.newMeasureBuilder().forCharacteristic(SOME_CHARACTERISTIC_ID).createNoValue().getRuleId()).isNull();
}

@Test
public void getRuleId_returns_key_set_in_builder() {
assertThat(Measure.newMeasure().forRule(SOME_RULE_ID).createNoValue().getRuleId()).isEqualTo(SOME_RULE_ID);
assertThat(Measure.newMeasureBuilder().forRule(SOME_RULE_ID).createNoValue().getRuleId()).isEqualTo(SOME_RULE_ID);
}

@Test
public void getCharacteristicId_returns_null_when_ruleKey_has_not_been_set() {
assertThat(Measure.newMeasure().createNoValue().getCharacteristicId()).isNull();
assertThat(Measure.newMeasure().forRule(SOME_RULE_ID).createNoValue().getCharacteristicId()).isNull();
assertThat(Measure.newMeasureBuilder().createNoValue().getCharacteristicId()).isNull();
assertThat(Measure.newMeasureBuilder().forRule(SOME_RULE_ID).createNoValue().getCharacteristicId()).isNull();
}

@Test
public void getCharacteristicId_returns_id_set_in_builder() {
assertThat(Measure.newMeasure().forCharacteristic(SOME_CHARACTERISTIC_ID).createNoValue().getCharacteristicId()).isEqualTo(SOME_CHARACTERISTIC_ID);
assertThat(Measure.newMeasureBuilder().forCharacteristic(SOME_CHARACTERISTIC_ID).createNoValue().getCharacteristicId()).isEqualTo(SOME_CHARACTERISTIC_ID);
}

@Test(expected = NullPointerException.class)
public void create_from_String_throws_NPE_if_arg_is_null() {
Measure.newMeasure().create((String) null);
Measure.newMeasureBuilder().create((String) null);
}

@Test
@@ -262,58 +262,58 @@ public class MeasureTest {
public void getAlertStatus_returns_argument_from_setQualityGateStatus() {
QualityGateStatus someStatus = new QualityGateStatus(Measure.Level.OK);

assertThat(Measure.newMeasure().setQualityGateStatus(someStatus).create(true, null).getQualityGateStatus()).isEqualTo(someStatus);
assertThat(Measure.newMeasure().setQualityGateStatus(someStatus).create(false, null).getQualityGateStatus()).isEqualTo(someStatus);
assertThat(Measure.newMeasure().setQualityGateStatus(someStatus).create((int) 1, null).getQualityGateStatus()).isEqualTo(someStatus);
assertThat(Measure.newMeasure().setQualityGateStatus(someStatus).create((long) 1, null).getQualityGateStatus()).isEqualTo(someStatus);
assertThat(Measure.newMeasure().setQualityGateStatus(someStatus).create((double) 1, null).getQualityGateStatus()).isEqualTo(someStatus);
assertThat(Measure.newMeasure().setQualityGateStatus(someStatus).create("str").getQualityGateStatus()).isEqualTo(someStatus);
assertThat(Measure.newMeasure().setQualityGateStatus(someStatus).create(Measure.Level.OK).getQualityGateStatus()).isEqualTo(someStatus);
assertThat(Measure.newMeasureBuilder().setQualityGateStatus(someStatus).create(true, null).getQualityGateStatus()).isEqualTo(someStatus);
assertThat(Measure.newMeasureBuilder().setQualityGateStatus(someStatus).create(false, null).getQualityGateStatus()).isEqualTo(someStatus);
assertThat(Measure.newMeasureBuilder().setQualityGateStatus(someStatus).create((int) 1, null).getQualityGateStatus()).isEqualTo(someStatus);
assertThat(Measure.newMeasureBuilder().setQualityGateStatus(someStatus).create((long) 1, null).getQualityGateStatus()).isEqualTo(someStatus);
assertThat(Measure.newMeasureBuilder().setQualityGateStatus(someStatus).create((double) 1, null).getQualityGateStatus()).isEqualTo(someStatus);
assertThat(Measure.newMeasureBuilder().setQualityGateStatus(someStatus).create("str").getQualityGateStatus()).isEqualTo(someStatus);
assertThat(Measure.newMeasureBuilder().setQualityGateStatus(someStatus).create(Measure.Level.OK).getQualityGateStatus()).isEqualTo(someStatus);
}

@Test(expected = NullPointerException.class)
public void newMeasureBuilder_setQualityGateStatus_throws_NPE_if_arg_is_null() {
Measure.newMeasure().setQualityGateStatus(null);
Measure.newMeasureBuilder().setQualityGateStatus(null);
}

@Test(expected = NullPointerException.class)
public void newMeasureBuilder_setVariations_throws_NPE_if_arg_is_null() {
Measure.newMeasure().setVariations(null);
Measure.newMeasureBuilder().setVariations(null);
}

@Test(expected = NullPointerException.class)
public void newMeasureBuilder_setDescription_throws_NPE_if_arg_is_null() {
Measure.newMeasure().setDescription(null);
Measure.newMeasureBuilder().setDescription(null);
}

@Test(expected = NullPointerException.class)
public void updateMeasureBuilder_setQualityGateStatus_throws_NPE_if_arg_is_null() {
Measure.updateMeasure(Measure.newMeasure().createNoValue()).setQualityGateStatus(null);
Measure.updatedMeasureBuilder(Measure.newMeasureBuilder().createNoValue()).setQualityGateStatus(null);
}

@Test(expected = NullPointerException.class)
public void updateMeasureBuilder_setVariations_throws_NPE_if_arg_is_null() {
Measure.updateMeasure(Measure.newMeasure().createNoValue()).setVariations(null);
Measure.updatedMeasureBuilder(Measure.newMeasureBuilder().createNoValue()).setVariations(null);
}

@Test(expected = UnsupportedOperationException.class)
public void updateMeasureBuilder_setQualityGateStatus_throws_USO_if_measure_already_has_a_QualityGateStatus() {
QualityGateStatus qualityGateStatus = new QualityGateStatus(Measure.Level.ERROR);

Measure.updateMeasure(Measure.newMeasure().setQualityGateStatus(qualityGateStatus).createNoValue()).setQualityGateStatus(qualityGateStatus);
Measure.updatedMeasureBuilder(Measure.newMeasureBuilder().setQualityGateStatus(qualityGateStatus).createNoValue()).setQualityGateStatus(qualityGateStatus);
}

@Test(expected = UnsupportedOperationException.class)
public void updateMeasureBuilder_setVariations_throws_USO_if_measure_already_has_Variations() {
MeasureVariations variations = new MeasureVariations(1d);

Measure.updateMeasure(Measure.newMeasure().setVariations(variations).createNoValue()).setVariations(variations);
Measure.updatedMeasureBuilder(Measure.newMeasureBuilder().setVariations(variations).createNoValue()).setVariations(variations);
}

@Test
@UseDataProvider("all")
public void updateMeasureBuilder_creates_Measure_with_same_immutable_properties(Measure measure) {
Measure newMeasure = Measure.updateMeasure(measure).create();
Measure newMeasure = Measure.updatedMeasureBuilder(measure).create();

assertThat(newMeasure.getValueType()).isEqualTo(measure.getValueType());
assertThat(newMeasure.getRuleId()).isEqualTo(measure.getRuleId());
@@ -327,11 +327,11 @@ public class MeasureTest {
public void getData_returns_argument_from_factory_method() {
String someData = "lololool";

assertThat(Measure.newMeasure().create(true, someData).getData()).isEqualTo(someData);
assertThat(Measure.newMeasure().create(false, someData).getData()).isEqualTo(someData);
assertThat(Measure.newMeasure().create((int) 1, someData).getData()).isEqualTo(someData);
assertThat(Measure.newMeasure().create((long) 1, someData).getData()).isEqualTo(someData);
assertThat(Measure.newMeasure().create((double) 1, someData).getData()).isEqualTo(someData);
assertThat(Measure.newMeasureBuilder().create(true, someData).getData()).isEqualTo(someData);
assertThat(Measure.newMeasureBuilder().create(false, someData).getData()).isEqualTo(someData);
assertThat(Measure.newMeasureBuilder().create((int) 1, someData).getData()).isEqualTo(someData);
assertThat(Measure.newMeasureBuilder().create((long) 1, someData).getData()).isEqualTo(someData);
assertThat(Measure.newMeasureBuilder().create((double) 1, someData).getData()).isEqualTo(someData);
}

@Test

+ 18
- 18
server/sonar-server/src/test/java/org/sonar/server/computation/measure/MeasureToMeasureDtoTest.java View File

@@ -54,18 +54,18 @@ public class MeasureToMeasureDtoTest {

@Test(expected = NullPointerException.class)
public void toMeasureDto_throws_NPE_if_Metric_arg_is_null() {
underTest.toMeasureDto(Measure.newMeasure().createNoValue(), null, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);
underTest.toMeasureDto(Measure.newMeasureBuilder().createNoValue(), null, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);
}

@DataProvider
public static Object[][] all_types_Measures() {
return new Object[][] {
{ Measure.newMeasure().create(true, SOME_DATA), SOME_BOOLEAN_METRIC},
{ Measure.newMeasure().create(1, SOME_DATA), SOME_INT_METRIC},
{ Measure.newMeasure().create((long) 1, SOME_DATA), SOME_LONG_METRIC},
{ Measure.newMeasure().create((double) 2, SOME_DATA), SOME_DOUBLE_METRIC},
{ Measure.newMeasure().create(SOME_STRING), SOME_STRING_METRIC},
{ Measure.newMeasure().create(Measure.Level.OK), SOME_LEVEL_METRIC}
{ Measure.newMeasureBuilder().create(true, SOME_DATA), SOME_BOOLEAN_METRIC},
{ Measure.newMeasureBuilder().create(1, SOME_DATA), SOME_INT_METRIC},
{ Measure.newMeasureBuilder().create((long) 1, SOME_DATA), SOME_LONG_METRIC},
{ Measure.newMeasureBuilder().create((double) 2, SOME_DATA), SOME_DOUBLE_METRIC},
{ Measure.newMeasureBuilder().create(SOME_STRING), SOME_STRING_METRIC},
{ Measure.newMeasureBuilder().create(Measure.Level.OK), SOME_LEVEL_METRIC}
};
}

@@ -83,7 +83,7 @@ public class MeasureToMeasureDtoTest {

@Test
public void toMeasureDto_returns_Dto_with_variation_if_Measure_has_MeasureVariations() {
MeasureDto measureDto = underTest.toMeasureDto(Measure.newMeasure().setVariations(SOME_VARIATIONS).create(SOME_STRING), SOME_STRING_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);
MeasureDto measureDto = underTest.toMeasureDto(Measure.newMeasureBuilder().setVariations(SOME_VARIATIONS).create(SOME_STRING), SOME_STRING_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);

assertThat(measureDto.getVariation(1)).isEqualTo(1d);
assertThat(measureDto.getVariation(2)).isEqualTo(2d);
@@ -104,7 +104,7 @@ public class MeasureToMeasureDtoTest {
@Test
public void toMeasureDto_returns_Dto_with_alertStatus_and_alertText_if_Measure_has_QualityGateStatus() {
String alertText = "some error";
MeasureDto measureDto = underTest.toMeasureDto(Measure.newMeasure().setQualityGateStatus(new QualityGateStatus(Measure.Level.ERROR, alertText)).create(SOME_STRING), SOME_STRING_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);
MeasureDto measureDto = underTest.toMeasureDto(Measure.newMeasureBuilder().setQualityGateStatus(new QualityGateStatus(Measure.Level.ERROR, alertText)).create(SOME_STRING), SOME_STRING_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);

assertThat(measureDto.getAlertStatus()).isEqualTo(Measure.Level.ERROR.name());
assertThat(measureDto.getAlertText()).isEqualTo(alertText);
@@ -118,7 +118,7 @@ public class MeasureToMeasureDtoTest {

@Test
public void toMeasureDto_sets_ruleId_if_set_in_Measure() {
Measure measure = Measure.newMeasure().forRule(42).createNoValue();
Measure measure = Measure.newMeasureBuilder().forRule(42).createNoValue();

assertThat(underTest.toMeasureDto(measure, SOME_BOOLEAN_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID).getRuleId()).isEqualTo(42);
}
@@ -131,7 +131,7 @@ public class MeasureToMeasureDtoTest {

@Test
public void toMeasureDto_sets_characteristicId_if_set_in_Measure() {
Measure measure = Measure.newMeasure().forCharacteristic(42).createNoValue();
Measure measure = Measure.newMeasureBuilder().forCharacteristic(42).createNoValue();

assertThat(underTest.toMeasureDto(measure, SOME_BOOLEAN_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID).getCharacteristicId()).isEqualTo(42);
}
@@ -155,12 +155,12 @@ public class MeasureToMeasureDtoTest {

@Test
public void toMeasureDto_maps_value_to_1_or_0_and_data_from_data_field_for_BOOLEAN_metric() {
MeasureDto trueMeasureDto = underTest.toMeasureDto(Measure.newMeasure().create(true, SOME_DATA), SOME_BOOLEAN_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);
MeasureDto trueMeasureDto = underTest.toMeasureDto(Measure.newMeasureBuilder().create(true, SOME_DATA), SOME_BOOLEAN_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);

assertThat(trueMeasureDto.getValue()).isEqualTo(1d);
assertThat(trueMeasureDto.getData()).isEqualTo(SOME_DATA);

MeasureDto falseMeasureDto = underTest.toMeasureDto(Measure.newMeasure().create(false, SOME_DATA), SOME_BOOLEAN_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);
MeasureDto falseMeasureDto = underTest.toMeasureDto(Measure.newMeasureBuilder().create(false, SOME_DATA), SOME_BOOLEAN_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);

assertThat(falseMeasureDto.getValue()).isEqualTo(0d);
assertThat(falseMeasureDto.getData()).isEqualTo(SOME_DATA);
@@ -168,7 +168,7 @@ public class MeasureToMeasureDtoTest {

@Test
public void toMeasureDto_maps_value_and_data_from_data_field_for_INT_metric() {
MeasureDto trueMeasureDto = underTest.toMeasureDto(Measure.newMeasure().create(123, SOME_DATA), SOME_INT_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);
MeasureDto trueMeasureDto = underTest.toMeasureDto(Measure.newMeasureBuilder().create(123, SOME_DATA), SOME_INT_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);

assertThat(trueMeasureDto.getValue()).isEqualTo(123);
assertThat(trueMeasureDto.getData()).isEqualTo(SOME_DATA);
@@ -176,7 +176,7 @@ public class MeasureToMeasureDtoTest {

@Test
public void toMeasureDto_maps_value_and_data_from_data_field_for_LONG_metric() {
MeasureDto trueMeasureDto = underTest.toMeasureDto(Measure.newMeasure().create((long) 456, SOME_DATA), SOME_LONG_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);
MeasureDto trueMeasureDto = underTest.toMeasureDto(Measure.newMeasureBuilder().create((long) 456, SOME_DATA), SOME_LONG_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);

assertThat(trueMeasureDto.getValue()).isEqualTo(456);
assertThat(trueMeasureDto.getData()).isEqualTo(SOME_DATA);
@@ -184,7 +184,7 @@ public class MeasureToMeasureDtoTest {

@Test
public void toMeasureDto_maps_value_and_data_from_data_field_for_DOUBLE_metric() {
MeasureDto trueMeasureDto = underTest.toMeasureDto(Measure.newMeasure().create((double) 789, SOME_DATA), SOME_DOUBLE_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);
MeasureDto trueMeasureDto = underTest.toMeasureDto(Measure.newMeasureBuilder().create((double) 789, SOME_DATA), SOME_DOUBLE_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);

assertThat(trueMeasureDto.getValue()).isEqualTo(789);
assertThat(trueMeasureDto.getData()).isEqualTo(SOME_DATA);
@@ -192,7 +192,7 @@ public class MeasureToMeasureDtoTest {

@Test
public void toMeasureDto_maps_to_only_data_for_STRING_metric() {
MeasureDto trueMeasureDto = underTest.toMeasureDto(Measure.newMeasure().create(SOME_STRING), SOME_STRING_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);
MeasureDto trueMeasureDto = underTest.toMeasureDto(Measure.newMeasureBuilder().create(SOME_STRING), SOME_STRING_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);

assertThat(trueMeasureDto.getValue()).isNull();
assertThat(trueMeasureDto.getData()).isEqualTo(SOME_STRING);
@@ -200,7 +200,7 @@ public class MeasureToMeasureDtoTest {

@Test
public void toMeasureDto_maps_name_of_Level_to_data_and_has_no_value_for_LEVEL_metric() {
MeasureDto trueMeasureDto = underTest.toMeasureDto(Measure.newMeasure().create(Measure.Level.OK), SOME_LEVEL_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);
MeasureDto trueMeasureDto = underTest.toMeasureDto(Measure.newMeasureBuilder().create(Measure.Level.OK), SOME_LEVEL_METRIC, SOME_COMPONENT_ID, SOME_SNAPSHOT_ID);

assertThat(trueMeasureDto.getValue()).isNull();
assertThat(trueMeasureDto.getData()).isEqualTo(Measure.Level.OK.name());

+ 10
- 10
server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityGateEventsStepTest.java View File

@@ -91,7 +91,7 @@ public class QualityGateEventsStepTest {

@Test
public void no_event_created_if_raw_ALERT_STATUS_measure_is_null() {
when(measureRepository.getRawMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasure().createNoValue()));
when(measureRepository.getRawMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasureBuilder().createNoValue()));

underTest.execute();

@@ -105,7 +105,7 @@ public class QualityGateEventsStepTest {

@Test
public void no_event_created_if_raw_ALERT_STATUS_measure_is_unsupported_value() {
when(measureRepository.getRawMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasure().create(INVALID_ALERT_STATUS)));
when(measureRepository.getRawMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasureBuilder().create(INVALID_ALERT_STATUS)));

underTest.execute();

@@ -117,8 +117,8 @@ public class QualityGateEventsStepTest {
public void no_event_created_if_no_base_ALERT_STATUS_and_raw_is_OK() {
QualityGateStatus someQGStatus = new QualityGateStatus(Measure.Level.OK);

when(measureRepository.getRawMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasure().setQualityGateStatus(someQGStatus).createNoValue()));
when(measureRepository.getBaseMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasure().createNoValue()));
when(measureRepository.getRawMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasureBuilder().setQualityGateStatus(someQGStatus).createNoValue()));
when(measureRepository.getBaseMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasureBuilder().createNoValue()));

underTest.execute();

@@ -160,8 +160,8 @@ public class QualityGateEventsStepTest {
private void verify_event_created_if_no_base_ALERT_STATUS_measure(Measure.Level rawAlterStatus, String expectedLabel) {
QualityGateStatus someQGStatus = new QualityGateStatus(rawAlterStatus, ALERT_TEXT);

when(measureRepository.getRawMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasure().setQualityGateStatus(someQGStatus).createNoValue()));
when(measureRepository.getBaseMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasure().createNoValue()));
when(measureRepository.getRawMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasureBuilder().setQualityGateStatus(someQGStatus).createNoValue()));
when(measureRepository.getBaseMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasureBuilder().createNoValue()));

underTest.execute();

@@ -188,8 +188,8 @@ public class QualityGateEventsStepTest {

@Test
public void no_event_created_if_base_ALERT_STATUS_measure_but_status_is_the_same() {
when(measureRepository.getRawMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasure().setQualityGateStatus(OK_QUALITY_GATE_STATUS).createNoValue()));
when(measureRepository.getBaseMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasure().setQualityGateStatus(OK_QUALITY_GATE_STATUS).createNoValue()));
when(measureRepository.getRawMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasureBuilder().setQualityGateStatus(OK_QUALITY_GATE_STATUS).createNoValue()));
when(measureRepository.getBaseMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasureBuilder().setQualityGateStatus(OK_QUALITY_GATE_STATUS).createNoValue()));

underTest.execute();

@@ -210,9 +210,9 @@ public class QualityGateEventsStepTest {

private void verify_event_created_if_base_ALERT_STATUS_measure_exists_and_status_has_changed(Measure.Level previousAlertStatus,
QualityGateStatus newQualityGateStatus, String expectedLabel) {
when(measureRepository.getRawMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasure().setQualityGateStatus(newQualityGateStatus).createNoValue()));
when(measureRepository.getRawMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(of(Measure.newMeasureBuilder().setQualityGateStatus(newQualityGateStatus).createNoValue()));
when(measureRepository.getBaseMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(
of(Measure.newMeasure().setQualityGateStatus(new QualityGateStatus(previousAlertStatus)).createNoValue()));
of(Measure.newMeasureBuilder().setQualityGateStatus(new QualityGateStatus(previousAlertStatus)).createNoValue()));

underTest.execute();


+ 1
- 1
server/sonar-server/src/test/java/org/sonar/server/computation/step/QualityProfileEventsStepTest.java View File

@@ -280,7 +280,7 @@ public class QualityProfileEventsStepTest {
}

private static Measure newMeasure(@Nullable QualityProfile... qps) {
return Measure.newMeasure().create(toJson(qps));
return Measure.newMeasureBuilder().create(toJson(qps));
}

private static String toJson(@Nullable QualityProfile... qps) {

Write Preview
Loading…
Cancel
Save