http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29080

Throw an exception with a clear message.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/codec/trunk@130373 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

src/java/org/apache/commons/codec/language/Soundex.java

@@ -25,7 +25,7 @@
  * with similar phonemes.
  * 
  * @author Apache Software Foundation
- * @version $Id: Soundex.java,v 1.21 2004/03/17 18:30:59 ggregory Exp $
+ * @version $Id: Soundex.java,v 1.22 2004/06/02 00:55:29 ggregory Exp $
  */
 public class Soundex implements StringEncoder {
 
@@ -117,17 +117,10 @@ public Soundex(char[] mapping) {
 	 *                  if the parameter supplied is not of type java.lang.String
 	 */
     public Object encode(Object pObject) throws EncoderException {
-
-        Object result;
-
-        if (!(pObject instanceof java.lang.String)) {
+        if (!(pObject instanceof String)) {
             throw new EncoderException("Parameter supplied to Soundex encode is not of type java.lang.String");
-        } else {
-            result = soundex((String) pObject);
-        }
-
-        return result;
-
+        } 
+        return soundex((String) pObject);
     }
 
     /**
@@ -196,7 +189,11 @@ private char[] getSoundexMapping() {
 	 * @return A Soundex code.
 	 */
     private char map(char c) {
-        return this.getSoundexMapping()[c - 'A'];
+    	int index = c - 'A';
+    	if (index < 0 || index >= this.getSoundexMapping().length) {
+    		throw new IllegalArgumentException("The character is not mapped: " + c);
+    	}
+        return this.getSoundexMapping()[index];
     }
 
     /**

src/test/org/apache/commons/codec/language/SoundexTest.java

@@ -26,7 +26,7 @@
 /**
  * Tests {@link Soundex}
  * 
- * @version $Id: SoundexTest.java,v 1.17 2004/04/19 01:14:29 ggregory Exp $
+ * @version $Id: SoundexTest.java,v 1.18 2004/06/02 00:55:38 ggregory Exp $
  * @author Apache Software Foundation
  */
 public class SoundexTest extends StringEncoderAbstractTest {
@@ -219,8 +219,6 @@ public void testEncodeIgnoreApostrophes() {
 
     /**
 	 * Test data from http://www.myatt.demon.co.uk/sxalg.htm
-	 * 
-	 * @throws EncoderException
 	 */
     public void testEncodeIgnoreHyphens() {
         this.encodeAll(
@@ -339,4 +337,33 @@ public void testMsSqlServer3() {
         assertEquals("A500", this.getEncoder().encode("Anne"));
     }
 
+    /**
+     * Fancy characters are not mapped by the default US mapping.
+     * 
+     * http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29080
+     */
+    public void testUsMappingOWithDiaeresis() {
+        assertEquals("O000", this.getEncoder().encode("o"));
+        try {
+            assertEquals("Ö000", this.getEncoder().encode("ö"));
+            fail("Expected IllegalArgumentException not thrown");
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+    }
+
+    /**
+     * Fancy characters are not mapped by the default US mapping.
+     * 
+     * http://nagoya.apache.org/bugzilla/show_bug.cgi?id=29080
+     */
+    public void testUsMappingEWithAcute() {
+        assertEquals("E000", this.getEncoder().encode("e"));
+        try {
+            assertEquals("É000", this.getEncoder().encode("é"));
+            fail("Expected IllegalArgumentException not thrown");
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+    }
 }