version 1.1 change Fail Message when equality

vdaburon · May 16, 2023 · 7f22c68 · 7f22c68
1 parent 3861ee6
commit 7f22c68
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -98,7 +98,7 @@ The maven groupId, artifactId and version, this plugin is in the **Maven Central
 ```xml
 <groupId>io.github.vdaburon</groupId>
 <artifactId>junit-reporter-kpi-from-jmeter-dashboard-stats</artifactId>
-<version>1.0</version>
+<version>1.1</version>
 ```
 Just include the plugin in your `pom.xml` and execute `mvn verify` <br>
 or individual launch `mvn -DjsonStats=statistics.json -DkpiFile=kpi.csv -DjunitFile=jmeter-junit-plugin-jmstats.xml exec:java@create_junit-report-kpi-from-jmeter-json-statics`
@@ -117,7 +117,7 @@ or individual launch `mvn -DjsonStats=statistics.json -DkpiFile=kpi.csv -DjunitF
     <dependency>
       <groupId>io.github.vdaburon</groupId>
       <artifactId>junit-reporter-kpi-from-jmeter-dashboard-stats</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
     </dependency>
   </dependencies>
 
@@ -167,5 +167,7 @@ Usually this plugin is use with [jmeter-maven-plugin](https://github.com/jmeter-
 You could also use [jmeter-graph-tool-maven-plugin](https://github.com/vdaburon/jmeter-graph-tool-maven-plugin)
 
 ## Versions
+Version 1.1 change Fail Message when equality
+
 Version 1.0 initial version
 
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.vdaburon</groupId>
     <artifactId>junit-reporter-kpi-from-jmeter-dashboard-stats</artifactId>
-    <version>1.0</version>
+    <version>1.1</version>
     <packaging>jar</packaging>
     <name>Create a JUnit XML file with KPI rules from JMeter Dashboard Stats</name>
     <description>A tool that creates a JUnit XML file with KPI rules from JMeter JMeter Dashboard stats.json</description>

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
@@ -123,6 +123,10 @@ private static boolean analyseJsonJMReportWithKpiRules(String jsonJmeterStats, S
 
         Document document = UtilsJUnitXml.createJUnitRootDocument();
         for (int i = 0; i < csvKpiLines.size(); i++) {
+            CSVRecord recordKpiLine = csvKpiLines.get(i);
+            if (recordKpiLine.size() < 3) {
+                continue;
+            }
             CheckKpiResult checkKpiResult = verifyKpi(csvKpiLines.get(i), listStats);
             if (checkKpiResult.isKpiFail()) {
                 isFail = true;
@@ -218,7 +222,7 @@ private static CheckKpiResult verifyKpi(CSVRecord recordKpiLine, List<Statistic>
                             isFailKpi = true;
                             if (isFirstFail) {
                                 isFirstFail = false;
-                                String failMessage = "Actual value " +  dMetric + " exceeds threshold " + dThreshold + " for samples matching \"" + labelRegex + "\"; fail label(s) \"" + label + "\""; // Actual value 2908,480000 exceeds threshold 2500,000000 for samples matching "@SC01_P03_DUMMY"
+                                String failMessage = "Actual value " +  dMetric + " exceeds or equals threshold " + dThreshold + " for samples matching \"" + labelRegex + "\"; fail label(s) \"" + label + "\""; // Actual value 2908,480000 exceeds threshold 2500,000000 for samples matching "@SC01_P03_DUMMY"
                                 checkKpiResult.setKpiFail(true);
                                 checkKpiResult.setFailMessage(failMessage);
                             } else {
@@ -241,7 +245,7 @@ private static CheckKpiResult verifyKpi(CSVRecord recordKpiLine, List<Statistic>
                             isFailKpi = true;
                             if (isFirstFail) {
                                 isFirstFail = false;
-                                String failMessage = "Actual value " + dMetric + " exceeds or equals threshold " + dThreshold + " for samples matching \"" + labelRegex + "\"; fail label(s) \"" + label + "\"";
+                                String failMessage = "Actual value " + dMetric + " exceeds threshold " + dThreshold + " for samples matching \"" + labelRegex + "\"; fail label(s) \"" + label + "\"";
                                 checkKpiResult.setKpiFail(true);
                                 checkKpiResult.setFailMessage(failMessage);
                             } else {
@@ -264,7 +268,7 @@ private static CheckKpiResult verifyKpi(CSVRecord recordKpiLine, List<Statistic>
                             isFailKpi = true;
                             if (isFirstFail) {
                                 isFirstFail = false;
-                                String failMessage = "Actual value " + dMetric + " is less then threshold " + dThreshold + " for samples matching \"" + labelRegex + "\"; fail label(s) \"" + label + "\"";
+                                String failMessage = "Actual value " + dMetric + " is less or equals then threshold " + dThreshold + " for samples matching \"" + labelRegex + "\"; fail label(s) \"" + label + "\"";
                                 checkKpiResult.setKpiFail(true);
                                 checkKpiResult.setFailMessage(failMessage);
                             } else {
@@ -287,7 +291,7 @@ private static CheckKpiResult verifyKpi(CSVRecord recordKpiLine, List<Statistic>
                             isFailKpi = true;
                             if (isFirstFail) {
                                 isFirstFail = false;
-                                String failMessage = "Actual value " + dMetric + "is less or equals threshold " + dThreshold + " for samples matching \"" + labelRegex + "\"; fail label(s) \"" + label + "\"";
+                                String failMessage = "Actual value " + dMetric + " is less threshold " + dThreshold + " for samples matching \"" + labelRegex + "\"; fail label(s) \"" + label + "\"";
                                 checkKpiResult.setKpiFail(true);
                                 checkKpiResult.setFailMessage(failMessage);
                             } else {