From d3a5ea440cde7ba363f4ca5b2103a004aed9f179 Mon Sep 17 00:00:00 2001
From: DABURON Vincent <vincent.daburon@soprasteria.com>
Date: Tue, 16 May 2023 18:21:49 +0200
Subject: [PATCH] Version 1.2 change the Test Suite Name and factorisation
 concatFailMessage

---
 .../JUnitReportFromJMDashboardStats.java      | 48 +++++++------------
 1 file changed, 16 insertions(+), 32 deletions(-)

diff --git a/src/main/java/io/github/vdaburon/jmeter/utils/jsonkpi/JUnitReportFromJMDashboardStats.java b/src/main/java/io/github/vdaburon/jmeter/utils/jsonkpi/JUnitReportFromJMDashboardStats.java
index 530ffeb..73c0d3c 100644
--- a/src/main/java/io/github/vdaburon/jmeter/utils/jsonkpi/JUnitReportFromJMDashboardStats.java
+++ b/src/main/java/io/github/vdaburon/jmeter/utils/jsonkpi/JUnitReportFromJMDashboardStats.java
@@ -226,14 +226,7 @@ private static CheckKpiResult verifyKpi(CSVRecord recordKpiLine, List<Statistic>
                                 checkKpiResult.setKpiFail(true);
                                 checkKpiResult.setFailMessage(failMessage);
                             } else {
-                                String failMessage = checkKpiResult.getFailMessage();
-                                if ((failMessage.length() + label.length()) < K_FAIL_MESSAGE_SIZE_MAX) {
-                                    failMessage += ", \"" + label + "\"";
-                                } else {
-                                    if (!failMessage.endsWith(" ...")) {
-                                        failMessage += " ...";
-                                    }
-                                }
+                                String failMessage = concatFailMessage(checkKpiResult, label);
                                 checkKpiResult.setFailMessage(failMessage);
                             }
                         }
@@ -249,14 +242,7 @@ private static CheckKpiResult verifyKpi(CSVRecord recordKpiLine, List<Statistic>
                                 checkKpiResult.setKpiFail(true);
                                 checkKpiResult.setFailMessage(failMessage);
                             } else {
-                                String failMessage = checkKpiResult.getFailMessage();
-                                if ((failMessage.length() + label.length()) < K_FAIL_MESSAGE_SIZE_MAX) {
-                                    failMessage += ", \"" + label + "\"";
-                                } else {
-                                    if (!failMessage.endsWith(" ...")) {
-                                        failMessage += " ...";
-                                    }
-                                }
+                                String failMessage = concatFailMessage(checkKpiResult, label);
                                 checkKpiResult.setFailMessage(failMessage);
                             }
                         }
@@ -272,14 +258,7 @@ private static CheckKpiResult verifyKpi(CSVRecord recordKpiLine, List<Statistic>
                                 checkKpiResult.setKpiFail(true);
                                 checkKpiResult.setFailMessage(failMessage);
                             } else {
-                                String failMessage = checkKpiResult.getFailMessage();
-                                if ((failMessage.length() + label.length()) < K_FAIL_MESSAGE_SIZE_MAX) {
-                                    failMessage += ", \"" + label + "\"";
-                                } else {
-                                    if (!failMessage.endsWith(" ...")) {
-                                        failMessage += " ...";
-                                    }
-                                }
+                                String failMessage = concatFailMessage(checkKpiResult, label);
                                 checkKpiResult.setFailMessage(failMessage);
                             }
                         }
@@ -295,14 +274,7 @@ private static CheckKpiResult verifyKpi(CSVRecord recordKpiLine, List<Statistic>
                                 checkKpiResult.setKpiFail(true);
                                 checkKpiResult.setFailMessage(failMessage);
                             } else {
-                                String failMessage = checkKpiResult.getFailMessage();
-                                if ((failMessage.length() + label.length()) < K_FAIL_MESSAGE_SIZE_MAX) {
-                                    failMessage += ", \"" + label + "\"";
-                                } else {
-                                    if (!failMessage.endsWith(" ...")) {
-                                        failMessage += " ...";
-                                    }
-                                }
+                                String failMessage = concatFailMessage(checkKpiResult, label);
                                 checkKpiResult.setFailMessage(failMessage);
                             }
                         }
@@ -315,6 +287,18 @@ private static CheckKpiResult verifyKpi(CSVRecord recordKpiLine, List<Statistic>
         return checkKpiResult;
     }
 
+    private static String concatFailMessage(CheckKpiResult checkKpiResult, String label) {
+        String failMessage = checkKpiResult.getFailMessage();
+        if ((failMessage.length() + label.length()) < K_FAIL_MESSAGE_SIZE_MAX) {
+            failMessage += ", \"" + label + "\"";
+        } else {
+            if (!failMessage.endsWith(" ...")) {
+                failMessage += " ...";
+            }
+        }
+        return failMessage;
+    }
+
     /**
      * If incorrect parameter or help, display usage
      * @param options  options and cli parameters