From: Sébastien Lesaint Date: Mon, 24 Aug 2015 16:17:36 +0000 (+0200) Subject: rename Counter#aggregate(LeafContext) to initialize(InitContext) X-Git-Tag: 5.2-RC1~566 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fa8f525260a4f77840c882170122b6586ccfeb39;p=sonarqube.git rename Counter#aggregate(LeafContext) to initialize(InitContext) this emphasis that this is really an initialization method and that it can be called on FILE or PROJECT_VIEW component but also, in the futur on a SUBVIEW (case of processing of partial trees of Views Components) --- diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/AverageFormula.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/AverageFormula.java index 1d8a4fa042b..1506751c82e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/AverageFormula.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/AverageFormula.java @@ -123,7 +123,7 @@ public class AverageFormula implements Formula { } @Override - public void aggregate(LeafAggregateContext context) { + public void initialize(CounterInitializationContext context) { Optional mainValueOptional = getDoubleValue(context.getMeasure(mainMetric)); if (!mainValueOptional.isPresent() && fallbackMetric != null) { mainValueOptional = getDoubleValue(context.getMeasure(fallbackMetric)); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/Counter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/Counter.java index 3c5df5503cb..35a9526eafd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/Counter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/Counter.java @@ -28,14 +28,15 @@ import static org.sonar.server.computation.component.Component.Type; public interface Counter> { /** - * This method is used on not leaf levels, to aggregate the value of counter from a child + * This method is used on not leaf levels, to aggregate the value of the specified counter of a child to the counter + * of the current component. */ void aggregate(T counter); /** - * This method is called on {@link Type#FILE} or {@link Type#PROJECT_VIEW} levels (aka. leaf levels), in order to - * populate the counter with one or more leaf measures. + * This method is called on leaves of the Component tree (usually a {@link Type#FILE} or a {@link Type#PROJECT_VIEW} + * but can also be a {@link Type#SUBVIEW} or {@link Type#VIEW}) to initialize the counter. */ - void aggregate(LeafAggregateContext context); + void initialize(CounterInitializationContext context); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/CounterInitializationContext.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/CounterInitializationContext.java new file mode 100644 index 00000000000..467e4fd399b --- /dev/null +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/CounterInitializationContext.java @@ -0,0 +1,49 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +package org.sonar.server.computation.formula; + +import com.google.common.base.Optional; +import java.util.List; +import org.sonar.server.computation.component.Component; +import org.sonar.server.computation.measure.Measure; +import org.sonar.server.computation.period.Period; + +/** + * The context passing information to {@link Counter#initialize(CounterInitializationContext)}. + */ +public interface CounterInitializationContext { + + /** + * The Component representing the currently processed leaf. + */ + Component getLeaf(); + + /** + * Retrieve the measure for the current component for the specified metric key if it exists. + */ + Optional getMeasure(String metricKey); + + /** + * Lists of Periods defined for the current project. They can be used to retrieve variations Measure. + */ + List getPeriods(); + +} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/DistributionFormula.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/DistributionFormula.java index 3f9ce4b0cb3..27c6229e0b0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/DistributionFormula.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/DistributionFormula.java @@ -68,7 +68,7 @@ public class DistributionFormula implements Formula measureOptional = context.getMeasure(metricKey); String data = measureOptional.isPresent() ? measureOptional.get().getData() : null; if (data != null) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/FormulaExecutorComponentVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/FormulaExecutorComponentVisitor.java index ec8476722f0..d5039b00107 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/FormulaExecutorComponentVisitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/FormulaExecutorComponentVisitor.java @@ -151,10 +151,10 @@ public class FormulaExecutorComponentVisitor extends PathAwareVisitorAdapter path) { - LeafAggregateContext counterContext = new LeafAggregateContextImpl(file); + CounterInitializationContext counterContext = new CounterInitializationContextImpl(file); for (Formula formula : formulas) { Counter counter = formula.createNewCounter(); - counter.aggregate(counterContext); + counter.initialize(counterContext); for (String metricKey : formula.getOutputMetricKeys()) { addNewMeasure(file, metricKey, formula, counter); } @@ -180,10 +180,10 @@ public class FormulaExecutorComponentVisitor extends PathAwareVisitorAdapter getMeasure(String metricKey); - - /** - * Lists of Periods defined for the current project. They can be used to retrieve variations Measure. - */ - List getPeriods(); - -} diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/IntSumCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/IntSumCounter.java index c5dd1c5f8e2..7ea3853ebac 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/IntSumCounter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/IntSumCounter.java @@ -21,7 +21,7 @@ package org.sonar.server.computation.formula.counter; import com.google.common.base.Optional; -import org.sonar.server.computation.formula.LeafAggregateContext; +import org.sonar.server.computation.formula.CounterInitializationContext; import org.sonar.server.computation.measure.Measure; /** @@ -46,7 +46,7 @@ public class IntSumCounter implements SumCounter { } @Override - public void aggregate(LeafAggregateContext context) { + public void initialize(CounterInitializationContext context) { Optional measureOptional = context.getMeasure(metricKey); if (measureOptional.isPresent()) { addValue(measureOptional.get().getIntValue()); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/LongSumCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/LongSumCounter.java index 30af1009ef7..4731f9b59a7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/LongSumCounter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/counter/LongSumCounter.java @@ -21,7 +21,7 @@ package org.sonar.server.computation.formula.counter; import com.google.common.base.Optional; -import org.sonar.server.computation.formula.LeafAggregateContext; +import org.sonar.server.computation.formula.CounterInitializationContext; import org.sonar.server.computation.measure.Measure; /** @@ -46,7 +46,7 @@ public class LongSumCounter implements SumCounter { } @Override - public void aggregate(LeafAggregateContext context) { + public void initialize(CounterInitializationContext context) { Optional measureOptional = context.getMeasure(metricKey); if (measureOptional.isPresent()) { addValue(measureOptional.get().getLongValue()); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/CoverageUtils.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/CoverageUtils.java index 7a72461d795..4646c06bd9b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/CoverageUtils.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/CoverageUtils.java @@ -20,7 +20,7 @@ package org.sonar.server.computation.formula.coverage; import com.google.common.base.Optional; -import org.sonar.server.computation.formula.LeafAggregateContext; +import org.sonar.server.computation.formula.CounterInitializationContext; import org.sonar.server.computation.measure.Measure; import org.sonar.server.computation.measure.MeasureVariations; import org.sonar.server.computation.period.Period; @@ -39,7 +39,7 @@ public final class CoverageUtils { return (100.0 * coveredLines) / lines; } - static long getLongMeasureValue(LeafAggregateContext counterContext, String metricKey) { + static long getLongMeasureValue(CounterInitializationContext counterContext, String metricKey) { Measure measure = counterContext.getMeasure(metricKey).or(DEFAULT_MEASURE); if (measure.getValueType() == Measure.ValueType.NO_VALUE) { return 0L; @@ -50,7 +50,7 @@ public final class CoverageUtils { return measure.getLongValue(); } - static MeasureVariations getMeasureVariations(LeafAggregateContext counterContext, String metricKey) { + static MeasureVariations getMeasureVariations(CounterInitializationContext counterContext, String metricKey) { Optional measure = counterContext.getMeasure(metricKey); if (!measure.isPresent() || !measure.get().hasVariations()) { return DEFAULT_VARIATIONS; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/ElementsAndCoveredElementsCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/ElementsAndCoveredElementsCounter.java index b78ec62fee3..9bf7c3ebec2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/ElementsAndCoveredElementsCounter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/ElementsAndCoveredElementsCounter.java @@ -21,7 +21,7 @@ package org.sonar.server.computation.formula.coverage; import org.sonar.server.computation.component.Component; import org.sonar.server.computation.formula.Counter; -import org.sonar.server.computation.formula.LeafAggregateContext; +import org.sonar.server.computation.formula.CounterInitializationContext; /** * A counter used to create a measure which are based on a count of elements and coveredElements. @@ -37,13 +37,13 @@ public abstract class ElementsAndCoveredElementsCounter implements Counter newLinesMeasure = counterContext.getMeasure(metricKeys.getLines()); if (!newLinesMeasure.isPresent() || !newLinesMeasure.get().hasVariations()) { return; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredCounter.java index 9b3908316aa..ddbf3931981 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredCounter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredCounter.java @@ -19,7 +19,7 @@ */ package org.sonar.server.computation.formula.coverage; -import org.sonar.server.computation.formula.LeafAggregateContext; +import org.sonar.server.computation.formula.CounterInitializationContext; import static org.sonar.server.computation.formula.coverage.CoverageUtils.getLongMeasureValue; @@ -31,7 +31,7 @@ public final class SingleWithUncoveredCounter extends ElementsAndCoveredElements } @Override - protected void aggregateForSupportedLeaf(LeafAggregateContext counterContext) { + protected void initializeForSupportedLeaf(CounterInitializationContext counterContext) { this.elements = getLongMeasureValue(counterContext, metricKeys.getCovered()); this.coveredElements = this.elements - getLongMeasureValue(counterContext, metricKeys.getUncovered()); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredVariationCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredVariationCounter.java index dd49f512873..4009600977b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredVariationCounter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/SingleWithUncoveredVariationCounter.java @@ -19,7 +19,7 @@ */ package org.sonar.server.computation.formula.coverage; -import org.sonar.server.computation.formula.LeafAggregateContext; +import org.sonar.server.computation.formula.CounterInitializationContext; import org.sonar.server.computation.measure.MeasureVariations; import org.sonar.server.computation.period.Period; @@ -35,7 +35,7 @@ public final class SingleWithUncoveredVariationCounter extends ElementsAndCovere } @Override - protected void aggregateForSupportedFile(LeafAggregateContext counterContext) { + protected void initializeForSupportedLeaf(CounterInitializationContext counterContext) { MeasureVariations newConditions = getMeasureVariations(counterContext, metricKeys.getCovered()); MeasureVariations uncoveredConditions = getMeasureVariations(counterContext, metricKeys.getUncovered()); for (Period period : counterContext.getPeriods()) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CommentMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/CommentMeasuresStep.java index 3a41699c5ea..f097f8d5d0f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CommentMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/CommentMeasuresStep.java @@ -29,7 +29,7 @@ import org.sonar.server.computation.formula.Counter; import org.sonar.server.computation.formula.CreateMeasureContext; import org.sonar.server.computation.formula.Formula; import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor; -import org.sonar.server.computation.formula.LeafAggregateContext; +import org.sonar.server.computation.formula.CounterInitializationContext; import org.sonar.server.computation.formula.counter.IntSumCounter; import org.sonar.server.computation.formula.counter.SumCounter; import org.sonar.server.computation.measure.Measure; @@ -184,9 +184,9 @@ public class CommentMeasuresStep implements ComputationStep { } @Override - public void aggregate(LeafAggregateContext context) { - publicApiCounter.aggregate(context); - publicUndocumentedApiCounter.aggregate(context); + public void initialize(CounterInitializationContext context) { + publicApiCounter.initialize(context); + publicUndocumentedApiCounter.initialize(context); } public Optional getPublicApiValue() { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/DuplicationMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/DuplicationMeasuresStep.java index 6c688cdcc93..ae7020cb558 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/DuplicationMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/DuplicationMeasuresStep.java @@ -31,7 +31,7 @@ import org.sonar.server.computation.formula.CreateMeasureContext; import org.sonar.server.computation.formula.Formula; import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor; import org.sonar.server.computation.formula.counter.IntSumCounter; -import org.sonar.server.computation.formula.LeafAggregateContext; +import org.sonar.server.computation.formula.CounterInitializationContext; import org.sonar.server.computation.measure.Measure; import org.sonar.server.computation.measure.MeasureRepository; import org.sonar.server.computation.metric.Metric; @@ -187,7 +187,7 @@ public class DuplicationMeasuresStep implements ComputationStep { } @Override - public void aggregate(LeafAggregateContext context) { + public void initialize(CounterInitializationContext context) { Optional measureOptional = context.getMeasure(metricKey); if (measureOptional.isPresent()) { value += measureOptional.get().getIntValue(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LanguageDistributionMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LanguageDistributionMeasuresStep.java index a02d08c1bea..b4665b47219 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/LanguageDistributionMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/LanguageDistributionMeasuresStep.java @@ -32,7 +32,7 @@ import org.sonar.server.computation.component.PathAwareCrawler; import org.sonar.server.computation.component.TreeRootHolder; import org.sonar.server.computation.formula.Counter; import org.sonar.server.computation.formula.CreateMeasureContext; -import org.sonar.server.computation.formula.LeafAggregateContext; +import org.sonar.server.computation.formula.CounterInitializationContext; import org.sonar.server.computation.formula.Formula; import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor; import org.sonar.server.computation.measure.Measure; @@ -115,7 +115,7 @@ public class LanguageDistributionMeasuresStep implements ComputationStep { } @Override - public void aggregate(LeafAggregateContext context) { + public void initialize(CounterInitializationContext context) { String language = context.getLeaf().getFileAttributes().getLanguageKey(); Optional ncloc = context.getMeasure(CoreMetrics.NCLOC_KEY); if (ncloc.isPresent()) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/NewCoverageMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/NewCoverageMeasuresStep.java index 86b0a22e819..5e2de9e9525 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/NewCoverageMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/NewCoverageMeasuresStep.java @@ -36,7 +36,7 @@ import org.sonar.server.computation.component.Component; import org.sonar.server.computation.component.PathAwareCrawler; import org.sonar.server.computation.component.TreeRootHolder; import org.sonar.server.computation.formula.CreateMeasureContext; -import org.sonar.server.computation.formula.LeafAggregateContext; +import org.sonar.server.computation.formula.CounterInitializationContext; import org.sonar.server.computation.formula.Formula; import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor; import org.sonar.server.computation.formula.counter.IntVariationValue; @@ -297,7 +297,7 @@ public class NewCoverageMeasuresStep implements ComputationStep { } @Override - public void aggregate(LeafAggregateContext context) { + public void initialize(CounterInitializationContext context) { Component fileComponent = context.getLeaf(); BatchReport.Changesets componentScm = batchReportReader.readChangesets(fileComponent.getReportAttributes().getRef()); if (componentScm == null) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/UnitTestMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/UnitTestMeasuresStep.java index 97e110ff0df..34bfb28cc85 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/UnitTestMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/UnitTestMeasuresStep.java @@ -29,7 +29,7 @@ import org.sonar.server.computation.formula.Counter; import org.sonar.server.computation.formula.CreateMeasureContext; import org.sonar.server.computation.formula.Formula; import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor; -import org.sonar.server.computation.formula.LeafAggregateContext; +import org.sonar.server.computation.formula.CounterInitializationContext; import org.sonar.server.computation.formula.counter.IntSumCounter; import org.sonar.server.computation.measure.Measure; import org.sonar.server.computation.measure.MeasureRepository; @@ -138,10 +138,10 @@ public class UnitTestMeasuresStep implements ComputationStep { } @Override - public void aggregate(LeafAggregateContext context) { - testsCounter.aggregate(context); - testsErrorsCounter.aggregate(context); - testsFailuresCounter.aggregate(context); + public void initialize(CounterInitializationContext context) { + testsCounter.initialize(context); + testsErrorsCounter.initialize(context); + testsFailuresCounter.initialize(context); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/AverageFormulaTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/AverageFormulaTest.java index 32c4d748261..32ad48aac48 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/AverageFormulaTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/AverageFormulaTest.java @@ -50,7 +50,7 @@ public class AverageFormulaTest { .setByMetricKey(FUNCTIONS_KEY) .build(); - LeafAggregateContext leafAggregateContext = mock(LeafAggregateContext.class); + CounterInitializationContext counterInitializationContext = mock(CounterInitializationContext.class); CreateMeasureContext createMeasureContext = new DumbCreateMeasureContext( ReportComponent.builder(Component.Type.PROJECT, 1).build(), mock(Metric.class), mock(PeriodsHolder.class)); @@ -108,7 +108,7 @@ public class AverageFormulaTest { AverageFormula.AverageCounter counter = BASIC_AVERAGE_FORMULA.createNewCounter(); addMeasure(COMPLEXITY_IN_FUNCTIONS_KEY, 10d); addMeasure(FUNCTIONS_KEY, 2d); - counter.aggregate(leafAggregateContext); + counter.initialize(counterInitializationContext); assertThat(BASIC_AVERAGE_FORMULA.createMeasure(counter, createMeasureContext).get().getDoubleValue()).isEqualTo(5d); } @@ -118,7 +118,7 @@ public class AverageFormulaTest { AverageFormula.AverageCounter anotherCounter = BASIC_AVERAGE_FORMULA.createNewCounter(); addMeasure(COMPLEXITY_IN_FUNCTIONS_KEY, 10d); addMeasure(FUNCTIONS_KEY, 2d); - anotherCounter.aggregate(leafAggregateContext); + anotherCounter.initialize(counterInitializationContext); AverageFormula.AverageCounter counter = BASIC_AVERAGE_FORMULA.createNewCounter(); counter.aggregate(anotherCounter); @@ -131,7 +131,7 @@ public class AverageFormulaTest { AverageFormula.AverageCounter counter = BASIC_AVERAGE_FORMULA.createNewCounter(); addMeasure(COMPLEXITY_IN_FUNCTIONS_KEY, 10d); addMeasure(FUNCTIONS_KEY, 2d); - counter.aggregate(leafAggregateContext); + counter.initialize(counterInitializationContext); assertThat(BASIC_AVERAGE_FORMULA.createMeasure(counter, createMeasureContext).get().getDoubleValue()).isEqualTo(5d); } @@ -141,7 +141,7 @@ public class AverageFormulaTest { AverageFormula.AverageCounter counter = BASIC_AVERAGE_FORMULA.createNewCounter(); addMeasure(COMPLEXITY_IN_FUNCTIONS_KEY, 10); addMeasure(FUNCTIONS_KEY, 2); - counter.aggregate(leafAggregateContext); + counter.initialize(counterInitializationContext); assertThat(BASIC_AVERAGE_FORMULA.createMeasure(counter, createMeasureContext).get().getDoubleValue()).isEqualTo(5); } @@ -151,7 +151,7 @@ public class AverageFormulaTest { AverageFormula.AverageCounter counter = BASIC_AVERAGE_FORMULA.createNewCounter(); addMeasure(COMPLEXITY_IN_FUNCTIONS_KEY, 10L); addMeasure(FUNCTIONS_KEY, 2L); - counter.aggregate(leafAggregateContext); + counter.initialize(counterInitializationContext); assertThat(BASIC_AVERAGE_FORMULA.createMeasure(counter, createMeasureContext).get().getDoubleValue()).isEqualTo(5L); } @@ -160,8 +160,8 @@ public class AverageFormulaTest { public void not_create_measure_when_aggregated_measure_has_no_value() { AverageFormula.AverageCounter counter = BASIC_AVERAGE_FORMULA.createNewCounter(); addMeasure(COMPLEXITY_IN_FUNCTIONS_KEY, 10L); - when(leafAggregateContext.getMeasure(FUNCTIONS_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().createNoValue())); - counter.aggregate(leafAggregateContext); + when(counterInitializationContext.getMeasure(FUNCTIONS_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().createNoValue())); + counter.initialize(counterInitializationContext); Assertions.assertThat(BASIC_AVERAGE_FORMULA.createMeasure(counter, createMeasureContext)).isAbsent(); } @@ -173,8 +173,8 @@ public class AverageFormulaTest { AverageFormula.AverageCounter counter = BASIC_AVERAGE_FORMULA.createNewCounter(); addMeasure(COMPLEXITY_IN_FUNCTIONS_KEY, 10L); - when(leafAggregateContext.getMeasure(FUNCTIONS_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().create("data"))); - counter.aggregate(leafAggregateContext); + when(counterInitializationContext.getMeasure(FUNCTIONS_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().create("data"))); + counter.initialize(counterInitializationContext); BASIC_AVERAGE_FORMULA.createMeasure(counter, createMeasureContext); } @@ -182,8 +182,8 @@ public class AverageFormulaTest { @Test public void no_measure_created_when_counter_has_no_value() { AverageFormula.AverageCounter counter = BASIC_AVERAGE_FORMULA.createNewCounter(); - when(leafAggregateContext.getMeasure(anyString())).thenReturn(Optional.absent()); - counter.aggregate(leafAggregateContext); + when(counterInitializationContext.getMeasure(anyString())).thenReturn(Optional.absent()); + counter.initialize(counterInitializationContext); Assertions.assertThat(BASIC_AVERAGE_FORMULA.createMeasure(counter, createMeasureContext)).isAbsent(); } @@ -192,8 +192,8 @@ public class AverageFormulaTest { public void not_create_measure_when_only_one_measure() { AverageFormula.AverageCounter counter = BASIC_AVERAGE_FORMULA.createNewCounter(); addMeasure(COMPLEXITY_IN_FUNCTIONS_KEY, 10L); - when(leafAggregateContext.getMeasure(FUNCTIONS_KEY)).thenReturn(Optional.absent()); - counter.aggregate(leafAggregateContext); + when(counterInitializationContext.getMeasure(FUNCTIONS_KEY)).thenReturn(Optional.absent()); + counter.initialize(counterInitializationContext); Assertions.assertThat(BASIC_AVERAGE_FORMULA.createMeasure(counter, createMeasureContext)).isAbsent(); } @@ -203,7 +203,7 @@ public class AverageFormulaTest { AverageFormula.AverageCounter counter = BASIC_AVERAGE_FORMULA.createNewCounter(); addMeasure(COMPLEXITY_IN_FUNCTIONS_KEY, 10d); addMeasure(FUNCTIONS_KEY, 0d); - counter.aggregate(leafAggregateContext); + counter.initialize(counterInitializationContext); Assertions.assertThat(BASIC_AVERAGE_FORMULA.createMeasure(counter, createMeasureContext)).isAbsent(); } @@ -218,10 +218,10 @@ public class AverageFormulaTest { .build(); AverageFormula.AverageCounter counter = underTest.createNewCounter(); - when(leafAggregateContext.getMeasure(COMPLEXITY_IN_FUNCTIONS_KEY)).thenReturn(Optional.absent()); + when(counterInitializationContext.getMeasure(COMPLEXITY_IN_FUNCTIONS_KEY)).thenReturn(Optional.absent()); addMeasure(COMPLEXITY_KEY, 10d); addMeasure(FUNCTIONS_KEY, 2d); - counter.aggregate(leafAggregateContext); + counter.initialize(counterInitializationContext); assertThat(underTest.createMeasure(counter, createMeasureContext).get().getDoubleValue()).isEqualTo(5d); } @@ -239,21 +239,21 @@ public class AverageFormulaTest { addMeasure(COMPLEXITY_IN_FUNCTIONS_KEY, 10d); addMeasure(COMPLEXITY_KEY, 12d); addMeasure(FUNCTIONS_KEY, 2d); - counter.aggregate(leafAggregateContext); + counter.initialize(counterInitializationContext); assertThat(underTest.createMeasure(counter, createMeasureContext).get().getDoubleValue()).isEqualTo(5d); } private void addMeasure(String metricKey, double value) { - when(leafAggregateContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value))); + when(counterInitializationContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value))); } private void addMeasure(String metricKey, int value) { - when(leafAggregateContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value))); + when(counterInitializationContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value))); } private void addMeasure(String metricKey, long value) { - when(leafAggregateContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value))); + when(counterInitializationContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value))); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/DistributionFormulaTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/DistributionFormulaTest.java index b6379b7df98..34964ba009e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/DistributionFormulaTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/DistributionFormulaTest.java @@ -43,7 +43,7 @@ public class DistributionFormulaTest { @Rule public ExpectedException thrown = ExpectedException.none(); - LeafAggregateContext leafAggregateContext = mock(LeafAggregateContext.class); + CounterInitializationContext counterInitializationContext = mock(CounterInitializationContext.class); CreateMeasureContext projectCreateMeasureContext = new DumbCreateMeasureContext( ReportComponent.builder(Component.Type.PROJECT, 1).build(), mock(Metric.class), mock(PeriodsHolder.class)); CreateMeasureContext fileCreateMeasureContext = new DumbCreateMeasureContext( @@ -71,7 +71,7 @@ public class DistributionFormulaTest { public void create_measure() { DistributionFormula.DistributionCounter counter = BASIC_DISTRIBUTION_FORMULA.createNewCounter(); addMeasure(FUNCTION_COMPLEXITY_DISTRIBUTION_KEY, "0=3;3=7;6=10"); - counter.aggregate(leafAggregateContext); + counter.initialize(counterInitializationContext); assertThat(BASIC_DISTRIBUTION_FORMULA.createMeasure(counter, projectCreateMeasureContext).get().getData()).isEqualTo("0=3;3=7;6=10"); } @@ -80,7 +80,7 @@ public class DistributionFormulaTest { public void create_measure_when_counter_is_aggregating_from_another_counter() { DistributionFormula.DistributionCounter anotherCounter = BASIC_DISTRIBUTION_FORMULA.createNewCounter(); addMeasure(FUNCTION_COMPLEXITY_DISTRIBUTION_KEY, "0=3;3=7;6=10"); - anotherCounter.aggregate(leafAggregateContext); + anotherCounter.initialize(counterInitializationContext); DistributionFormula.DistributionCounter counter = BASIC_DISTRIBUTION_FORMULA.createNewCounter(); counter.aggregate(anotherCounter); @@ -91,8 +91,8 @@ public class DistributionFormulaTest { @Test public void create_no_measure_when_no_value() { DistributionFormula.DistributionCounter counter = BASIC_DISTRIBUTION_FORMULA.createNewCounter(); - when(leafAggregateContext.getMeasure(FUNCTION_COMPLEXITY_DISTRIBUTION_KEY)).thenReturn(Optional.absent()); - counter.aggregate(leafAggregateContext); + when(counterInitializationContext.getMeasure(FUNCTION_COMPLEXITY_DISTRIBUTION_KEY)).thenReturn(Optional.absent()); + counter.initialize(counterInitializationContext); Assertions.assertThat(BASIC_DISTRIBUTION_FORMULA.createMeasure(counter, projectCreateMeasureContext)).isAbsent(); } @@ -101,13 +101,13 @@ public class DistributionFormulaTest { public void not_create_measure_when_on_file() { DistributionFormula.DistributionCounter counter = BASIC_DISTRIBUTION_FORMULA.createNewCounter(); addMeasure(FUNCTION_COMPLEXITY_DISTRIBUTION_KEY, "0=3;3=7;6=10"); - counter.aggregate(leafAggregateContext); + counter.initialize(counterInitializationContext); Assertions.assertThat(BASIC_DISTRIBUTION_FORMULA.createMeasure(counter, fileCreateMeasureContext)).isAbsent(); } private void addMeasure(String metricKey, String value) { - when(leafAggregateContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value))); + when(counterInitializationContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value))); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/IntSumFormulaTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/IntSumFormulaTest.java index c6343d78010..7c2878db2dd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/IntSumFormulaTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/IntSumFormulaTest.java @@ -46,7 +46,7 @@ public class IntSumFormulaTest { @Rule public ExpectedException thrown = ExpectedException.none(); - LeafAggregateContext leafAggregateContext = mock(LeafAggregateContext.class); + CounterInitializationContext counterInitializationContext = mock(CounterInitializationContext.class); CreateMeasureContext projectCreateMeasureContext = new DumbCreateMeasureContext( ReportComponent.builder(Component.Type.PROJECT, 1).build(), mock(Metric.class), mock(PeriodsHolder.class)); CreateMeasureContext fileCreateMeasureContext = new DumbCreateMeasureContext( @@ -74,7 +74,7 @@ public class IntSumFormulaTest { public void create_measure() { IntSumCounter counter = INT_SUM_FORMULA.createNewCounter(); addMeasure(LINES_KEY, 10); - counter.aggregate(leafAggregateContext); + counter.initialize(counterInitializationContext); assertThat(INT_SUM_FORMULA.createMeasure(counter, projectCreateMeasureContext).get().getIntValue()).isEqualTo(10); } @@ -83,7 +83,7 @@ public class IntSumFormulaTest { public void create_measure_when_counter_is_aggregating_from_another_counter() { IntSumCounter anotherCounter = INT_SUM_FORMULA.createNewCounter(); addMeasure(LINES_KEY, 10); - anotherCounter.aggregate(leafAggregateContext); + anotherCounter.initialize(counterInitializationContext); IntSumCounter counter = INT_SUM_FORMULA.createNewCounter(); counter.aggregate(anotherCounter); @@ -95,7 +95,7 @@ public class IntSumFormulaTest { public void not_create_measure_on_file() { IntSumCounter counter = INT_SUM_FORMULA.createNewCounter(); addMeasure(LINES_KEY, 10); - counter.aggregate(leafAggregateContext); + counter.initialize(counterInitializationContext); Assertions.assertThat(INT_SUM_FORMULA.createMeasure(counter, fileCreateMeasureContext)).isAbsent(); } @@ -103,14 +103,14 @@ public class IntSumFormulaTest { @Test public void do_not_create_measures_when_no_values() { IntSumCounter counter = INT_SUM_FORMULA.createNewCounter(); - when(leafAggregateContext.getMeasure(LINES_KEY)).thenReturn(Optional.absent()); - counter.aggregate(leafAggregateContext); + when(counterInitializationContext.getMeasure(LINES_KEY)).thenReturn(Optional.absent()); + counter.initialize(counterInitializationContext); Assertions.assertThat(INT_SUM_FORMULA.createMeasure(counter, projectCreateMeasureContext)).isAbsent(); } private void addMeasure(String metricKey, int value) { - when(leafAggregateContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value))); + when(counterInitializationContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value))); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/LongSumFormulaTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/LongSumFormulaTest.java index 20d28b6ff9d..10b8ee5a692 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/LongSumFormulaTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/LongSumFormulaTest.java @@ -47,7 +47,7 @@ public class LongSumFormulaTest { @Rule public ExpectedException thrown = ExpectedException.none(); - LeafAggregateContext leafAggregateContext = mock(LeafAggregateContext.class); + CounterInitializationContext counterInitializationContext = mock(CounterInitializationContext.class); CreateMeasureContext projectCreateMeasureContext = new DumbCreateMeasureContext( ReportComponent.builder(Component.Type.PROJECT, 1).build(), mock(Metric.class), mock(PeriodsHolder.class)); CreateMeasureContext fileCreateMeasureContext = new DumbCreateMeasureContext( @@ -75,7 +75,7 @@ public class LongSumFormulaTest { public void create_measure() { LongSumCounter counter = LONG_SUM_FORMULA.createNewCounter(); addMeasure(LINES_KEY, MEASURE_VALUE); - counter.aggregate(leafAggregateContext); + counter.initialize(counterInitializationContext); assertThat(LONG_SUM_FORMULA.createMeasure(counter, projectCreateMeasureContext).get().getLongValue()).isEqualTo(MEASURE_VALUE); } @@ -84,7 +84,7 @@ public class LongSumFormulaTest { public void create_measure_when_counter_is_aggregating_from_another_counter() { LongSumCounter anotherCounter = LONG_SUM_FORMULA.createNewCounter(); addMeasure(LINES_KEY, MEASURE_VALUE); - anotherCounter.aggregate(leafAggregateContext); + anotherCounter.initialize(counterInitializationContext); LongSumCounter counter = LONG_SUM_FORMULA.createNewCounter(); counter.aggregate(anotherCounter); @@ -96,7 +96,7 @@ public class LongSumFormulaTest { public void not_create_measure_on_file() { LongSumCounter counter = LONG_SUM_FORMULA.createNewCounter(); addMeasure(LINES_KEY, MEASURE_VALUE); - counter.aggregate(leafAggregateContext); + counter.initialize(counterInitializationContext); Assertions.assertThat(LONG_SUM_FORMULA.createMeasure(counter, fileCreateMeasureContext)).isAbsent(); } @@ -104,14 +104,14 @@ public class LongSumFormulaTest { @Test public void do_not_create_measures_when_no_values() { LongSumCounter counter = LONG_SUM_FORMULA.createNewCounter(); - when(leafAggregateContext.getMeasure(LINES_KEY)).thenReturn(Optional.absent()); - counter.aggregate(leafAggregateContext); + when(counterInitializationContext.getMeasure(LINES_KEY)).thenReturn(Optional.absent()); + counter.initialize(counterInitializationContext); Assertions.assertThat(LONG_SUM_FORMULA.createMeasure(counter, projectCreateMeasureContext)).isAbsent(); } private void addMeasure(String metricKey, long value) { - when(leafAggregateContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value))); + when(counterInitializationContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value))); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/ReportFormulaExecutorComponentVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/ReportFormulaExecutorComponentVisitorTest.java index 730e26cd6ee..b9f42a59ba5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/ReportFormulaExecutorComponentVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/ReportFormulaExecutorComponentVisitorTest.java @@ -286,7 +286,7 @@ public class ReportFormulaExecutorComponentVisitorTest { } @Override - public void aggregate(LeafAggregateContext context) { + public void initialize(CounterInitializationContext context) { // verify the context which is passed to the method assertThat(context.getLeaf().getReportAttributes().getRef()).isIn(1111, 1112, 1211); assertThat(context.getPeriods()).isEqualTo(periodsHolder.getPeriods()); @@ -337,7 +337,7 @@ public class ReportFormulaExecutorComponentVisitorTest { } @Override - public void aggregate(LeafAggregateContext context) { + public void initialize(CounterInitializationContext context) { // verify the context which is passed to the method assertThat(context.getLeaf().getReportAttributes().getRef()).isIn(1111, 1112, 1211); assertThat(context.getPeriods()).isEqualTo(periodsHolder.getPeriods()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/ViewsFormulaExecutorComponentVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/ViewsFormulaExecutorComponentVisitorTest.java index 568460ecd73..6103e0e8d80 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/ViewsFormulaExecutorComponentVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/ViewsFormulaExecutorComponentVisitorTest.java @@ -283,7 +283,7 @@ public class ViewsFormulaExecutorComponentVisitorTest { } @Override - public void aggregate(LeafAggregateContext context) { + public void initialize(CounterInitializationContext context) { verifyLeafContext(context); Optional measureOptional = context.getMeasure(LINES_KEY); @@ -332,7 +332,7 @@ public class ViewsFormulaExecutorComponentVisitorTest { } @Override - public void aggregate(LeafAggregateContext context) { + public void initialize(CounterInitializationContext context) { verifyLeafContext(context); Optional measureOptional = context.getMeasure(NEW_LINES_TO_COVER_KEY); @@ -366,7 +366,7 @@ public class ViewsFormulaExecutorComponentVisitorTest { entryOf(NEW_IT_COVERAGE_KEY, newMeasureBuilder().create(valueItCoverage))); } - private void verifyLeafContext(LeafAggregateContext context) { + private void verifyLeafContext(CounterInitializationContext context) { assertThat(context.getLeaf().getKey()).isIn(String.valueOf(PROJECT_VIEW_1_REF), String.valueOf(PROJECT_VIEW_2_REF), String.valueOf(PROJECT_VIEW_3_REF), String.valueOf(PROJECT_VIEW_4_REF)); assertThat(context.getPeriods()).isEqualTo(periodsHolder.getPeriods()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/IntSumCounterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/IntSumCounterTest.java index a2e22822c65..f291db68602 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/IntSumCounterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/IntSumCounterTest.java @@ -22,7 +22,7 @@ package org.sonar.server.computation.formula.counter; import com.google.common.base.Optional; import org.junit.Test; -import org.sonar.server.computation.formula.LeafAggregateContext; +import org.sonar.server.computation.formula.CounterInitializationContext; import org.sonar.server.computation.measure.Measure; import static org.assertj.core.api.Assertions.assertThat; @@ -35,7 +35,7 @@ public class IntSumCounterTest { private final static String METRIC_KEY = "metric"; - LeafAggregateContext leafAggregateContext = mock(LeafAggregateContext.class); + CounterInitializationContext counterInitializationContext = mock(CounterInitializationContext.class); SumCounter sumCounter = new IntSumCounter(METRIC_KEY); @@ -46,27 +46,27 @@ public class IntSumCounterTest { @Test public void aggregate_from_context() { - when(leafAggregateContext.getMeasure(METRIC_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(10))); + when(counterInitializationContext.getMeasure(METRIC_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(10))); - sumCounter.aggregate(leafAggregateContext); + sumCounter.initialize(counterInitializationContext); assertThat(sumCounter.getValue().get()).isEqualTo(10); } @Test public void no_value_when_aggregate_from_context_but_no_measure() { - when(leafAggregateContext.getMeasure(anyString())).thenReturn(Optional.absent()); + when(counterInitializationContext.getMeasure(anyString())).thenReturn(Optional.absent()); - sumCounter.aggregate(leafAggregateContext); + sumCounter.initialize(counterInitializationContext); assertThat(sumCounter.getValue()).isAbsent(); } @Test public void aggregate_from_counter() { - when(leafAggregateContext.getMeasure(METRIC_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(10))); + when(counterInitializationContext.getMeasure(METRIC_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(10))); SumCounter anotherCounter = new IntSumCounter(METRIC_KEY); - anotherCounter.aggregate(leafAggregateContext); + anotherCounter.initialize(counterInitializationContext); sumCounter.aggregate(anotherCounter); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/LongSumCounterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/LongSumCounterTest.java index b79513a0972..e2d0112cb8b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/LongSumCounterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/counter/LongSumCounterTest.java @@ -22,7 +22,7 @@ package org.sonar.server.computation.formula.counter; import com.google.common.base.Optional; import org.junit.Test; -import org.sonar.server.computation.formula.LeafAggregateContext; +import org.sonar.server.computation.formula.CounterInitializationContext; import org.sonar.server.computation.measure.Measure; import static org.assertj.core.api.Assertions.assertThat; @@ -36,7 +36,7 @@ public class LongSumCounterTest { private static final String METRIC_KEY = "metric"; private static final long MEASURE_VALUE = 10L; - LeafAggregateContext leafAggregateContext = mock(LeafAggregateContext.class); + CounterInitializationContext counterInitializationContext = mock(CounterInitializationContext.class); SumCounter sumCounter = new LongSumCounter(METRIC_KEY); @@ -47,27 +47,27 @@ public class LongSumCounterTest { @Test public void aggregate_from_context() { - when(leafAggregateContext.getMeasure(METRIC_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(MEASURE_VALUE))); + when(counterInitializationContext.getMeasure(METRIC_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(MEASURE_VALUE))); - sumCounter.aggregate(leafAggregateContext); + sumCounter.initialize(counterInitializationContext); assertThat(sumCounter.getValue().get()).isEqualTo(MEASURE_VALUE); } @Test public void no_value_when_aggregate_from_context_but_no_measure() { - when(leafAggregateContext.getMeasure(anyString())).thenReturn(Optional.absent()); + when(counterInitializationContext.getMeasure(anyString())).thenReturn(Optional.absent()); - sumCounter.aggregate(leafAggregateContext); + sumCounter.initialize(counterInitializationContext); assertThat(sumCounter.getValue()).isAbsent(); } @Test public void aggregate_from_counter() { - when(leafAggregateContext.getMeasure(METRIC_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(MEASURE_VALUE))); + when(counterInitializationContext.getMeasure(METRIC_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(MEASURE_VALUE))); SumCounter anotherCounter = new LongSumCounter(METRIC_KEY); - anotherCounter.aggregate(leafAggregateContext); + anotherCounter.initialize(counterInitializationContext); sumCounter.aggregate(anotherCounter); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/coverage/CoverageUtilsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/coverage/CoverageUtilsTest.java index 5037f815083..9be8edbbae1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/coverage/CoverageUtilsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/coverage/CoverageUtilsTest.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.ExternalResource; import org.sonar.server.computation.component.Component; -import org.sonar.server.computation.formula.LeafAggregateContext; +import org.sonar.server.computation.formula.CounterInitializationContext; import org.sonar.server.computation.measure.Measure; import org.sonar.server.computation.measure.MeasureVariations; import org.sonar.server.computation.period.Period; @@ -47,7 +47,7 @@ public class CoverageUtilsTest { public static final MeasureVariations DEFAULT_VARIATIONS = new MeasureVariations(0d, 0d, 0d, 0d, 0d); @Rule - public LeafAggregateContextRule fileAggregateContext = new LeafAggregateContextRule(); + public CounterInitializationContextRule fileAggregateContext = new CounterInitializationContextRule(); @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -127,10 +127,10 @@ public class CoverageUtilsTest { return new Period(periodIndex, "mode" + periodIndex, null, 963L + periodIndex, 9865L + periodIndex); } - private static class LeafAggregateContextRule extends ExternalResource implements LeafAggregateContext { + private static class CounterInitializationContextRule extends ExternalResource implements CounterInitializationContext { private final Map measures = new HashMap<>(); - public LeafAggregateContextRule put(String metricKey, Measure measure) { + public CounterInitializationContextRule put(String metricKey, Measure measure) { checkNotNull(metricKey); checkNotNull(measure); checkState(!measures.containsKey(metricKey));