Fixed unit test error

Author: anthonygauthier

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.github.delirius325</groupId>
 	<artifactId>jmeter.backendlistener.elasticsearch</artifactId>
-	<version>2.5.0</version>
+	<version>2.5.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>jmeter.backendlistener.elasticsearch</name>

src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/ElasticSearchMetric.java

@@ -22,13 +22,15 @@ public class ElasticSearchMetric {
     private String esTimestamp;
     private int ciBuildNumber;
     private HashMap<String, Object> json;
+    private boolean all;
 
-    public ElasticSearchMetric(SampleResult sr, String testMode, String timeStamp, int buildNumber) {
+    public ElasticSearchMetric(SampleResult sr, String testMode, String timeStamp, int buildNumber, boolean parseHeaders) {
         this.sampleResult = sr;
         this.esTestMode = testMode.trim();
         this.esTimestamp = timeStamp.trim();
         this.ciBuildNumber = buildNumber;
         this.json = new HashMap<>();
+        this.all = parseHeaders;
     }
 
     /**
@@ -79,7 +81,7 @@ public Map<String, Object> getMetric(BackendListenerContext context) throws Exce
         addAssertions();
         addElapsedTime(sdf);
         addCustomFields(context);
-        checkCustomVariables();
+        parseHeadersAsDocumentProps(this.all);
 
         return this.json;
     }
@@ -181,7 +183,7 @@ private void parseHeadersAsDocumentProps(boolean all) {
 
         for(int i=0; i < lines.length; i++) {
             String[] header = lines[i].split(":");
-            if(!all) {
+            if(!this.all) {
                 if(header[0].startsWith("X-es-backend")) {
                     this.json.put(header[0].replaceAll("es-", "").trim(), header[1].trim());
                 }

src/main/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/ElasticsearchBackendClient.java

@@ -27,6 +27,7 @@ public class ElasticsearchBackendClient extends AbstractBackendListenerClient {
     private static final String ES_TEST_MODE        = "es.test.mode";
     private static final String ES_AUTH_USER        = "es.xpack.user";
     private static final String ES_AUTH_PWD         = "es.xpack.password";
+    private static final String ES_PARSE_HEADERS    = "es.parse.all.headers";
     private static final long DEFAULT_TIMEOUT_MS = 200L;
     private static final Logger logger = LoggerFactory.getLogger(ElasticsearchBackendClient.class);
 
@@ -52,6 +53,7 @@ public Arguments getDefaultParameters() {
         parameters.addArgument(ES_TEST_MODE, "info");
         parameters.addArgument(ES_AUTH_USER, "");
         parameters.addArgument(ES_AUTH_PWD, "");
+        parameters.addArgument(ES_PARSE_HEADERS, "false");
         return parameters;
     }
 
@@ -96,7 +98,7 @@ public void onFailure(Node node) {
     @Override
     public void handleSampleResults(List<SampleResult> results, BackendListenerContext context) {
         for(SampleResult sr : results) {
-            ElasticSearchMetric metric = new ElasticSearchMetric(sr, context.getParameter(ES_TEST_MODE), context.getParameter(ES_TIMESTAMP), this.buildNumber);
+            ElasticSearchMetric metric = new ElasticSearchMetric(sr, context.getParameter(ES_TEST_MODE), context.getParameter(ES_TIMESTAMP), this.buildNumber, context.getBooleanParameter(ES_PARSE_HEADERS, false));
 
             if(validateSample(context, sr)) {
                 try {

src/test/java/io/github/delirius325/jmeter/backendlistener/elasticsearch/TestElasticSearchBackend.java

@@ -17,8 +17,8 @@ public class TestElasticSearchBackend {
 
     @Before
     public void setUp() throws Exception {
-        metricCI = new ElasticSearchMetric(new SampleResult(), "info", "yyyy-MM-dd'T'HH:mm:ss.SSSZZ", 1);
-        metricNoCI = new ElasticSearchMetric(new SampleResult(), "info", "yyyy-MM-dd'T'HH:mm:ss.SSSZZ", 0);
+        metricCI = new ElasticSearchMetric(new SampleResult(), "info", "yyyy-MM-dd'T'HH:mm:ss.SSSZZ", 1, false);
+        metricNoCI = new ElasticSearchMetric(new SampleResult(), "info", "yyyy-MM-dd'T'HH:mm:ss.SSSZZ", 0, false);
     }
 
     @Test