SONAR-10670 Count ncloc of whole instance with biggest long-living branch

7 files changed, 5 insertions, 95 deletions

diff --git a/tests/src/test/java/org/sonarqube/tests/ce/CeWorkersPauseTest.java b/tests/src/test/java/org/sonarqube/tests/ce/CeWorkersPauseTest.java
index fc4f73387d4..56460f7808a 100644
--- a/tests/src/test/java/org/sonarqube/tests/ce/CeWorkersPauseTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/ce/CeWorkersPauseTest.java
@@ -34,10 +34,10 @@ import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestRule;
 import org.junit.rules.Timeout;
 import org.sonarqube.qa.util.Tester;
+import org.sonarqube.qa.util.XooProjectBuilder;
 import org.sonarqube.tests.Category4Suite;
 import org.sonarqube.ws.Ce;
 import org.sonarqube.ws.client.ce.ActivityStatusRequest;
-import util.XooProjectBuilder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/tests/src/test/java/org/sonarqube/tests/component/ModuleTest.java b/tests/src/test/java/org/sonarqube/tests/component/ModuleTest.java
index 37029fd7b57..a56ef4b24cf 100644
--- a/tests/src/test/java/org/sonarqube/tests/component/ModuleTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/component/ModuleTest.java
@@ -28,10 +28,10 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonarqube.qa.util.Tester;
+import org.sonarqube.qa.util.XooProjectBuilder;
 import org.sonarqube.ws.client.components.ShowRequest;
 import org.sonarqube.ws.client.components.TreeRequest;
 import org.sonarqube.ws.client.projects.UpdateKeyRequest;
-import util.XooProjectBuilder;
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectInfoTest.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectInfoTest.java
index 407acd2478f..69070092154 100644
--- a/tests/src/test/java/org/sonarqube/tests/project/ProjectInfoTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectInfoTest.java
@@ -28,10 +28,10 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.sonarqube.qa.util.Tester;
+import org.sonarqube.qa.util.XooProjectBuilder;
 import org.sonarqube.ws.Components.Component;
 import org.sonarqube.ws.Organizations;
 import org.sonarqube.ws.client.components.ShowRequest;
-import util.XooProjectBuilder;
 
 import static org.apache.commons.lang.StringUtils.repeat;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdateTest.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdateTest.java
index 1afbc28366a..b5b9ff2cbc1 100644
--- a/tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdateTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdateTest.java
@@ -37,6 +37,7 @@ import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestRule;
 import org.junit.rules.Timeout;
 import org.sonarqube.qa.util.Tester;
+import org.sonarqube.qa.util.XooProjectBuilder;
 import org.sonarqube.ws.Components;
 import org.sonarqube.ws.Organizations;
 import org.sonarqube.ws.Projects;
@@ -49,7 +50,6 @@ import org.sonarqube.ws.client.components.TreeRequest;
 import org.sonarqube.ws.client.projects.BulkUpdateKeyRequest;
 import org.sonarqube.ws.client.projects.UpdateKeyRequest;
 import util.ItUtils;
-import util.XooProjectBuilder;
 
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/tests/src/test/java/org/sonarqube/tests/serverSystem/BlueGreenTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/BlueGreenTest.java
index cc81e8e6074..5a9c01d65fe 100644
--- a/tests/src/test/java/org/sonarqube/tests/serverSystem/BlueGreenTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/BlueGreenTest.java
@@ -33,13 +33,13 @@ import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestRule;
 import org.junit.rules.Timeout;
 import org.sonarqube.qa.util.Tester;
+import org.sonarqube.qa.util.XooProjectBuilder;
 import org.sonarqube.ws.Ce;
 import org.sonarqube.ws.Projects;
 import org.sonarqube.ws.client.ce.ActivityStatusRequest;
 import org.sonarqube.ws.client.plugins.UninstallRequest;
 import org.sonarqube.ws.client.qualityprofiles.AddProjectRequest;
 import util.ItUtils;
-import util.XooProjectBuilder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.newOrchestratorBuilder;
diff --git a/tests/src/test/java/org/sonarqube/tests/telemetry/TelemetryUploadTest.java b/tests/src/test/java/org/sonarqube/tests/telemetry/TelemetryUploadTest.java
index fd17f385112..5257a8847cf 100644
--- a/tests/src/test/java/org/sonarqube/tests/telemetry/TelemetryUploadTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/telemetry/TelemetryUploadTest.java
@@ -91,7 +91,6 @@ public class TelemetryUploadTest {
     List<String> plugins = ((List<Map<String, String>>) json.get("plugins")).stream().map(p -> p.get("name")).collect(Collectors.toList());
     assertThat(plugins).contains("xoo");
     assertThat(getInteger(json.get("ncloc"))).isEqualTo(13 * 2 + 7);
-    assertThat(getInteger(json.get("lines"))).isEqualTo(17 * 3);
     List<Map<String, String>> projectCountByLanguage = (List<Map<String, String>>) json.get("projectCountByLanguage");
     assertThat(projectCountByLanguage).extracting(p -> p.get("language"), p -> getInteger(p.get("count")))
       .contains(tuple("xoo", 2), tuple("xoo2", 1));
diff --git a/tests/src/test/java/util/XooProjectBuilder.java b/tests/src/test/java/util/XooProjectBuilder.java
deleted file mode 100644
index c9e8c8265b8..00000000000
--- a/tests/src/test/java/util/XooProjectBuilder.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2018 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program 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.
- *
- * This program 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 util;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
-
-import static java.util.Arrays.asList;
-
-public class XooProjectBuilder {
-  private final String key;
-  private final List<String> moduleKeys = new ArrayList<>();
-  private int filesPerModule = 1;
-
-  public XooProjectBuilder(String projectKey) {
-    this.key = projectKey;
-  }
-
-  public XooProjectBuilder addModules(String key, String... otherKeys) {
-    this.moduleKeys.add(key);
-    this.moduleKeys.addAll(asList(otherKeys));
-    return this;
-  }
-
-  public XooProjectBuilder setFilesPerModule(int i) {
-    this.filesPerModule = i;
-    return this;
-  }
-
-  public File build(File dir) {
-    for (String moduleKey : moduleKeys) {
-      generateModule(moduleKey, new File(dir, moduleKey), new Properties());
-    }
-    Properties additionalProps = new Properties();
-    additionalProps.setProperty("sonar.modules", StringUtils.join(moduleKeys, ","));
-    generateModule(key, dir, additionalProps);
-    return dir;
-  }
-
-  private void generateModule(String key, File dir, Properties additionalProps) {
-    try {
-      File sourceDir = new File(dir, "src");
-      FileUtils.forceMkdir(sourceDir);
-      for (int i = 0; i < filesPerModule; i++) {
-        File sourceFile = new File(sourceDir, "File" + i + ".xoo");
-        FileUtils.write(sourceFile, "content of " + sourceFile.getName());
-
-        File measuresFile = new File(sourceFile + ".measures");
-        FileUtils.write(measuresFile, "ncloc:10\n" +
-          "comment_lines:3\n");
-      }
-      Properties props = new Properties();
-      props.setProperty("sonar.projectKey", key);
-      props.setProperty("sonar.projectName", key);
-      props.setProperty("sonar.projectVersion", "1.0");
-      props.setProperty("sonar.sources", sourceDir.getName());
-      props.putAll(additionalProps);
-      File propsFile = new File(dir, "sonar-project.properties");
-      try (OutputStream output = FileUtils.openOutputStream(propsFile)) {
-        props.store(output, "generated");
-      }
-    } catch (IOException e) {
-      throw new IllegalStateException(e);
-    }
-  }
-}