This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7948b3ba0c6d1cdf2ba7d50b8c012b10f1dbc6d4 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Mon Jan 26 20:20:19 2026 +0000 (chores): ensure usage of text blocks components/camel-bindy --- .../BindyComplexCsvGenerateHeaderMarshallTest.java | 6 ++- .../bindy/csv/BindyComplexCsvUnmarshallTest.java | 26 ++++++----- .../csv/BindyMarshalOneToManyWithHeadersTest.java | 8 ++-- .../csv/BindySimpleCsvBooleanUnmarshallTest.java | 11 ++++- .../BindySimpleCsvGenerateHeaderMarshallTest.java | 6 ++- .../csv/BindySimpleCsvOneToManyMarshallTest.java | 9 ++-- .../BindySimpleCsvSkipFirstLineUnmarshallTest.java | 28 ++++++------ .../bindy/csv/BindySimpleCsvUnmarshallDslTest.java | 26 ++++++----- .../bindy/csv/BindySimpleCsvUnmarshallTest.java | 52 ++++++++++++---------- .../bindy/csv/BindyTabSeparatorTest.java | 10 +++-- .../bindy/csv/WickedHeaderWithCommaCsvTest.java | 8 ++-- 11 files changed, 110 insertions(+), 80 deletions(-) diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java index cf2cba1bb8aa..3c246c853911 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvGenerateHeaderMarshallTest.java @@ -42,8 +42,10 @@ public class BindyComplexCsvGenerateHeaderMarshallTest { private List<Map<String, Object>> models = new ArrayList<>(); private String result - = "Order Nr,Client Nr,First Name,Last Name,Instrument Code,Instrument Nr,Order Type,Instrument Type,amount,currency,Order Date\r\n" - + "10,A1,Julia,Roberts,ISIN,LU123456789,BUY,Share,150.00,USD,14-01-2009\r\n"; + = """ + Order Nr,Client Nr,First Name,Last Name,Instrument Code,Instrument Nr,Order Type,Instrument Type,amount,currency,Order Date\r + 10,A1,Julia,Roberts,ISIN,LU123456789,BUY,Share,150.00,USD,14-01-2009\r + """; @Produce("direct:start") private ProducerTemplate template; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java index 32f1952fab28..f7032d4b1db2 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java @@ -38,18 +38,20 @@ public class BindyComplexCsvUnmarshallTest { @Produce("direct:start") protected ProducerTemplate template; - private String record = "01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" - + "02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n" - + "03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" - + "04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r\n" - + "05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n" + "06,A5,Andr" + "\uc3a9" - + ",Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n" - + "07,A6,Myl" + "\uc3a8" + "ne,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" - + "08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n" - + ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n" + ",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" - + ",,,D,ISIN,LU123456789,,,,,\r\n" - + "10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n" - + "10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009"; + private String record = """ + 01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r + 02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r + 03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r + 04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r + 05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r + 06,A5,Andr\uc3a9,Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r + 07,A6,Myl\uc3a8ne,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r + 08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r + ,,,D,,BE12345678,SELL,,,,08-01-2009\r + ,,,D,ISIN,BE12345678,,,,,08-01-2009\r + ,,,D,ISIN,LU123456789,,,,,\r + 10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r + 10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009"""; private String singleRecord = "01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009"; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java index 9dabd07c673f..18c2b7565888 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyMarshalOneToManyWithHeadersTest.java @@ -50,9 +50,11 @@ public class BindyMarshalOneToManyWithHeadersTest { @Test @DirtiesContext public void testMarshallMessage() throws Exception { - expected = "orderNumber,customerName,sku,quantity,unitPrice\r\n" - + "11111,Joe Blow,abc,1,3\r\n" - + "11111,Joe Blow,cde,3,2\r\n"; + expected = """ + orderNumber,customerName,sku,quantity,unitPrice\r + 11111,Joe Blow,abc,1,3\r + 11111,Joe Blow,cde,3,2\r + """; result.expectedBodiesReceived(expected); diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java index be9a54681e17..e89d9a045d84 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvBooleanUnmarshallTest.java @@ -59,7 +59,10 @@ public class BindySimpleCsvBooleanUnmarshallTest { public void testUnMarshallMessageWithBoolean() throws Exception { // We suppress the firstName field of the first record - expected = "andrew,true\r\n" + "andrew,false\r\n"; + expected = """ + andrew,true\r + andrew,false\r + """; template.sendBody(expected); @@ -83,7 +86,11 @@ public class BindySimpleCsvBooleanUnmarshallTest { public void testUnMarshallMessageWithBooleanMissingFields() throws Exception { // We suppress the firstName field of the first record - expected = "andrew,true\r\n" + "joseph,false\r\n" + "nicholas,\r\n"; + expected = """ + andrew,true\r + joseph,false\r + nicholas,\r + """; template.sendBody(expected); diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java index 070844071b37..44b9a75416de 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvGenerateHeaderMarshallTest.java @@ -40,8 +40,10 @@ public class BindySimpleCsvGenerateHeaderMarshallTest { private List<Map<String, Object>> models = new ArrayList<>(); private String result - = "Order Nr,Client Nr,First Name,Last Name,Instrument Code,Instrument Nr,Order Type,Instrument Type,amount,currency,Order Date\r\n" - + "1,B2,Keira,Knightley,ISIN,XX23456789,BUY,Share,400.25,EUR,14-01-2009\r\n"; + = """ + Order Nr,Client Nr,First Name,Last Name,Instrument Code,Instrument Nr,Order Type,Instrument Type,amount,currency,Order Date\r + 1,B2,Keira,Knightley,ISIN,XX23456789,BUY,Share,400.25,EUR,14-01-2009\r + """; @Produce("direct:start") private ProducerTemplate template; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java index a13c0bf8a156..3a8652687ce0 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java @@ -37,9 +37,12 @@ import org.springframework.test.context.ContextConfiguration; public class BindySimpleCsvOneToManyMarshallTest { private List<Map<String, Object>> models = new ArrayList<>(); - private String result - = "Charles,Moulliard,Camel in Action 1,2010,43\r\n" + "Charles,Moulliard,Camel in Action 2,2012,43\r\n" - + "Charles,Moulliard,Camel in Action 3,2013,43\r\n" + "Charles,Moulliard,Camel in Action 4,,43\r\n"; + private String result = """ + Charles,Moulliard,Camel in Action 1,2010,43\r + Charles,Moulliard,Camel in Action 2,2012,43\r + Charles,Moulliard,Camel in Action 3,2013,43\r + Charles,Moulliard,Camel in Action 4,,43\r + """; @Produce("direct:start") private ProducerTemplate template; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java index fb1b309f8b19..052539115e99 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java @@ -33,19 +33,21 @@ public class BindySimpleCsvSkipFirstLineUnmarshallTest { protected ProducerTemplate template; private String record - = "order nr,client ref,first name, last name,instrument code,instrument name,order type, instrument type, quantity,currency,date\r\n" - + "1,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" - + "2,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n" - + "03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" - + "04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r\n" - + "05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n" + "06,A5,Andr" + "\uc3a9" - + ",Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n" - + "07,A6,Myl" + "\uc3a8" + "ne,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" - + "08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n" - + ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n" + ",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" - + ",,,D,ISIN,LU123456789,,,,,\r\n" - + "10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n" - + "10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009"; + = """ + order nr,client ref,first name, last name,instrument code,instrument name,order type, instrument type, quantity,currency,date\r + 1,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r + 2,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r + 03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r + 04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r + 05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r + 06,A5,Andr\uc3a9,Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r + 07,A6,Myl\uc3a8ne,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r + 08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r + ,,,D,,BE12345678,SELL,,,,08-01-2009\r + ,,,D,ISIN,BE12345678,,,,,08-01-2009\r + ,,,D,ISIN,LU123456789,,,,,\r + 10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r + 10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009"""; @EndpointInject("mock:result") private MockEndpoint resultEndpoint; diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallDslTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallDslTest.java index ad8f9caea9a7..14e84e1c13fe 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallDslTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallDslTest.java @@ -28,18 +28,20 @@ public class BindySimpleCsvUnmarshallDslTest extends CommonBindyTest { @DirtiesContext public void testUnMarshallMessage() throws Exception { - String message = "01,,Albert,Einstein,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" - + "02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n" - + "03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" - + "04,A3,Michel,Platini,,,BUY,,2500,USD,08-01-2009\r\n" - + "05,A4,Jacques,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n" - + "06,A5,Jacques,Brel,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n" - + "07,A6,Myl" + "\uc3a8" + "ne,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" - + "08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n" - + ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n" + ",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" - + ",,,D,ISIN,LU123456789,,,,,\r\n" - + "10,A8,Pauline,Lafont,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n" - + "10,A9,Louis,Pasteur,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009"; + String message = """ + 01,,Albert,Einstein,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r + 02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r + 03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r + 04,A3,Michel,Platini,,,BUY,,2500,USD,08-01-2009\r + 05,A4,Jacques,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r + 06,A5,Jacques,Brel,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r + 07,A6,Myl\uc3a8ne,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r + 08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r + ,,,D,,BE12345678,SELL,,,,08-01-2009\r + ,,,D,ISIN,BE12345678,,,,,08-01-2009\r + ,,,D,ISIN,LU123456789,,,,,\r + 10,A8,Pauline,Lafont,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r + 10,A9,Louis,Pasteur,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009"""; template.sendBody(message); result.expectedMessageCount(1); diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java index 2ee81e8547dd..6e3c19da4df1 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java @@ -59,18 +59,20 @@ public class BindySimpleCsvUnmarshallTest { @DirtiesContext public void testUnMarshallMessage() throws Exception { - expected = "01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" - + "02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n" - + "03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" - + "04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r\n" - + "05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n" + "06,A5,Andr" + "\uc3a9" - + ",Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n" - + "07,A6,Myl" + "\uc3a8" + "ne,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" - + "08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n" - + ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n" + ",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" - + ",,,D,ISIN,LU123456789,,,,,\r\n" - + "10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n" - + "10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009"; + expected = """ + 01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r + 02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r + 03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r + 04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r + 05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r + 06,A5,Andr\uc3a9,Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r + 07,A6,Myl\uc3a8ne,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r + 08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r + ,,,D,,BE12345678,SELL,,,,08-01-2009\r + ,,,D,ISIN,BE12345678,,,,,08-01-2009\r + ,,,D,ISIN,LU123456789,,,,,\r + 10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r + 10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009"""; template.sendBody(expected); @@ -116,18 +118,20 @@ public class BindySimpleCsvUnmarshallTest { public void testUnMarshallMessageWithMissingFields() throws Exception { // We suppress the firstName field of the first record - expected = "01,,,Cartier,ISIN,BE12345678,SELL,,1500,EUR\r\n" - + "02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n" - + "03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" - + "04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r\n" - + "05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n" + "06,A5,Andr" + "\uc3a9" - + ",Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n" - + "07,A6,Myl" + "\uc3a8" + "ne,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" - + "08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n" - + ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n" + ",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" - + ",,,D,ISIN,LU123456789,,,,,\r\n" - + "10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n" - + "10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45"; + expected = """ + 01,,,Cartier,ISIN,BE12345678,SELL,,1500,EUR\r + 02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r + 03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r + 04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r + 05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r + 06,A5,Andr\uc3a9,Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r + 07,A6,Myl\uc3a8ne,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r + 08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r + ,,,D,,BE12345678,SELL,,,,08-01-2009\r + ,,,D,ISIN,BE12345678,,,,,08-01-2009\r + ,,,D,ISIN,LU123456789,,,,,\r + 10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r + 10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45"""; template.sendBody(expected); diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java index 304be7d4c555..be41e2350f10 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java @@ -74,10 +74,12 @@ public class BindyTabSeparatorTest extends CamelTestSupport { mock.expectedMessageCount(1); template.sendBodyAndHeader("direct:unmarshal", - "123\tCamel in Action\t2\t\t\n" - + "456\tCamel in Action\t1\t\t\t\n" - + "456\tCamel in Action\t2\t\t\n" - + "456\tCamel in Action\t1\t\t\t\n", + """ + 123\tCamel in Action\t2\t\t + 456\tCamel in Action\t1\t\t\t + 456\tCamel in Action\t2\t\t + 456\tCamel in Action\t1\t\t\t + """, Exchange.CONTENT_ENCODING, "iso8859-1"); MockEndpoint.assertIsSatisfied(context); diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java index 833739e00732..b22286dab67a 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/WickedHeaderWithCommaCsvTest.java @@ -33,9 +33,11 @@ public class WickedHeaderWithCommaCsvTest extends CamelTestSupport { final MockEndpoint unmarshalMock = getMockEndpoint("mock:receiveUnmarshal"); unmarshalMock.expectedMessageCount(1); - String csv = ("\"Foo (one, or more, foos)\",\"Bar (one, or more, bars)\"" + "\r\n") - + "\"1,000.00\",\"1,500.00\"" + "\r\n" - + "\"2,000.00\",\"2,700.00\"" + "\r\n"; + String csv = """ + "Foo (one, or more, foos)","Bar (one, or more, bars)"\r + "1,000.00","1,500.00"\r + "2,000.00","2,700.00"\r + """; template.sendBody("direct:startUnmarshal", csv);
