Implement new qualityGates tests

cnescatlab · Jun 4, 2024 · c826a01 · c826a01
1 parent 793c250
commit c826a01
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 24 deletions.
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
@@ -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
diff --git a/...t/ut/java/fr/cnes/sonar/report/providers/qualitygate/AbstractQualityGateProviderTest.java b/...t/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