Skip to content

Commit dbe8f00

Browse files
garydgregorygarydgregory
committed
Remove redundant keywords
1 parent 9b82536 commit dbe8f00

1 file changed

Lines changed: 61 additions & 61 deletions

File tree

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

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,24 @@ public class MetaphoneTest extends AbstractStringEncoderTest<Metaphone> {
3131
public void assertIsMetaphoneEqual(final String source, final String[] matches) {
3232
// match source to all matches
3333
for (final String matche : matches) {
34-
assertTrue(this.getStringEncoder().isMetaphoneEqual(source, matche), "Source: " + source + ", should have same Metaphone as: " + matche);
34+
assertTrue(getStringEncoder().isMetaphoneEqual(source, matche), "Source: " + source + ", should have same Metaphone as: " + matche);
3535
}
3636
// match to each other
3737
for (final String matche : matches) {
3838
for (final String matche2 : matches) {
39-
assertTrue(this.getStringEncoder().isMetaphoneEqual(matche, matche2));
39+
assertTrue(getStringEncoder().isMetaphoneEqual(matche, matche2));
4040
}
4141
}
4242
}
4343

4444
public void assertMetaphoneEqual(final String[][] pairs) {
45-
this.validateFixture(pairs);
45+
validateFixture(pairs);
4646
for (final String[] pair : pairs) {
4747
final String name0 = pair[0];
4848
final String name1 = pair[1];
4949
final String failMsg = "Expected match between " + name0 + " and " + name1;
50-
assertTrue(this.getStringEncoder().isMetaphoneEqual(name0, name1), failMsg);
51-
assertTrue(this.getStringEncoder().isMetaphoneEqual(name1, name0), failMsg);
50+
assertTrue(getStringEncoder().isMetaphoneEqual(name0, name1), failMsg);
51+
assertTrue(getStringEncoder().isMetaphoneEqual(name1, name0), failMsg);
5252
}
5353
}
5454

@@ -59,43 +59,43 @@ protected Metaphone createStringEncoder() {
5959

6060
@Test
6161
public void testDiscardOfSCEOrSCIOrSCY() {
62-
assertEquals("SNS", this.getStringEncoder().metaphone("SCIENCE"));
63-
assertEquals("SN", this.getStringEncoder().metaphone("SCENE"));
64-
assertEquals("S", this.getStringEncoder().metaphone("SCY"));
62+
assertEquals("SNS", getStringEncoder().metaphone("SCIENCE"));
63+
assertEquals("SN", getStringEncoder().metaphone("SCENE"));
64+
assertEquals("S", getStringEncoder().metaphone("SCY"));
6565
}
6666

6767
@Test
6868
public void testDiscardOfSilentGN() {
6969
// NOTE: This does not test for silent GN, but for starting with GN
70-
assertEquals("N", this.getStringEncoder().metaphone("GNU"));
70+
assertEquals("N", getStringEncoder().metaphone("GNU"));
7171

7272
// NOTE: Trying to test for GNED, but expected code does not appear to execute
73-
assertEquals("SNT", this.getStringEncoder().metaphone("SIGNED"));
73+
assertEquals("SNT", getStringEncoder().metaphone("SIGNED"));
7474
}
7575

7676
@Test
7777
public void testDiscardOfSilentHAfterG() {
78-
assertEquals("KNT", this.getStringEncoder().metaphone("GHENT"));
79-
assertEquals("B", this.getStringEncoder().metaphone("BAUGH"));
78+
assertEquals("KNT", getStringEncoder().metaphone("GHENT"));
79+
assertEquals("B", getStringEncoder().metaphone("BAUGH"));
8080
}
8181

8282
@Test
8383
public void testExceedLength() {
8484
// should be AKSKS, but is truncated by Max Code Length
85-
assertEquals("AKSK", this.getStringEncoder().metaphone("AXEAXE"));
85+
assertEquals("AKSK", getStringEncoder().metaphone("AXEAXE"));
8686
}
8787

8888
@Test
8989
public void testIsMetaphoneEqual1() {
90-
this.assertMetaphoneEqual(new String[][] { { "Case", "case" }, { "CASE", "Case" }, { "caSe", "cAsE" }, { "quick", "cookie" } });
90+
assertMetaphoneEqual(new String[][] { { "Case", "case" }, { "CASE", "Case" }, { "caSe", "cAsE" }, { "quick", "cookie" } });
9191
}
9292

9393
/**
9494
* Matches computed from http://www.lanw.com/java/phonetic/default.htm
9595
*/
9696
@Test
9797
public void testIsMetaphoneEqual2() {
98-
this.assertMetaphoneEqual(new String[][] { { "Lawrence", "Lorenza" }, { "Gary", "Cahra" }, });
98+
assertMetaphoneEqual(new String[][] { { "Lawrence", "Lorenza" }, { "Gary", "Cahra" }, });
9999
}
100100

101101
/**
@@ -105,7 +105,7 @@ public void testIsMetaphoneEqual2() {
105105
*/
106106
@Test
107107
public void testIsMetaphoneEqualAero() {
108-
this.assertIsMetaphoneEqual("Aero", new String[] { "Eure" });
108+
assertIsMetaphoneEqual("Aero", new String[] { "Eure" });
109109
}
110110

111111
/**
@@ -115,15 +115,15 @@ public void testIsMetaphoneEqualAero() {
115115
*/
116116
@Test
117117
public void testIsMetaphoneEqualAlbert() {
118-
this.assertIsMetaphoneEqual("Albert", new String[] { "Ailbert", "Alberik", "Albert", "Alberto", "Albrecht" });
118+
assertIsMetaphoneEqual("Albert", new String[] { "Ailbert", "Alberik", "Albert", "Alberto", "Albrecht" });
119119
}
120120

121121
/**
122122
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
123123
*/
124124
@Test
125125
public void testIsMetaphoneEqualGary() {
126-
this.assertIsMetaphoneEqual("Gary",
126+
assertIsMetaphoneEqual("Gary",
127127
new String[] { "Cahra", "Cara", "Carey", "Cari", "Caria", "Carie", "Caro", "Carree", "Carri", "Carrie", "Carry", "Cary", "Cora", "Corey",
128128
"Cori", "Corie", "Correy", "Corri", "Corrie", "Corry", "Cory", "Gray", "Kara", "Kare", "Karee", "Kari", "Karia", "Karie", "Karrah",
129129
"Karrie", "Karry", "Kary", "Keri", "Kerri", "Kerrie", "Kerry", "Kira", "Kiri", "Kora", "Kore", "Kori", "Korie", "Korrie", "Korry" });
@@ -134,7 +134,7 @@ public void testIsMetaphoneEqualGary() {
134134
*/
135135
@Test
136136
public void testIsMetaphoneEqualJohn() {
137-
this.assertIsMetaphoneEqual("John",
137+
assertIsMetaphoneEqual("John",
138138
new String[] { "Gena", "Gene", "Genia", "Genna", "Genni", "Gennie", "Genny", "Giana", "Gianna", "Gina", "Ginni", "Ginnie", "Ginny", "Jaine",
139139
"Jan", "Jana", "Jane", "Janey", "Jania", "Janie", "Janna", "Jany", "Jayne", "Jean", "Jeana", "Jeane", "Jeanie", "Jeanna", "Jeanne",
140140
"Jeannie", "Jen", "Jena", "Jeni", "Jenn", "Jenna", "Jennee", "Jenni", "Jennie", "Jenny", "Jinny", "Jo Ann", "Jo-Ann", "Jo-Anne", "Joan",
@@ -149,7 +149,7 @@ public void testIsMetaphoneEqualJohn() {
149149
*/
150150
@Test
151151
public void testIsMetaphoneEqualKnight() {
152-
this.assertIsMetaphoneEqual("Knight", new String[] { "Hynda", "Nada", "Nadia", "Nady", "Nat", "Nata", "Natty", "Neda", "Nedda", "Nedi", "Netta",
152+
assertIsMetaphoneEqual("Knight", new String[] { "Hynda", "Nada", "Nadia", "Nady", "Nat", "Nata", "Natty", "Neda", "Nedda", "Nedi", "Netta",
153153
"Netti", "Nettie", "Netty", "Nita", "Nydia" });
154154
}
155155

@@ -158,7 +158,7 @@ public void testIsMetaphoneEqualKnight() {
158158
*/
159159
@Test
160160
public void testIsMetaphoneEqualMary() {
161-
this.assertIsMetaphoneEqual("Mary", new String[] { "Mair", "Maire", "Mara", "Mareah", "Mari", "Maria", "Marie", "Mary", "Maura", "Maure", "Meara",
161+
assertIsMetaphoneEqual("Mary", new String[] { "Mair", "Maire", "Mara", "Mareah", "Mari", "Maria", "Marie", "Mary", "Maura", "Maure", "Meara",
162162
"Merrie", "Merry", "Mira", "Moira", "Mora", "Moria", "Moyra", "Muire", "Myra", "Myrah" });
163163
}
164164

@@ -167,31 +167,31 @@ public void testIsMetaphoneEqualMary() {
167167
*/
168168
@Test
169169
public void testIsMetaphoneEqualParis() {
170-
this.assertIsMetaphoneEqual("Paris", new String[] { "Pearcy", "Perris", "Piercy", "Pierz", "Pryse" });
170+
assertIsMetaphoneEqual("Paris", new String[] { "Pearcy", "Perris", "Piercy", "Pierz", "Pryse" });
171171
}
172172

173173
/**
174174
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
175175
*/
176176
@Test
177177
public void testIsMetaphoneEqualPeter() {
178-
this.assertIsMetaphoneEqual("Peter", new String[] { "Peadar", "Peder", "Pedro", "Peter", "Petr", "Peyter", "Pieter", "Pietro", "Piotr" });
178+
assertIsMetaphoneEqual("Peter", new String[] { "Peadar", "Peder", "Pedro", "Peter", "Petr", "Peyter", "Pieter", "Pietro", "Piotr" });
179179
}
180180

181181
/**
182182
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
183183
*/
184184
@Test
185185
public void testIsMetaphoneEqualRay() {
186-
this.assertIsMetaphoneEqual("Ray", new String[] { "Ray", "Rey", "Roi", "Roy", "Ruy" });
186+
assertIsMetaphoneEqual("Ray", new String[] { "Ray", "Rey", "Roi", "Roy", "Ruy" });
187187
}
188188

189189
/**
190190
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
191191
*/
192192
@Test
193193
public void testIsMetaphoneEqualSusan() {
194-
this.assertIsMetaphoneEqual("Susan",
194+
assertIsMetaphoneEqual("Susan",
195195
new String[] { "Siusan", "Sosanna", "Susan", "Susana", "Susann", "Susanna", "Susannah", "Susanne", "Suzann", "Suzanna", "Suzanne", "Zuzana" });
196196
}
197197

@@ -202,7 +202,7 @@ public void testIsMetaphoneEqualSusan() {
202202
*/
203203
@Test
204204
public void testIsMetaphoneEqualWhite() {
205-
this.assertIsMetaphoneEqual("White",
205+
assertIsMetaphoneEqual("White",
206206
new String[] { "Wade", "Wait", "Waite", "Wat", "Whit", "Wiatt", "Wit", "Wittie", "Witty", "Wood", "Woodie", "Woody" });
207207
}
208208

@@ -213,77 +213,77 @@ public void testIsMetaphoneEqualWhite() {
213213
*/
214214
@Test
215215
public void testIsMetaphoneEqualWright() {
216-
this.assertIsMetaphoneEqual("Wright", new String[] { "Rota", "Rudd", "Ryde" });
216+
assertIsMetaphoneEqual("Wright", new String[] { "Rota", "Rudd", "Ryde" });
217217
}
218218

219219
/**
220220
* Match data computed from http://www.lanw.com/java/phonetic/default.htm
221221
*/
222222
@Test
223223
public void testIsMetaphoneEqualXalan() {
224-
this.assertIsMetaphoneEqual("Xalan", new String[] { "Celene", "Celina", "Celine", "Selena", "Selene", "Selina", "Seline", "Suellen", "Xylina" });
224+
assertIsMetaphoneEqual("Xalan", new String[] { "Celene", "Celina", "Celine", "Selena", "Selene", "Selina", "Seline", "Suellen", "Xylina" });
225225
}
226226

227227
@Test
228228
public void testMetaphone() {
229-
assertEquals("HL", this.getStringEncoder().metaphone("howl"));
230-
assertEquals("TSTN", this.getStringEncoder().metaphone("testing"));
231-
assertEquals("0", this.getStringEncoder().metaphone("The"));
232-
assertEquals("KK", this.getStringEncoder().metaphone("quick"));
233-
assertEquals("BRN", this.getStringEncoder().metaphone("brown"));
234-
assertEquals("FKS", this.getStringEncoder().metaphone("fox"));
235-
assertEquals("JMPT", this.getStringEncoder().metaphone("jumped"));
236-
assertEquals("OFR", this.getStringEncoder().metaphone("over"));
237-
assertEquals("0", this.getStringEncoder().metaphone("the"));
238-
assertEquals("LS", this.getStringEncoder().metaphone("lazy"));
239-
assertEquals("TKS", this.getStringEncoder().metaphone("dogs"));
229+
assertEquals("HL", getStringEncoder().metaphone("howl"));
230+
assertEquals("TSTN", getStringEncoder().metaphone("testing"));
231+
assertEquals("0", getStringEncoder().metaphone("The"));
232+
assertEquals("KK", getStringEncoder().metaphone("quick"));
233+
assertEquals("BRN", getStringEncoder().metaphone("brown"));
234+
assertEquals("FKS", getStringEncoder().metaphone("fox"));
235+
assertEquals("JMPT", getStringEncoder().metaphone("jumped"));
236+
assertEquals("OFR", getStringEncoder().metaphone("over"));
237+
assertEquals("0", getStringEncoder().metaphone("the"));
238+
assertEquals("LS", getStringEncoder().metaphone("lazy"));
239+
assertEquals("TKS", getStringEncoder().metaphone("dogs"));
240240
}
241241

242242
@Test
243243
public void testPHTOF() {
244-
assertEquals("FX", this.getStringEncoder().metaphone("PHISH"));
244+
assertEquals("FX", getStringEncoder().metaphone("PHISH"));
245245
}
246246

247247
@Test
248248
public void testSetMaxLengthWithTruncation() {
249249
// should be AKSKS, but istruncated by Max Code Length
250-
this.getStringEncoder().setMaxCodeLen(6);
251-
assertEquals("AKSKSK", this.getStringEncoder().metaphone("AXEAXEAXE"));
250+
getStringEncoder().setMaxCodeLen(6);
251+
assertEquals("AKSKSK", getStringEncoder().metaphone("AXEAXEAXE"));
252252
}
253253

254254
@Test
255255
public void testSHAndSIOAndSIAToX() {
256-
assertEquals("XT", this.getStringEncoder().metaphone("SHOT"));
257-
assertEquals("OTXN", this.getStringEncoder().metaphone("ODSIAN"));
258-
assertEquals("PLXN", this.getStringEncoder().metaphone("PULSION"));
256+
assertEquals("XT", getStringEncoder().metaphone("SHOT"));
257+
assertEquals("OTXN", getStringEncoder().metaphone("ODSIAN"));
258+
assertEquals("PLXN", getStringEncoder().metaphone("PULSION"));
259259
}
260260

261261
@Test
262262
public void testTCH() {
263-
assertEquals("RX", this.getStringEncoder().metaphone("RETCH"));
264-
assertEquals("WX", this.getStringEncoder().metaphone("WATCH"));
263+
assertEquals("RX", getStringEncoder().metaphone("RETCH"));
264+
assertEquals("WX", getStringEncoder().metaphone("WATCH"));
265265
}
266266

267267
@Test
268268
public void testTIOAndTIAToX() {
269-
assertEquals("OX", this.getStringEncoder().metaphone("OTIA"));
270-
assertEquals("PRXN", this.getStringEncoder().metaphone("PORTION"));
269+
assertEquals("OX", getStringEncoder().metaphone("OTIA"));
270+
assertEquals("PRXN", getStringEncoder().metaphone("PORTION"));
271271
}
272272

273273
@Test
274274
public void testTranslateOfSCHAndCH() {
275-
assertEquals("SKTL", this.getStringEncoder().metaphone("SCHEDULE"));
276-
assertEquals("SKMT", this.getStringEncoder().metaphone("SCHEMATIC"));
275+
assertEquals("SKTL", getStringEncoder().metaphone("SCHEDULE"));
276+
assertEquals("SKMT", getStringEncoder().metaphone("SCHEMATIC"));
277277

278-
assertEquals("KRKT", this.getStringEncoder().metaphone("CHARACTER"));
279-
assertEquals("TX", this.getStringEncoder().metaphone("TEACH"));
278+
assertEquals("KRKT", getStringEncoder().metaphone("CHARACTER"));
279+
assertEquals("TX", getStringEncoder().metaphone("TEACH"));
280280
}
281281

282282
@Test
283283
public void testTranslateToJOfDGEOrDGIOrDGY() {
284-
assertEquals("TJ", this.getStringEncoder().metaphone("DODGY"));
285-
assertEquals("TJ", this.getStringEncoder().metaphone("DODGE"));
286-
assertEquals("AJMT", this.getStringEncoder().metaphone("ADGIEMTI"));
284+
assertEquals("TJ", getStringEncoder().metaphone("DODGY"));
285+
assertEquals("TJ", getStringEncoder().metaphone("DODGE"));
286+
assertEquals("AJMT", getStringEncoder().metaphone("ADGIEMTI"));
287287
}
288288

289289
/**
@@ -292,19 +292,19 @@ public void testTranslateToJOfDGEOrDGIOrDGY() {
292292
@Test
293293
public void testWhy() {
294294
// PHP returns "H". The original metaphone returns an empty string.
295-
assertEquals("", this.getStringEncoder().metaphone("WHY"));
295+
assertEquals("", getStringEncoder().metaphone("WHY"));
296296
}
297297

298298
@Test
299299
public void testWordEndingInMB() {
300-
assertEquals("KM", this.getStringEncoder().metaphone("COMB"));
301-
assertEquals("TM", this.getStringEncoder().metaphone("TOMB"));
302-
assertEquals("WM", this.getStringEncoder().metaphone("WOMB"));
300+
assertEquals("KM", getStringEncoder().metaphone("COMB"));
301+
assertEquals("TM", getStringEncoder().metaphone("TOMB"));
302+
assertEquals("WM", getStringEncoder().metaphone("WOMB"));
303303
}
304304

305305
@Test
306306
public void testWordsWithCIA() {
307-
assertEquals("XP", this.getStringEncoder().metaphone("CIAPO"));
307+
assertEquals("XP", getStringEncoder().metaphone("CIAPO"));
308308
}
309309

310310
public void validateFixture(final String[][] pairs) {

0 commit comments

Comments
 (0)