Skip to content

Commit aed6d32

Browse files
garydgregorygarydgregory
committed
Minor refactoring.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1636488 13f79535-47bb-0310-9956-ffa450edef68
1 parent 0a390c6 commit aed6d32

1 file changed

Lines changed: 59 additions & 52 deletions

File tree

‎src/test/java/org/apache/commons/codec/language/DaitchMokotoffSoundexTest.java‎

Lines changed: 59 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,21 @@ protected DaitchMokotoffSoundex createStringEncoder() {
3636
return new DaitchMokotoffSoundex();
3737
}
3838

39+
private String soundex(String source) {
40+
return getStringEncoder().soundex(source);
41+
}
42+
43+
private String encode(String source) {
44+
return getStringEncoder().encode(source);
45+
}
46+
3947
@Test
4048
public void testAccentedCharacterFolding() {
41-
Assert.assertEquals("294795", this.getStringEncoder().soundex("Straßburg"));
42-
Assert.assertEquals("294795", this.getStringEncoder().soundex("Strasburg"));
49+
Assert.assertEquals("294795", soundex("Straßburg"));
50+
Assert.assertEquals("294795", soundex("Strasburg"));
4351

44-
Assert.assertEquals("095600", this.getStringEncoder().soundex("Éregon"));
45-
Assert.assertEquals("095600", this.getStringEncoder().soundex("Eregon"));
52+
Assert.assertEquals("095600", soundex("Éregon"));
53+
Assert.assertEquals("095600", soundex("Eregon"));
4654
}
4755

4856
@Test
@@ -51,25 +59,25 @@ public void testAdjacentCodes() {
5159
// A-KS-S-O-L
5260
// 0-54-4---8 -> wrong
5361
// 0-54-----8 -> correct
54-
Assert.assertEquals("054800", this.getStringEncoder().soundex("AKSSOL"));
62+
Assert.assertEquals("054800", soundex("AKSSOL"));
5563

5664
// GERSCHFELD
5765
// G-E-RS-CH-F-E-L-D
5866
// 5--4/94-5/4-7-8-3 -> wrong
5967
// 5--4/94-5/--7-8-3 -> correct
60-
Assert.assertEquals("547830|545783|594783|594578", this.getStringEncoder().soundex("GERSCHFELD"));
68+
Assert.assertEquals("547830|545783|594783|594578", soundex("GERSCHFELD"));
6169
}
6270

6371
public void testEncodeBasic() {
6472
// same as above, but without branching
65-
Assert.assertEquals("097400", this.getStringEncoder().encode("AUERBACH"));
66-
Assert.assertEquals("097400", this.getStringEncoder().encode("OHRBACH"));
67-
Assert.assertEquals("874400", this.getStringEncoder().encode("LIPSHITZ"));
68-
Assert.assertEquals("874400", this.getStringEncoder().encode("LIPPSZYC"));
69-
Assert.assertEquals("876450", this.getStringEncoder().encode("LEWINSKY"));
70-
Assert.assertEquals("876450", this.getStringEncoder().encode("LEVINSKI"));
71-
Assert.assertEquals("486740", this.getStringEncoder().encode("SZLAMAWICZ"));
72-
Assert.assertEquals("486740", this.getStringEncoder().encode("SHLAMOVITZ"));
73+
Assert.assertEquals("097400", encode("AUERBACH"));
74+
Assert.assertEquals("097400", encode("OHRBACH"));
75+
Assert.assertEquals("874400", encode("LIPSHITZ"));
76+
Assert.assertEquals("874400", encode("LIPPSZYC"));
77+
Assert.assertEquals("876450", encode("LEWINSKY"));
78+
Assert.assertEquals("876450", encode("LEVINSKI"));
79+
Assert.assertEquals("486740", encode("SZLAMAWICZ"));
80+
Assert.assertEquals("486740", encode("SHLAMOVITZ"));
7381
}
7482

