Implement git branch display on docx file

cnescatlab · May 31, 2024 · 68b2d7d · 68b2d7d
1 parent 1106ed8
commit 68b2d7d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/fr/cnes/sonar/report/exporters/data/PlaceHolders.java b/src/main/java/fr/cnes/sonar/report/exporters/data/PlaceHolders.java
@@ -47,7 +47,7 @@ private PlaceHolders() {
     /**
      * Placeholder for the project's branch
      */
-    private static final String PROJECTBRANCH_PLACEHOLDER = "XX-PROJECTBRANCH-XX";
+    private static final String PROJECTBRANCH_PLACEHOLDER = "XX-BRANCH-XX";
     /**
      * Placeholder for the quality gate's anme
      */

diff --git a/src/main/java/fr/cnes/sonar/report/exporters/docx/DocXTools.java b/src/main/java/fr/cnes/sonar/report/exporters/docx/DocXTools.java
@@ -277,7 +277,7 @@ private static void replaceInParagraph(XWPFParagraph paragraph, Map<String,Strin
 
                 // construct here the new string by replacing each placeholder by its value
                 text = currentRun.getText(0);
-                
+
                 pictures.clear();
                 for (Map.Entry<String, String> nextValue : values.entrySet()) {
                     key = nextValue.getKey();

diff --git a/src/main/resources/template/code-analysis-template.docx b/src/main/resources/template/code-analysis-template.docx
diff --git a/src/main/resources/template/code-analysis-template.md b/src/main/resources/template/code-analysis-template.md
@@ -1,6 +1,6 @@
 # Code analysis
 ## XX-PROJECTNAME-XX 
-#### Branch XX-PROJECTBRANCH-XX
+#### Branch XX-BRANCH-XX
 #### Version XX-VERSION-XX 
 
 **By: XX-AUTHOR-XX**

diff --git a/src/test/ut/java/fr/cnes/sonar/report/exporters/data/PlaceHoldersTest.java b/src/test/ut/java/fr/cnes/sonar/report/exporters/data/PlaceHoldersTest.java
@@ -41,7 +41,7 @@ public void loadPlaceholdersMapTest(){
         Map<String,String> expected = new HashMap<>();
         // Fill manually the placeHolders depending on what we initialized in "CommonTest"
         expected.put("XX-PROJECTNAME-XX", "CNES Report");
-        expected.put("XX-PROJECTBRANCH-XX", "main");
+        expected.put("XX-BRANCH-XX", "main");
         expected.put("XX-DUPLICATION-XX", "1.0");
         expected.put("XX-COMMENTDENSITY-XX", "1.0");
         expected.put("XX-MAXNCLOC-XX", "unknown");