From 6ea690c4460dc0f18db6797015aa89503221547a Mon Sep 17 00:00:00 2001
From: Caleb Cartwright <calebcartwright@users.noreply.github.com>
Date: Thu, 14 Apr 2022 17:08:05 -0500
Subject: [PATCH] fix: various sonar service tests (#7836)

Co-authored-by: repo-ranger[bot] <39074581+repo-ranger[bot]@users.noreply.github.com>
---
 .../sonar/sonar-documented-api-density.tester.js |  4 +---
 services/sonar/sonar-tech-debt.tester.js         |  6 ++----
 services/sonar/sonar-violations.tester.js        | 16 +++++-----------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/services/sonar/sonar-documented-api-density.tester.js b/services/sonar/sonar-documented-api-density.tester.js
index d1fad44e3b..6eb0ea7421 100644
--- a/services/sonar/sonar-documented-api-density.tester.js
+++ b/services/sonar/sonar-documented-api-density.tester.js
@@ -12,9 +12,7 @@ export const t = await createServiceTester()
 // https://docs.sonarqube.org/7.0/MetricDefinitions.html
 // https://sonarcloud.io/api/measures/component?componentKey=org.sonarsource.sonarqube:sonarqube&metricKeys=public_documented_api_density
 t.create('Documented API Density (not found)')
-  .get(
-    '/org.sonarsource.sonarqube%3Asonarqube.json?server=https://sonarcloud.io'
-  )
+  .get('/brave_brave-core.json?server=https://sonarcloud.io')
   .expectBadge({
     label: 'public documented api density',
     message: 'metric not found',
diff --git a/services/sonar/sonar-tech-debt.tester.js b/services/sonar/sonar-tech-debt.tester.js
index 835d34c8e4..ace52b7d2e 100644
--- a/services/sonar/sonar-tech-debt.tester.js
+++ b/services/sonar/sonar-tech-debt.tester.js
@@ -10,7 +10,7 @@ export const t = await createServiceTester()
 
 t.create('Tech Debt')
   .get(
-    '/tech_debt/org.sonarsource.sonarqube%3Asonarqube.json?server=https://sonarcloud.io'
+    '/tech_debt/brave_brave-core.json?server=https://sonarcloud.io&sonarVersion=9.0'
   )
   .expectBadge({
     label: 'tech debt',
@@ -18,9 +18,7 @@ t.create('Tech Debt')
   })
 
 t.create('Tech Debt (branch)')
-  .get(
-    '/tech_debt/org.sonarsource.sonarqube%3Asonarqube/master.json?server=https://sonarcloud.io'
-  )
+  .get('/tech_debt/brave_brave-core/master.json?server=https://sonarcloud.io')
   .expectBadge({
     label: 'tech debt',
     message: isPercentage,
diff --git a/services/sonar/sonar-violations.tester.js b/services/sonar/sonar-violations.tester.js
index 98b4726526..f01e9e7394 100644
--- a/services/sonar/sonar-violations.tester.js
+++ b/services/sonar/sonar-violations.tester.js
@@ -17,9 +17,7 @@ const isViolationsLongFormMetric = Joi.alternatives(
 
 t.create('Violations')
   .timeout(10000)
-  .get(
-    '/violations/org.sonarsource.sonarqube%3Asonarqube.json?server=https://sonarcloud.io'
-  )
+  .get('/violations/brave_brave-core.json?server=https://sonarcloud.io')
   .expectBadge({
     label: 'violations',
     message: isMetric,
@@ -27,9 +25,7 @@ t.create('Violations')
 
 t.create('Violations (branch)')
   .timeout(10000)
-  .get(
-    '/violations/org.sonarsource.sonarqube%3Asonarqube/master.json?server=https://sonarcloud.io'
-  )
+  .get('/violations/brave_brave-core/master.json?server=https://sonarcloud.io')
   .expectBadge({
     label: 'violations',
     message: isMetric,
@@ -67,7 +63,7 @@ t.create('Violations (legacy API supported)')
 t.create('Violations Long Format')
   .timeout(10000)
   .get(
-    '/violations/org.sonarsource.sonarqube%3Asonarqube.json?server=https://sonarcloud.io&format=long'
+    '/violations/brave_brave-core.json?server=https://sonarcloud.io&format=long'
   )
   .expectBadge({
     label: 'violations',
@@ -126,9 +122,7 @@ t.create('Violations Long Format (legacy API supported)')
 
 t.create('Blocker Violations')
   .timeout(10000)
-  .get(
-    '/blocker_violations/org.sonarsource.sonarqube%3Asonarqube.json?server=https://sonarcloud.io'
-  )
+  .get('/blocker_violations/brave_brave-core.json?server=https://sonarcloud.io')
   .expectBadge({
     label: 'blocker violations',
     message: isMetric,
@@ -166,7 +160,7 @@ t.create('Blocker Violations (legacy API supported)')
 t.create('Critical Violations')
   .timeout(10000)
   .get(
-    '/critical_violations/org.sonarsource.sonarqube%3Asonarqube.json?server=https://sonarcloud.io'
+    '/critical_violations/brave_brave-core.json?server=https://sonarcloud.io'
   )
   .expectBadge({
     label: 'critical violations',