7583
@Test
@@ -91,69 +99,68 @@ public void testEncodeIgnoreHyphens() throws EncoderException {
9199

92100
@Test
93101
public void testEncodeIgnoreTrimmable() {
94-
Assert.assertEquals("746536", this.getStringEncoder().encode(" \t\n\r Washington \t\n\r "));
95-
Assert.assertEquals("746536", this.getStringEncoder().encode("Washington"));
102+
Assert.assertEquals("746536", encode(" \t\n\r Washington \t\n\r "));
103+
Assert.assertEquals("746536", encode("Washington"));
96104
}
97105

98106
/**
99107
* Examples from http://www.jewishgen.org/infofiles/soundex.html
100108
*/
101109
@Test
102110
public void testSoundexBasic() {
103-
Assert.assertEquals("583600", this.getStringEncoder().soundex("GOLDEN"));
104-
Assert.assertEquals("087930", this.getStringEncoder().soundex("Alpert"));
105-
Assert.assertEquals("791900", this.getStringEncoder().soundex("Breuer"));
106-
Assert.assertEquals("579000", this.getStringEncoder().soundex("Haber"));
107-
Assert.assertEquals("665600", this.getStringEncoder().soundex("Mannheim"));
108-
Assert.assertEquals("664000", this.getStringEncoder().soundex("Mintz"));
109-
Assert.assertEquals("370000", this.getStringEncoder().soundex("Topf"));
110-
Assert.assertEquals("586660", this.getStringEncoder().soundex("Kleinmann"));
111-
Assert.assertEquals("769600", this.getStringEncoder().soundex("Ben Aron"));
112-
113-
Assert.assertEquals("097400|097500", this.getStringEncoder().soundex("AUERBACH"));
114-
Assert.assertEquals("097400|097500", this.getStringEncoder().soundex("OHRBACH"));
115-
Assert.assertEquals("874400", this.getStringEncoder().soundex("LIPSHITZ"));
116-
Assert.assertEquals("874400|874500", this.getStringEncoder().soundex("LIPPSZYC"));
117-
Assert.assertEquals("876450", this.getStringEncoder().soundex("LEWINSKY"));
118-
Assert.assertEquals("876450", this.getStringEncoder().soundex("LEVINSKI"));
119-
Assert.assertEquals("486740", this.getStringEncoder().soundex("SZLAMAWICZ"));
120-
Assert.assertEquals("486740", this.getStringEncoder().soundex("SHLAMOVITZ"));
111+
Assert.assertEquals("583600", soundex("GOLDEN"));
112+
Assert.assertEquals("087930", soundex("Alpert"));
113+
Assert.assertEquals("791900", soundex("Breuer"));
114+
Assert.assertEquals("579000", soundex("Haber"));
115+
Assert.assertEquals("665600", soundex("Mannheim"));
116+
Assert.assertEquals("664000", soundex("Mintz"));
117+
Assert.assertEquals("370000", soundex("Topf"));
118+
Assert.assertEquals("586660", soundex("Kleinmann"));
119+
Assert.assertEquals("769600", soundex("Ben Aron"));
120+
121+
Assert.assertEquals("097400|097500", soundex("AUERBACH"));
122+
Assert.assertEquals("097400|097500", soundex("OHRBACH"));
123+
Assert.assertEquals("874400", soundex("LIPSHITZ"));
124+
Assert.assertEquals("874400|874500", soundex("LIPPSZYC"));
125+
Assert.assertEquals("876450", soundex("LEWINSKY"));
126+
Assert.assertEquals("876450", soundex("LEVINSKI"));
127+
Assert.assertEquals("486740", soundex("SZLAMAWICZ"));
128+
Assert.assertEquals("486740", soundex("SHLAMOVITZ"));
121129
}
122130

123131
/**
124132
* Examples from http://www.avotaynu.com/soundex.htm
125133
*/
126134
@Test
127135
public void testSoundexBasic2() {
128-
Assert.assertEquals("467000|567000", this.getStringEncoder().soundex("Ceniow"));
129-
Assert.assertEquals("467000", this.getStringEncoder().soundex("Tsenyuv"));
130-
Assert.assertEquals("587400|587500", this.getStringEncoder().soundex("Holubica"));
131-
Assert.assertEquals("587400", this.getStringEncoder().soundex("Golubitsa"));
132-
Assert.assertEquals("746480|794648", this.getStringEncoder().soundex("Przemysl"));
133-
Assert.assertEquals("746480", this.getStringEncoder().soundex("Pshemeshil"));
134-
Assert.assertEquals("944744|944745|944754|944755|945744|945745|945754|945755",
135-
this.getStringEncoder().soundex("Rosochowaciec"));
136-
Assert.assertEquals("945744", this.getStringEncoder().soundex("Rosokhovatsets"));
136+
Assert.assertEquals("467000|567000", soundex("Ceniow"));
137+
Assert.assertEquals("467000", soundex("Tsenyuv"));
138+
Assert.assertEquals("587400|587500", soundex("Holubica"));
139+
Assert.assertEquals("587400", soundex("Golubitsa"));
140+
Assert.assertEquals("746480|794648", soundex("Przemysl"));
141+
Assert.assertEquals("746480", soundex("Pshemeshil"));
142+
Assert.assertEquals("944744|944745|944754|944755|945744|945745|945754|945755", soundex("Rosochowaciec"));
143+
Assert.assertEquals("945744", soundex("Rosokhovatsets"));
137144
}
138145

139146
/**
140147
* Examples from http://en.wikipedia.org/wiki/Daitch%E2%80%93Mokotoff_Soundex
141148
*/
142149
@Test
143150
public void testSoundexBasic3() {
144-
Assert.assertEquals("734000|739400", this.getStringEncoder().soundex("Peters"));
145-
Assert.assertEquals("734600|739460", this.getStringEncoder().soundex("Peterson"));
146-
Assert.assertEquals("645740", this.getStringEncoder().soundex("Moskowitz"));
147-
Assert.assertEquals("645740", this.getStringEncoder().soundex("Moskovitz"));
148-
Assert.assertEquals("154600|145460|454600|445460", this.getStringEncoder().soundex("Jackson"));
149-
Assert.assertEquals("154654|154645|154644|145465|145464|454654|454645|454644|445465|445464", this
150-
.getStringEncoder().soundex("Jackson-Jackson"));
151+
Assert.assertEquals("734000|739400", soundex("Peters"));
152+
Assert.assertEquals("734600|739460", soundex("Peterson"));
153+
Assert.assertEquals("645740", soundex("Moskowitz"));
154+
Assert.assertEquals("645740", soundex("Moskovitz"));
155+
Assert.assertEquals("154600|145460|454600|445460", soundex("Jackson"));
156+
Assert.assertEquals("154654|154645|154644|145465|145464|454654|454645|454644|445465|445464",
157+
soundex("Jackson-Jackson"));
151158
}
152159

153160
@Test
154161
public void testSpecialRomanianCharacters() {
155-
Assert.assertEquals("364000|464000", this.getStringEncoder().soundex("ţamas")); // t-cedilla
156-
Assert.assertEquals("364000|464000", this.getStringEncoder().soundex("țamas")); // t-comma
162+
Assert.assertEquals("364000|464000", soundex("ţamas")); // t-cedilla
163+
Assert.assertEquals("364000|464000", soundex("țamas")); // t-comma
157164
}
158165

159166
}

0 commit comments

Comments
 (0)