[jmeter] branch master updated: Convert line ending of generated test data to be consistent

[fs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new 50847cd  Convert line ending of generated test data to be consistent
50847cd is described below

commit 50847cde986422b060219f13cb2215d6076bdf0f
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Wed Jul 17 18:20:23 2019 +0200

    Convert line ending of generated test data to be consistent
---
 .../protocol/jms/sampler/render/ObjectMessageRendererTest.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/src/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRendererTest.java b/test/src/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRendererTest.java
index 8b3dcf8..fc55e35 100644
--- a/test/src/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRendererTest.java
+++ b/test/src/org/apache/jmeter/protocol/jms/sampler/render/ObjectMessageRendererTest.java
@@ -82,8 +82,13 @@ public class ObjectMessageRendererTest extends MessageRendererTest<Serializable>
         assertObject(object, "eéè€");
         Person p = (Person) object;
         assertEquals("object.name", "eéè€", p.getName());
-        assertEquals("cache", format("<?xml version=\"1.0\" encoding=\"Windows-1252\"?>%n%s", getUnicodeContent()), getFirstCachedValue());
+        Object firstCachedValue = getFirstCachedValue();
+        assertEquals("cache", format("<?xml version=\"1.0\" encoding=\"Windows-1252\"?>%n%s", getUnicodeContent()),
+                convertLineEndingsToSystem(firstCachedValue));
+    }
 
+    private String convertLineEndingsToSystem(Object firstCachedValue) {
+        return firstCachedValue.toString().replaceFirst("[\r\n]+", format("%n"));
     }
 
     private String getUnicodeContent() {