From c826a0175182c92f75e580398ab13a323161194b Mon Sep 17 00:00:00 2001
From: Topin2001 <wonodoou00@gmail.com>
Date: Tue, 4 Jun 2024 11:19:06 +0200
Subject: [PATCH] Implement new qualityGates tests

---
 .../AbstractQualityGateProvider.java          |  6 +++---
 .../cnes/sonar/report/model/ReportTest.java   | 19 -------------------
 .../AbstractQualityGateProviderTest.java      |  9 +++++++--
 3 files changed, 10 insertions(+), 24 deletions(-)
 delete mode 100644 src/test/ut/java/fr/cnes/sonar/report/model/ReportTest.java

diff --git a/src/main/java/fr/cnes/sonar/report/providers/qualitygate/AbstractQualityGateProvider.java b/src/main/java/fr/cnes/sonar/report/providers/qualitygate/AbstractQualityGateProvider.java
index ef86063a..d74523cd 100644
--- a/src/main/java/fr/cnes/sonar/report/providers/qualitygate/AbstractQualityGateProvider.java
+++ b/src/main/java/fr/cnes/sonar/report/providers/qualitygate/AbstractQualityGateProvider.java
@@ -187,15 +187,15 @@ protected QualityGate getProjectQualityGateAbstract()
         final JsonObject jsonObject = getProjectAsJsonObject();
 
         // search for the good quality gate
-        final Iterator<QualityGate> iterator = qualityGates.iterator();
+        final Iterator<QualityGate> qualityGatesIterator = qualityGates.iterator();
         
         QualityGate tmp;
         boolean find = false;
         final String key = jsonObject.getAsJsonObject(QUALITY_GATE).get(KEY).getAsString();
         final String name = jsonObject.getAsJsonObject(QUALITY_GATE).get(NAME).getAsString();
 
-        while (iterator.hasNext() && !find) {
-            tmp = iterator.next();
+        while (qualityGatesIterator.hasNext() && !find) {
+            tmp = qualityGatesIterator.next();
             if (tmp.getName().equals(name) || tmp.getId().equals(key)) {
                 res = tmp;
                 find = true;
diff --git a/src/test/ut/java/fr/cnes/sonar/report/model/ReportTest.java b/src/test/ut/java/fr/cnes/sonar/report/model/ReportTest.java
deleted file mode 100644
index f4c0113c..00000000
--- a/src/test/ut/java/fr/cnes/sonar/report/model/ReportTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package fr.cnes.sonar.report.model;
-
-import fr.cnes.sonar.report.CommonTest;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class ReportTest extends CommonTest {
-
-    @Test
-    public void ProjectBranchTest() {
-        Report report = new Report();
-        report.setProjectBranch("branch");
-        Assert.assertEquals("branch", report.getProjectBranch());
-    }
-
-}
diff --git a/src/test/ut/java/fr/cnes/sonar/report/providers/qualitygate/AbstractQualityGateProviderTest.java b/src/test/ut/java/fr/cnes/sonar/report/providers/qualitygate/AbstractQualityGateProviderTest.java
index b1b4e9ba..84b1063f 100644
--- a/src/test/ut/java/fr/cnes/sonar/report/providers/qualitygate/AbstractQualityGateProviderTest.java
+++ b/src/test/ut/java/fr/cnes/sonar/report/providers/qualitygate/AbstractQualityGateProviderTest.java
@@ -135,10 +135,13 @@ public void getProjectWithMatchingQualityGateTest() throws UnknownQualityGateExc
         // Fake API response
         JsonObject qualityGate1 = new JsonObject();
         qualityGate1.addProperty("id", "test1");
+        qualityGate1.addProperty("name", "Test 1");
         JsonObject qualityGate2 = new JsonObject();
         qualityGate2.addProperty("id", "test2");
+        qualityGate2.addProperty("name", "Test 2");
         JsonObject qualityGate3 = new JsonObject();
         qualityGate3.addProperty("id", "test3");
+        qualityGate3.addProperty("name", "Test 3");
         
         JsonArray qualityGateList = new JsonArray();
         qualityGateList.add(qualityGate1);
@@ -151,6 +154,7 @@ public void getProjectWithMatchingQualityGateTest() throws UnknownQualityGateExc
 
         JsonObject qualityGateProperty = new JsonObject();
         qualityGateProperty.addProperty("key", "test2");
+        qualityGateProperty.addProperty("name", "Test 2");
         JsonObject project = new JsonObject();
         project.add("qualityGate", qualityGateProperty);
 
@@ -160,8 +164,9 @@ public void getProjectWithMatchingQualityGateTest() throws UnknownQualityGateExc
         provider.setFakeQualityGatesDetails(new JsonObject());
         provider.setFakeProject(project);
 
-        //QualityGate result = provider.getProjectQualityGate();
-        //assertEquals("test2", result.getId());
+        QualityGate result = provider.getProjectQualityGate();
+        assertEquals("test2", result.getId());
+        assertEquals("Test 2", result.getName());
     }
 
     @Test