CODEC-127 - fix mangled characters

sebbASF · sebbASF · commit 0c6a06c60da3 · 2011-08-14T18:57:14.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/branches/generics@1157596 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/test/org/apache/commons/codec/language/SoundexTest.java b/src/test/org/apache/commons/codec/language/SoundexTest.java
@@ -364,15 +364,16 @@ public void testUsEnglishStatic() {
     @Test
     public void testUsMappingEWithAcute() {
         Assert.assertEquals("E000", this.getSoundexEncoder().encode("e"));
-        if (Character.isLetter('�')) {
+        if (Character.isLetter('\u00e9')) { // e-acute
             try {
-                Assert.assertEquals("�000", this.getSoundexEncoder().encode("�"));
+                //         uppercase E-acute
+                Assert.assertEquals("\u00c9000", this.getSoundexEncoder().encode("\u00e9"));
                 Assert.fail("Expected IllegalArgumentException not thrown");
             } catch (IllegalArgumentException e) {
                 // expected
             }
         } else {
-            Assert.assertEquals("", this.getSoundexEncoder().encode("�"));
+            Assert.assertEquals("", this.getSoundexEncoder().encode("\u00e9"));
         }
     }
 
@@ -384,15 +385,16 @@ public void testUsMappingEWithAcute() {
     @Test
     public void testUsMappingOWithDiaeresis() {
         Assert.assertEquals("O000", this.getSoundexEncoder().encode("o"));
-        if (Character.isLetter('�')) {
+        if (Character.isLetter('\u00f6')) { // o-umlaut
             try {
-                Assert.assertEquals("�000", this.getSoundexEncoder().encode("�"));
+                //         uppercase O-umlaut
+                Assert.assertEquals("\u00d6000", this.getSoundexEncoder().encode("\u00f6"));
                 Assert.fail("Expected IllegalArgumentException not thrown");
             } catch (IllegalArgumentException e) {
                 // expected
             }
         } else {
-            Assert.assertEquals("", this.getSoundexEncoder().encode("�"));
+            Assert.assertEquals("", this.getSoundexEncoder().encode("\u00f6"));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -364,15 +364,16 @@ public void testUsEnglishStatic() {`
`364`	`364`	`@Test`
`365`	`365`	`public void testUsMappingEWithAcute() {`
`366`	`366`	`Assert.assertEquals("E000", this.getSoundexEncoder().encode("e"));`
`367`		`- if (Character.isLetter('�')) {`
	`367`	`+ if (Character.isLetter('\u00e9')) { // e-acute`
`368`	`368`	`try {`
`369`		`- Assert.assertEquals("�000", this.getSoundexEncoder().encode("�"));`
	`369`	`+ // uppercase E-acute`
	`370`	`+ Assert.assertEquals("\u00c9000", this.getSoundexEncoder().encode("\u00e9"));`
`370`	`371`	`Assert.fail("Expected IllegalArgumentException not thrown");`
`371`	`372`	`} catch (IllegalArgumentException e) {`
`372`	`373`	`// expected`
`373`	`374`	`}`
`374`	`375`	`} else {`
`375`		`- Assert.assertEquals("", this.getSoundexEncoder().encode("�"));`
	`376`	`+ Assert.assertEquals("", this.getSoundexEncoder().encode("\u00e9"));`
`376`	`377`	`}`
`377`	`378`	`}`
`378`	`379`
`@@ -384,15 +385,16 @@ public void testUsMappingEWithAcute() {`
`384`	`385`	`@Test`
`385`	`386`	`public void testUsMappingOWithDiaeresis() {`
`386`	`387`	`Assert.assertEquals("O000", this.getSoundexEncoder().encode("o"));`
`387`		`- if (Character.isLetter('�')) {`
	`388`	`+ if (Character.isLetter('\u00f6')) { // o-umlaut`
`388`	`389`	`try {`
`389`		`- Assert.assertEquals("�000", this.getSoundexEncoder().encode("�"));`
	`390`	`+ // uppercase O-umlaut`
	`391`	`+ Assert.assertEquals("\u00d6000", this.getSoundexEncoder().encode("\u00f6"));`
`390`	`392`	`Assert.fail("Expected IllegalArgumentException not thrown");`
`391`	`393`	`} catch (IllegalArgumentException e) {`
`392`	`394`	`// expected`
`393`	`395`	`}`
`394`	`396`	`} else {`
`395`		`- Assert.assertEquals("", this.getSoundexEncoder().encode("�"));`
	`397`	`+ Assert.assertEquals("", this.getSoundexEncoder().encode("\u00f6"));`
`396`	`398`	`}`
`397`	`399`	`}`
`398`	`400`	`}`