SONAR-15450 Take pull requests into account when counting instance's NLOC

1 files changed, 19 insertions, 2 deletions

diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDataLoaderImplTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDataLoaderImplTest.java
index 4ec49748d9b..f46cbc179a5 100644
--- a/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDataLoaderImplTest.java
+++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/telemetry/TelemetryDataLoaderImplTest.java
@@ -171,7 +171,7 @@ public class TelemetryDataLoaderImplTest {
   }
 
   @Test
-  public void take_largest_branches() {
+  public void take_largest_branch() {
     server.setId("AU-TpxcB-iU5OvuD2FL7").setVersion("7.5.4");
     MetricDto ncloc = db.measures().insertMetric(m -> m.setKey(NCLOC_KEY));
     ComponentDto project = db.components().insertPublicProject();
@@ -179,7 +179,7 @@ public class TelemetryDataLoaderImplTest {
     ComponentDto pr = db.components().insertProjectBranch(project, b -> b.setBranchType(PULL_REQUEST));
     db.measures().insertLiveMeasure(project, ncloc, m -> m.setValue(10d));
     db.measures().insertLiveMeasure(branch1, ncloc, m -> m.setValue(20d));
-    db.measures().insertLiveMeasure(pr, ncloc, m -> m.setValue(30d));
+    db.measures().insertLiveMeasure(pr, ncloc, m -> m.setValue(15d));
     projectMeasuresIndexer.indexAll();
 
     TelemetryData data = communityUnderTest.load();
@@ -188,6 +188,23 @@ public class TelemetryDataLoaderImplTest {
   }
 
   @Test
+  public void take_largest_branch_with_pr() {
+    server.setId("AU-TpxcB-iU5OvuD2FL7").setVersion("7.5.4");
+    MetricDto ncloc = db.measures().insertMetric(m -> m.setKey(NCLOC_KEY));
+    ComponentDto project = db.components().insertPublicProject();
+    ComponentDto branch1 = db.components().insertProjectBranch(project, b -> b.setBranchType(BRANCH));
+    ComponentDto pr = db.components().insertProjectBranch(project, b -> b.setBranchType(PULL_REQUEST));
+    db.measures().insertLiveMeasure(project, ncloc, m -> m.setValue(10d));
+    db.measures().insertLiveMeasure(branch1, ncloc, m -> m.setValue(20d));
+    db.measures().insertLiveMeasure(pr, ncloc, m -> m.setValue(30d));
+    projectMeasuresIndexer.indexAll();
+
+    TelemetryData data = communityUnderTest.load();
+
+    assertThat(data.getNcloc()).isEqualTo(30L);
+  }
+
+  @Test
   public void data_contains_no_license_type_on_community_edition() {
     TelemetryData data = communityUnderTest.load();