From de6f74fa4071935c6651eb22d5f1819655af6c21 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 22 Aug 2012 11:38:55 -0400 Subject: [PATCH] Encode UTF-8 characters used in Java test sources A pass-through the native2ascii tool. Issue: SPR-9657 --- .../web/servlet/support/AbstractFlashMapManagerTests.java | 3 ++- .../springframework/web/servlet/tags/form/SelectTagTests.java | 2 +- .../org/springframework/web/servlet/view/BaseViewTests.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AbstractFlashMapManagerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AbstractFlashMapManagerTests.java index c5a259fb22..5c1bc7a898 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AbstractFlashMapManagerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AbstractFlashMapManagerTests.java @@ -276,7 +276,8 @@ public class AbstractFlashMapManagerTests { flashMap.addTargetRequestParam("key", "%D0%92%D0%92"); this.flashMapManager.saveOutputFlashMap(flashMap, this.request, this.response); - assertEquals(Arrays.asList("АА", "ББ", "ВВ"), flashMap.getTargetRequestParams().get("key")); + assertEquals(Arrays.asList("\u0410\u0410", "\u0411\u0411", "\u0412\u0412"), + flashMap.getTargetRequestParams().get("key")); } diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java index 06bac2f852..0df2dc253a 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java @@ -651,7 +651,7 @@ public class SelectTagTests extends AbstractFormTagTests { // Save original default locale. final Locale defaultLocale = Locale.getDefault(); // Use a locale that doesn't result in the generation of HTML entities - // (e.g., not German, where ä becomes ä) + // (e.g., not German, where \u00e4 becomes ä) Locale.setDefault(Locale.US); try { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java index 0f3c63a5e5..83b2dee538 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/BaseViewTests.java @@ -239,7 +239,7 @@ public class BaseViewTests extends TestCase { public void testAttributeCSVParsingValidWithWeirdCharacters() { AbstractView v = new ConcreteView(); - String fooval = "owfie fue&3[][[[2 \n\n \r \t 8�3"; + String fooval = "owfie fue&3[][[[2 \n\n \r \t 8\ufffd3"; // Also tests empty value String kingval = ""; v.setAttributesCSV("foo=(" + fooval + "),king={" + kingval + "},f1=[we]");