rename FileAggregateContext to LeafAggregateContext

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 6b26fbb3c4b6c4753d195c28fc4a690e7b17cce7..1d8a4fa042b8e908b22e935d6d8afdd9d95d6d6d 100644 (file)
--- 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<AverageFormula.AverageCounter> {
     }
 
     @Override
-    public void aggregate(FileAggregateContext context) {
+    public void aggregate(LeafAggregateContext context) {
       Optional<Double> 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 1989be3b3b368e4d81a251f67f696b044d7c2a20..3c5df5503cb14cce37bc1d640e7c0cce0fabff13 100644 (file)
--- 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,13 +28,14 @@ import static org.sonar.server.computation.component.Component.Type;
 public interface Counter<T extends Counter<T>> {
 
   /**
-   * This method is used on not {@link Type#FILE} levels, to aggregate the value of counter from a child
+   * This method is used on not leaf levels, to aggregate the value of counter from a child
    */
   void aggregate(T counter);
 
   /**
-   * This method is called on {@link Type#FILE} levels, in order to populate the counter with one or more {@link Type#FILE} measures.
+   * 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.
    */
-  void aggregate(FileAggregateContext context);
+  void aggregate(LeafAggregateContext context);
 
 }

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 df5b0a44686496fdf785b7898da1aa518c9ed2fc..3f9ce4b0cb33dfeebec757d6b95faa689b9456a2 100644 (file)
--- 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<DistributionFormula.Distribu
     }
 
     @Override
-    public void aggregate(FileAggregateContext context) {
+    public void aggregate(LeafAggregateContext context) {
       Optional<Measure> 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/FileAggregateContext.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/FileAggregateContext.java
deleted file mode 100644 (file)
index 3a0e70a..0000000
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/FileAggregateContext.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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#aggregate(FileAggregateContext)}.
- */
-public interface FileAggregateContext {
-
-  /**
-   * The Component representing the currently processed File.
-   */
-  Component getFile();
-
-  /**
-   * Retrieve the measure for the current File with the metric key if it exists.
-   */
-  Optional<Measure> getMeasure(String metricKey);
-
-  /**
-   * Lists of Periods defined for the current project. They can be used to retrieve variations Measure.
-   */
-  List<Period> getPeriods();
-
-}

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 3a98528879616e9022c3e75be5c05acd6677d64c..ac038c0da08071c3928afeda78f3ba3f06e953c7 100644 (file)
--- 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
@@ -104,17 +104,17 @@ public class FormulaExecutorComponentVisitor extends PathAwareVisitorAdapter<For
 
   @Override
   public void visitProject(Component project, Path<FormulaExecutorComponentVisitor.Counters> path) {
-    processNotFile(project, path);
+    processNotLeaf(project, path);
   }
 
   @Override
   public void visitModule(Component module, Path<FormulaExecutorComponentVisitor.Counters> path) {
-    processNotFile(module, path);
+    processNotLeaf(module, path);
   }
 
   @Override
   public void visitDirectory(Component directory, Path<FormulaExecutorComponentVisitor.Counters> path) {
-    processNotFile(directory, path);
+    processNotLeaf(directory, path);
   }
 
   @Override
@@ -124,12 +124,12 @@ public class FormulaExecutorComponentVisitor extends PathAwareVisitorAdapter<For
 
   @Override
   public void visitView(Component view, Path<Counters> path) {
-    processNotFile(view, path);
+    processNotLeaf(view, path);
   }
 
   @Override
   public void visitSubView(Component subView, Path<Counters> path) {
-    processNotFile(subView, path);
+    processNotLeaf(subView, path);
   }
 
   @Override
@@ -137,7 +137,7 @@ public class FormulaExecutorComponentVisitor extends PathAwareVisitorAdapter<For
     processLeaf(projectView, path);
   }
 
-  private void processNotFile(Component component, Path<FormulaExecutorComponentVisitor.Counters> path) {
+  private void processNotLeaf(Component component, Path<FormulaExecutorComponentVisitor.Counters> path) {
     for (Formula formula : formulas) {
       Counter counter = path.current().getCounter(formula);
       // If there were no file under this node, the counter won't be initialized
@@ -151,7 +151,7 @@ public class FormulaExecutorComponentVisitor extends PathAwareVisitorAdapter<For
   }
 
   private void processLeaf(Component file, Path<FormulaExecutorComponentVisitor.Counters> path) {
-    FileAggregateContext counterContext = new FileAggregateContextImpl(file);
+    LeafAggregateContext counterContext = new LeafAggregateContextImpl(file);
     for (Formula formula : formulas) {
       Counter counter = formula.createNewCounter();
       counter.aggregate(counterContext);
@@ -176,15 +176,15 @@ public class FormulaExecutorComponentVisitor extends PathAwareVisitorAdapter<For
     }
   }
 
-  private class FileAggregateContextImpl implements FileAggregateContext {
+  private class LeafAggregateContextImpl implements LeafAggregateContext {
     private final Component file;
 
-    public FileAggregateContextImpl(Component file) {
+    public LeafAggregateContextImpl(Component file) {
       this.file = file;
     }
 
     @Override
-    public Component getFile() {
+    public Component getLeaf() {
       return file;
     }
 

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/LeafAggregateContext.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/LeafAggregateContext.java
new file mode 100644 (file)
index 0000000..a70e61a
--- /dev/null
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/LeafAggregateContext.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#aggregate(LeafAggregateContext)}.
+ */
+public interface LeafAggregateContext {
+
+  /**
+   * 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<Measure> getMeasure(String metricKey);
+
+  /**
+   * Lists of Periods defined for the current project. They can be used to retrieve variations Measure.
+   */
+  List<Period> getPeriods();
+
+}

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/SumCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/SumCounter.java
index 1a801e38e6de7c5c1af12a3f745a4a081618a527..69bf85cbeb4f651cbffc7c7b58ff8317ae7e73b8 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/SumCounter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/SumCounter.java
@@ -45,7 +45,7 @@ public class SumCounter implements Counter<SumCounter> {
   }
 
   @Override
-  public void aggregate(FileAggregateContext context) {
+  public void aggregate(LeafAggregateContext context) {
     Optional<Measure> 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/coverage/CoverageUtils.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/CoverageUtils.java
index 515004238d4fb20f43beaad35bea4c748084914c..7a72461d795962bba0ea1ffc19275d714585fab4 100644 (file)
--- 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.FileAggregateContext;
+import org.sonar.server.computation.formula.LeafAggregateContext;
 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(FileAggregateContext counterContext, String metricKey) {
+  static long getLongMeasureValue(LeafAggregateContext 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(FileAggregateContext counterContext, String metricKey) {
+  static MeasureVariations getMeasureVariations(LeafAggregateContext counterContext, String metricKey) {
     Optional<Measure> 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 99ede70aaf0fad09213abd7ca4e80232bd33be9c..38ef6f502848d975e3bf91043ba54b790778007b 100644 (file)
--- 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
@@ -20,7 +20,7 @@
 package org.sonar.server.computation.formula.coverage;
 
 import org.sonar.server.computation.formula.Counter;
-import org.sonar.server.computation.formula.FileAggregateContext;
+import org.sonar.server.computation.formula.LeafAggregateContext;
 
 /**
  * A counter used to create a measure which are based on a count of elements and coveredElements.
@@ -36,12 +36,12 @@ public abstract class ElementsAndCoveredElementsCounter implements Counter<Eleme
   }
 
   @Override
-  public void aggregate(FileAggregateContext context) {
-    if (context.getFile().getFileAttributes().isUnitTest()) {
+  public void aggregate(LeafAggregateContext context) {
+    if (context.getLeaf().getFileAttributes().isUnitTest()) {
       return;
     }
-    aggregateForSupportedFile(context);
+    aggregateForSupportedLeaf(context);
   }
 
-  protected abstract void aggregateForSupportedFile(FileAggregateContext counterContext);
+  protected abstract void aggregateForSupportedLeaf(LeafAggregateContext counterContext);
 }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/ElementsAndCoveredElementsVariationCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/ElementsAndCoveredElementsVariationCounter.java
index fafef2f604264c8567fa901da8af453be8bd79ed..f60c0a231709814721cfa1b344bbec3d90b42003 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/ElementsAndCoveredElementsVariationCounter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/ElementsAndCoveredElementsVariationCounter.java
@@ -20,7 +20,7 @@
 package org.sonar.server.computation.formula.coverage;
 
 import org.sonar.server.computation.formula.Counter;
-import org.sonar.server.computation.formula.FileAggregateContext;
+import org.sonar.server.computation.formula.LeafAggregateContext;
 import org.sonar.server.computation.formula.counter.LongVariationValue;
 
 /**
@@ -37,12 +37,12 @@ public abstract class ElementsAndCoveredElementsVariationCounter implements Coun
   }
 
   @Override
-  public void aggregate(FileAggregateContext context) {
-    if (context.getFile().getFileAttributes().isUnitTest()) {
+  public void aggregate(LeafAggregateContext context) {
+    if (context.getLeaf().getFileAttributes().isUnitTest()) {
       return;
     }
     aggregateForSupportedFile(context);
   }
 
-  protected abstract void aggregateForSupportedFile(FileAggregateContext counterContext);
+  protected abstract void aggregateForSupportedFile(LeafAggregateContext counterContext);
 }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredCounter.java
index ac9e9c4019283372130a4c9325a0699f6feb735c..eed56193cecffb1e12f848e2797640f7a56bfc36 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredCounter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredCounter.java
@@ -19,7 +19,7 @@
  */
 package org.sonar.server.computation.formula.coverage;
 
-import org.sonar.server.computation.formula.FileAggregateContext;
+import org.sonar.server.computation.formula.LeafAggregateContext;
 
 import static org.sonar.server.computation.formula.coverage.CoverageUtils.getLongMeasureValue;
 
@@ -31,7 +31,7 @@ public final class LinesAndConditionsWithUncoveredCounter extends ElementsAndCov
   }
 
   @Override
-  protected void aggregateForSupportedFile(FileAggregateContext counterContext) {
+  protected void aggregateForSupportedLeaf(LeafAggregateContext counterContext) {
     this.elements = getLongMeasureValue(counterContext, metricKeys.getLines())
       + getLongMeasureValue(counterContext, metricKeys.getConditions());
     this.coveredElements = this.elements

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java
index cec4587a682d609948668ff4bf0a087e4903cd0d..e54e6d233a5173927b58cff5d5b993829e923692 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/formula/coverage/LinesAndConditionsWithUncoveredVariationCounter.java
@@ -20,7 +20,7 @@
 package org.sonar.server.computation.formula.coverage;
 
 import com.google.common.base.Optional;
-import org.sonar.server.computation.formula.FileAggregateContext;
+import org.sonar.server.computation.formula.LeafAggregateContext;
 import org.sonar.server.computation.measure.Measure;
 import org.sonar.server.computation.measure.MeasureVariations;
 import org.sonar.server.computation.period.Period;
@@ -33,7 +33,7 @@ public final class LinesAndConditionsWithUncoveredVariationCounter extends Eleme
   }
 
   @Override
-  public void aggregateForSupportedFile(FileAggregateContext counterContext) {
+  public void aggregateForSupportedFile(LeafAggregateContext counterContext) {
     Optional<Measure> 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 78c6898b50b856585b1ce7f84563a3f5305abb9a..9b3908316aae3b53e3fe3a73a2c68679406a5a91 100644 (file)
--- 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.FileAggregateContext;
+import org.sonar.server.computation.formula.LeafAggregateContext;
 
 import static org.sonar.server.computation.formula.coverage.CoverageUtils.getLongMeasureValue;
 
@@ -31,7 +31,7 @@ public final class SingleWithUncoveredCounter extends ElementsAndCoveredElements
   }
 
   @Override
-  protected void aggregateForSupportedFile(FileAggregateContext counterContext) {
+  protected void aggregateForSupportedLeaf(LeafAggregateContext 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 b15e0dc06e990a8e6c77d30999743d6125a40d5a..dd49f51287304c3092582f50c3d60c8283f33934 100644 (file)
--- 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.FileAggregateContext;
+import org.sonar.server.computation.formula.LeafAggregateContext;
 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(FileAggregateContext counterContext) {
+  protected void aggregateForSupportedFile(LeafAggregateContext 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 b1f29655517b264fe12fa3d295bf8ddee2e2d1b2..1dbe156d3ff8b466a9304795b0fe1e396a3a51e9 100644 (file)
--- 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
@@ -27,7 +27,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.FileAggregateContext;
+import org.sonar.server.computation.formula.LeafAggregateContext;
 import org.sonar.server.computation.formula.Formula;
 import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor;
 import org.sonar.server.computation.formula.SumCounter;
@@ -181,7 +181,7 @@ public class CommentMeasuresStep implements ComputationStep {
     }
 
     @Override
-    public void aggregate(FileAggregateContext context) {
+    public void aggregate(LeafAggregateContext context) {
       publicApiCounter.aggregate(context);
       publicUndocumentedApiCounter.aggregate(context);
     }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CoverageMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/CoverageMeasuresStep.java
index 15a580f374a33f322fe623fad36572a26c814951..8279c00ec06f8111c9e237bc9f7ca4d64f804ec8 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/CoverageMeasuresStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/CoverageMeasuresStep.java
@@ -67,8 +67,7 @@ public class CoverageMeasuresStep implements ComputationStep {
     new CodeCoverageFormula(),
     new BranchCoverageFormula(),
     new LineCoverageFormula(),
-
-  // integration test
+    // integration test
     new SumFormula(IT_LINES_TO_COVER_KEY),
     new SumFormula(IT_UNCOVERED_LINES_KEY),
     new SumFormula(IT_CONDITIONS_TO_COVER_KEY),
@@ -76,8 +75,7 @@ public class CoverageMeasuresStep implements ComputationStep {
     new ItCoverageFormula(),
     new ItBranchCoverageFormula(),
     new ItLineCoverageFormula(),
-
-  // overall test
+    // overall test
     new SumFormula(OVERALL_LINES_TO_COVER_KEY),
     new SumFormula(OVERALL_UNCOVERED_LINES_KEY),
     new SumFormula(OVERALL_CONDITIONS_TO_COVER_KEY),

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 41829a0e7f02d9594fe7c5110e2b2cadf08f425a..aa058b199c41174c0f81e8dfb958a65ae7df1feb 100644 (file)
--- 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
@@ -28,7 +28,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.FileAggregateContext;
+import org.sonar.server.computation.formula.LeafAggregateContext;
 import org.sonar.server.computation.formula.Formula;
 import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor;
 import org.sonar.server.computation.formula.SumCounter;
@@ -187,7 +187,7 @@ public class DuplicationMeasuresStep implements ComputationStep {
     }
 
     @Override
-    public void aggregate(FileAggregateContext context) {
+    public void aggregate(LeafAggregateContext context) {
       Optional<Measure> 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 b8fd33be7b8583a0efd52fbdf6c00995435a2bbf..a02d08c1bea28245ab2b9d022608f2a0ccc23ae2 100644 (file)
--- 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.FileAggregateContext;
+import org.sonar.server.computation.formula.LeafAggregateContext;
 import org.sonar.server.computation.formula.Formula;
 import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor;
 import org.sonar.server.computation.measure.Measure;
@@ -115,8 +115,8 @@ public class LanguageDistributionMeasuresStep implements ComputationStep {
     }
 
     @Override
-    public void aggregate(FileAggregateContext context) {
-      String language = context.getFile().getFileAttributes().getLanguageKey();
+    public void aggregate(LeafAggregateContext context) {
+      String language = context.getLeaf().getFileAttributes().getLanguageKey();
       Optional<Measure> ncloc = context.getMeasure(CoreMetrics.NCLOC_KEY);
       if (ncloc.isPresent()) {
         multiset.add(language == null ? UNKNOWN_LANGUAGE_KEY : language, ncloc.get().getIntValue());

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 d4e9ed624f16ee887a9295a725141befe019da16..86b0a22e819460f69187f7c48d21f19260a2d143 100644 (file)
--- 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.FileAggregateContext;
+import org.sonar.server.computation.formula.LeafAggregateContext;
 import org.sonar.server.computation.formula.Formula;
 import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor;
 import org.sonar.server.computation.formula.counter.IntVariationValue;
@@ -297,8 +297,8 @@ public class NewCoverageMeasuresStep implements ComputationStep {
     }
 
     @Override
-    public void aggregate(FileAggregateContext context) {
-      Component fileComponent = context.getFile();
+    public void aggregate(LeafAggregateContext context) {
+      Component fileComponent = context.getLeaf();
       BatchReport.Changesets componentScm = batchReportReader.readChangesets(fileComponent.getReportAttributes().getRef());
       if (componentScm == null) {
         return;

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 71bfe5ef3a27b91f2c5d0747b018ce71ce6cffd2..b76cfa2282c93861798019ae70aa3835a00b8475 100644 (file)
--- 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
@@ -27,7 +27,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.FileAggregateContext;
+import org.sonar.server.computation.formula.LeafAggregateContext;
 import org.sonar.server.computation.formula.Formula;
 import org.sonar.server.computation.formula.FormulaExecutorComponentVisitor;
 import org.sonar.server.computation.formula.SumCounter;
@@ -138,7 +138,7 @@ public class UnitTestMeasuresStep implements ComputationStep {
     }
 
     @Override
-    public void aggregate(FileAggregateContext context) {
+    public void aggregate(LeafAggregateContext context) {
       testsCounter.aggregate(context);
       testsErrorsCounter.aggregate(context);
       testsFailuresCounter.aggregate(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 319a796f2bd97b551edac399eebf9b4afbf0febd..32c4d748261ce6d57bcf357589aeecc8367333a6 100644 (file)
--- 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();
 
-  FileAggregateContext fileAggregateContext = mock(FileAggregateContext.class);
+  LeafAggregateContext leafAggregateContext = mock(LeafAggregateContext.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(fileAggregateContext);
+    counter.aggregate(leafAggregateContext);
 
     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(fileAggregateContext);
+    anotherCounter.aggregate(leafAggregateContext);
 
     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(fileAggregateContext);
+    counter.aggregate(leafAggregateContext);
 
     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(fileAggregateContext);
+    counter.aggregate(leafAggregateContext);
 
     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(fileAggregateContext);
+    counter.aggregate(leafAggregateContext);
 
     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(fileAggregateContext.getMeasure(FUNCTIONS_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().createNoValue()));
-    counter.aggregate(fileAggregateContext);
+    when(leafAggregateContext.getMeasure(FUNCTIONS_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().createNoValue()));
+    counter.aggregate(leafAggregateContext);
 
     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(fileAggregateContext.getMeasure(FUNCTIONS_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().create("data")));
-    counter.aggregate(fileAggregateContext);
+    when(leafAggregateContext.getMeasure(FUNCTIONS_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().create("data")));
+    counter.aggregate(leafAggregateContext);
 
     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(fileAggregateContext.getMeasure(anyString())).thenReturn(Optional.<Measure>absent());
-    counter.aggregate(fileAggregateContext);
+    when(leafAggregateContext.getMeasure(anyString())).thenReturn(Optional.<Measure>absent());
+    counter.aggregate(leafAggregateContext);
 
     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(fileAggregateContext.getMeasure(FUNCTIONS_KEY)).thenReturn(Optional.<Measure>absent());
-    counter.aggregate(fileAggregateContext);
+    when(leafAggregateContext.getMeasure(FUNCTIONS_KEY)).thenReturn(Optional.<Measure>absent());
+    counter.aggregate(leafAggregateContext);
 
     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(fileAggregateContext);
+    counter.aggregate(leafAggregateContext);
 
     Assertions.assertThat(BASIC_AVERAGE_FORMULA.createMeasure(counter, createMeasureContext)).isAbsent();
   }
@@ -218,10 +218,10 @@ public class AverageFormulaTest {
       .build();
 
     AverageFormula.AverageCounter counter = underTest.createNewCounter();
-    when(fileAggregateContext.getMeasure(COMPLEXITY_IN_FUNCTIONS_KEY)).thenReturn(Optional.<Measure>absent());
+    when(leafAggregateContext.getMeasure(COMPLEXITY_IN_FUNCTIONS_KEY)).thenReturn(Optional.<Measure>absent());
     addMeasure(COMPLEXITY_KEY, 10d);
     addMeasure(FUNCTIONS_KEY, 2d);
-    counter.aggregate(fileAggregateContext);
+    counter.aggregate(leafAggregateContext);
 
     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(fileAggregateContext);
+    counter.aggregate(leafAggregateContext);
 
     assertThat(underTest.createMeasure(counter, createMeasureContext).get().getDoubleValue()).isEqualTo(5d);
   }
 
   private void addMeasure(String metricKey, double value) {
-    when(fileAggregateContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value)));
+    when(leafAggregateContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value)));
   }
 
   private void addMeasure(String metricKey, int value) {
-    when(fileAggregateContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value)));
+    when(leafAggregateContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value)));
   }
 
   private void addMeasure(String metricKey, long value) {
-    when(fileAggregateContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value)));
+    when(leafAggregateContext.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 7f4b623e4852fb06a7ebe6410bdf9bcff477ad44..b6379b7df981c890a2465dcbaa668cb4b5195343 100644 (file)
--- 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();
 
-  FileAggregateContext fileAggregateContext = mock(FileAggregateContext.class);
+  LeafAggregateContext leafAggregateContext = mock(LeafAggregateContext.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(fileAggregateContext);
+    counter.aggregate(leafAggregateContext);
 
     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(fileAggregateContext);
+    anotherCounter.aggregate(leafAggregateContext);
 
     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(fileAggregateContext.getMeasure(FUNCTION_COMPLEXITY_DISTRIBUTION_KEY)).thenReturn(Optional.<Measure>absent());
-    counter.aggregate(fileAggregateContext);
+    when(leafAggregateContext.getMeasure(FUNCTION_COMPLEXITY_DISTRIBUTION_KEY)).thenReturn(Optional.<Measure>absent());
+    counter.aggregate(leafAggregateContext);
 
     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(fileAggregateContext);
+    counter.aggregate(leafAggregateContext);
 
     Assertions.assertThat(BASIC_DISTRIBUTION_FORMULA.createMeasure(counter, fileCreateMeasureContext)).isAbsent();
   }
 
   private void addMeasure(String metricKey, String value) {
-    when(fileAggregateContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value)));
+    when(leafAggregateContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value)));
   }
 
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/FormulaExecutorComponentVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/FormulaExecutorComponentVisitorTest.java
index 8070f6b95f02d2e0ab4ff02a54963c553fc2d9a0..9cdaad86f97236f03274bc908d29dc9f9af8ba7e 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/FormulaExecutorComponentVisitorTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/FormulaExecutorComponentVisitorTest.java
@@ -287,9 +287,9 @@ public class FormulaExecutorComponentVisitorTest {
     }
 
     @Override
-    public void aggregate(FileAggregateContext context) {
+    public void aggregate(LeafAggregateContext context) {
       // verify the context which is passed to the method
-      assertThat(context.getFile().getReportAttributes().getRef()).isIn(1111, 1112, 1211);
+      assertThat(context.getLeaf().getReportAttributes().getRef()).isIn(1111, 1112, 1211);
       assertThat(context.getPeriods()).isEqualTo(periodsHolder.getPeriods());
 
       Optional<Measure> measureOptional = context.getMeasure(LINES_KEY);
@@ -339,9 +339,9 @@ public class FormulaExecutorComponentVisitorTest {
     }
 
     @Override
-    public void aggregate(FileAggregateContext context) {
+    public void aggregate(LeafAggregateContext context) {
       // verify the context which is passed to the method
-      assertThat(context.getFile().getReportAttributes().getRef()).isIn(1111, 1112, 1211);
+      assertThat(context.getLeaf().getReportAttributes().getRef()).isIn(1111, 1112, 1211);
       assertThat(context.getPeriods()).isEqualTo(periodsHolder.getPeriods());
 
       Optional<Measure> measureOptional = context.getMeasure(NEW_LINES_TO_COVER_KEY);

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/SumCounterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/SumCounterTest.java
index 00cca9791f6ce105abab0b9361572c0b4fea63a1..8a11c3bb3f82a730ef6e829f867fad9a739eec2b 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/SumCounterTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/SumCounterTest.java
@@ -34,7 +34,7 @@ public class SumCounterTest {
 
   private final static String METRIC_KEY = "metric";
 
-  FileAggregateContext fileAggregateContext = mock(FileAggregateContext.class);
+  LeafAggregateContext leafAggregateContext = mock(LeafAggregateContext.class);
 
   SumCounter sumCounter = new SumCounter(METRIC_KEY);
 
@@ -45,27 +45,27 @@ public class SumCounterTest {
 
   @Test
   public void aggregate_from_context() {
-    when(fileAggregateContext.getMeasure(METRIC_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(10)));
+    when(leafAggregateContext.getMeasure(METRIC_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(10)));
 
-    sumCounter.aggregate(fileAggregateContext);
+    sumCounter.aggregate(leafAggregateContext);
 
     assertThat(sumCounter.getValue().get()).isEqualTo(10);
   }
 
   @Test
   public void no_value_when_aggregate_from_context_but_no_measure() {
-    when(fileAggregateContext.getMeasure(anyString())).thenReturn(Optional.<Measure>absent());
+    when(leafAggregateContext.getMeasure(anyString())).thenReturn(Optional.<Measure>absent());
 
-    sumCounter.aggregate(fileAggregateContext);
+    sumCounter.aggregate(leafAggregateContext);
 
     assertThat(sumCounter.getValue()).isAbsent();
   }
 
   @Test
   public void aggregate_from_counter() {
-    when(fileAggregateContext.getMeasure(METRIC_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(10)));
+    when(leafAggregateContext.getMeasure(METRIC_KEY)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(10)));
     SumCounter anotherCounter = new SumCounter(METRIC_KEY);
-    anotherCounter.aggregate(fileAggregateContext);
+    anotherCounter.aggregate(leafAggregateContext);
 
     sumCounter.aggregate(anotherCounter);
 

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/SumFormulaTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/SumFormulaTest.java
index c9a7fe67c1fe10cc3b21f742f62a545014ad0329..0f648992a00eff5f03c94c1d795bd7c172ea88a9 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/formula/SumFormulaTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/formula/SumFormulaTest.java
@@ -43,7 +43,7 @@ public class SumFormulaTest {
   @Rule
   public ExpectedException thrown = ExpectedException.none();
 
-  FileAggregateContext fileAggregateContext = mock(FileAggregateContext.class);
+  LeafAggregateContext leafAggregateContext = mock(LeafAggregateContext.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 SumFormulaTest {
   public void create_measure() {
     SumCounter counter = BASIC_SUM_FORMULA.createNewCounter();
     addMeasure(LINES_KEY, 10);
-    counter.aggregate(fileAggregateContext);
+    counter.aggregate(leafAggregateContext);
 
     assertThat(BASIC_SUM_FORMULA.createMeasure(counter, projectCreateMeasureContext).get().getIntValue()).isEqualTo(10);
   }
@@ -80,7 +80,7 @@ public class SumFormulaTest {
   public void create_measure_when_counter_is_aggregating_from_another_counter() {
     SumCounter anotherCounter = BASIC_SUM_FORMULA.createNewCounter();
     addMeasure(LINES_KEY, 10);
-    anotherCounter.aggregate(fileAggregateContext);
+    anotherCounter.aggregate(leafAggregateContext);
 
     SumCounter counter = BASIC_SUM_FORMULA.createNewCounter();
     counter.aggregate(anotherCounter);
@@ -92,7 +92,7 @@ public class SumFormulaTest {
   public void not_create_measure_on_file() {
     SumCounter counter = BASIC_SUM_FORMULA.createNewCounter();
     addMeasure(LINES_KEY, 10);
-    counter.aggregate(fileAggregateContext);
+    counter.aggregate(leafAggregateContext);
 
     Assertions.assertThat(BASIC_SUM_FORMULA.createMeasure(counter, fileCreateMeasureContext)).isAbsent();
   }
@@ -100,14 +100,14 @@ public class SumFormulaTest {
   @Test
   public void do_not_create_measures_when_no_values() {
     SumCounter counter = BASIC_SUM_FORMULA.createNewCounter();
-    when(fileAggregateContext.getMeasure(LINES_KEY)).thenReturn(Optional.<Measure>absent());
-    counter.aggregate(fileAggregateContext);
+    when(leafAggregateContext.getMeasure(LINES_KEY)).thenReturn(Optional.<Measure>absent());
+    counter.aggregate(leafAggregateContext);
 
     Assertions.assertThat(BASIC_SUM_FORMULA.createMeasure(counter, projectCreateMeasureContext)).isAbsent();
   }
 
   private void addMeasure(String metricKey, int value) {
-    when(fileAggregateContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value)));
+    when(leafAggregateContext.getMeasure(metricKey)).thenReturn(Optional.of(Measure.newMeasureBuilder().create(value)));
   }
 
 }

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 dc7eb60ef00f5526b40edac998517f53193000ce..5037f8150835ff14ef4671982954cba6a0714c00 100644 (file)
--- 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.FileAggregateContext;
+import org.sonar.server.computation.formula.LeafAggregateContext;
 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 FileAggregateContextRule fileAggregateContext = new FileAggregateContextRule();
+  public LeafAggregateContextRule fileAggregateContext = new LeafAggregateContextRule();
   @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 FileAggregateContextRule extends ExternalResource implements FileAggregateContext {
+  private static class LeafAggregateContextRule extends ExternalResource implements LeafAggregateContext {
     private final Map<String, Measure> measures = new HashMap<>();
 
-    public FileAggregateContextRule put(String metricKey, Measure measure) {
+    public LeafAggregateContextRule put(String metricKey, Measure measure) {
       checkNotNull(metricKey);
       checkNotNull(measure);
       checkState(!measures.containsKey(metricKey));
@@ -144,7 +144,7 @@ public class CoverageUtilsTest {
     }
 
     @Override
-    public Component getFile() {
+    public Component getLeaf() {
       throw new UnsupportedOperationException("getFile is not supported");
     }