From 314fe263edab6d8a63c86bc2e43049c7843d6e1e Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Mon, 27 Mar 2017 18:11:32 +0200
Subject: [PATCH] more failing tests for quote / parameter escaping

Change-Id: Ifd12a7a9b538970ff447cae574c2dd82f7cd636c
---
 .../stringmessages/Test_StringMessages.properties          | 3 ++-
 .../stringmessages/Test_StringMessages_de.properties       | 3 ++-
 .../src/com/sap/sse/datamining/impl/i18n/TestI18N.java     | 7 +++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/java/com.sap.sse.datamining.test/resources/stringmessages/Test_StringMessages.properties b/java/com.sap.sse.datamining.test/resources/stringmessages/Test_StringMessages.properties
index e19bf582f64..0108b058c04 100644
--- a/java/com.sap.sse.datamining.test/resources/stringmessages/Test_StringMessages.properties
+++ b/java/com.sap.sse.datamining.test/resources/stringmessages/Test_StringMessages.properties
@@ -16,4 +16,5 @@ DistanceTraveled=Distance Traveled
 DefaultTestMessage=Default
 MessageWithSingleQuote=A Single '' Quote
 MessageWithOpeningCurlyBrace=An opening '{' curly brace
-MessageWithEscapedParameters='{0}' '{1} {2}'
\ No newline at end of file
+MessageWithEscapedParameters='{0}' '{1} {2}'
+MessageWithEscapedSingleQuotesAndParameters=''{0}'' '' ''{1}''
\ No newline at end of file
diff --git a/java/com.sap.sse.datamining.test/resources/stringmessages/Test_StringMessages_de.properties b/java/com.sap.sse.datamining.test/resources/stringmessages/Test_StringMessages_de.properties
index a50875cb400..1fee730961d 100644
--- a/java/com.sap.sse.datamining.test/resources/stringmessages/Test_StringMessages_de.properties
+++ b/java/com.sap.sse.datamining.test/resources/stringmessages/Test_StringMessages_de.properties
@@ -14,4 +14,5 @@ illegalDimension=Illegale Dimension
 DistanceTraveled=Gefahrene Distanz
 MessageWithSingleQuote=Ein einfaches '' Anführungszeichen
 MessageWithOpeningCurlyBrace=Eine öffnende '{' geschweifte Klammer
-MessageWithEscapedParameters='{0}' '{1} {2}'
\ No newline at end of file
+MessageWithEscapedParameters='{0}' '{1} {2}'
+MessageWithEscapedSingleQuotesAndParameters=''{0}'' '' ''{1}''
\ No newline at end of file
diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/i18n/TestI18N.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/i18n/TestI18N.java
index a86d7b1853b..d95acb33068 100644
--- a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/i18n/TestI18N.java
+++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/i18n/TestI18N.java
@@ -25,6 +25,7 @@ public class TestI18N {
     private static final String TEST_MESSAGE_WITH_SINGLE_QUOTE = "MessageWithSingleQuote";
     private static final String TEST_MESSAGE_WITH_OPENING_CURLY_BRACE = "MessageWithOpeningCurlyBrace";
     private static final String TEST_MESSAGE_WITH_ESCAPED_PARAMETERS = "MessageWithEscapedParameters";
+    private static final String TEST_MESSAGE_WITH_PARAMETERS_AND_ESCAPED_SINGLE_QUOTES = "MessageWithEscapedSingleQuotesAndParameters";
     
     private ResourceBundleStringMessages testStringMessages;
     
@@ -33,6 +34,12 @@ public class TestI18N {
         testStringMessages = TestsUtil.getTestStringMessages();
     }
 
+    @Test
+    public void testEscapedSingleQuotesWithParameters() {
+        assertThat(testStringMessages.get(DEFAULT_LOCALE, TEST_MESSAGE_WITH_PARAMETERS_AND_ESCAPED_SINGLE_QUOTES, "First", "Second"), is("'First' ' 'Second'"));
+        assertThat(testStringMessages.get(Locale.ROOT, TEST_MESSAGE_WITH_PARAMETERS_AND_ESCAPED_SINGLE_QUOTES, "First", "Second"), is("'First' ' 'Second'"));
+    }
+    
     @Test
     public void testSingleQuoteInString() {
         assertThat(testStringMessages.get(DEFAULT_LOCALE, TEST_MESSAGE_WITH_SINGLE_QUOTE), is("A Single ' Quote"));