diff -r c3b09cef9f87 -r 2351db93aa5b RegressionTests__SoundexStringComparatorTest.st --- a/RegressionTests__SoundexStringComparatorTest.st Wed Jun 29 13:00:17 2016 +0000 +++ b/RegressionTests__SoundexStringComparatorTest.st Wed Jun 29 15:55:29 2016 +0200 @@ -1,4 +1,4 @@ -"{ Package: 'exept:regression' }" +"{ Package: 'stx:goodies/regression' }" "{ NameSpace: RegressionTests }" @@ -21,17 +21,17 @@ testSomeCombinations |code s| - "/ compares all 4-char combinations against + "/ compares all 4-char combinations against $A to:$Z do:[:c1 | - $A to:$Z do:[:c2 | - $A to:$Z do:[:c3 | - $A to:$Z do:[:c4 | - s := String with:c1 with:c2 with:c3 with:c4. - code := (sc phoneticStringsFor:s) first. - self assert:( code = s asSoundexCode). - ]. - ]. - ]. + $A to:$Z do:[:c2 | + $A to:$Z do:[:c3 | + $A to:$Z do:[:c4 | + s := String with:c1 with:c2 with:c3 with:c4. + code := (sc phoneticStringsFor:s) first. + self assert:( code = s asSoundexCode). + ]. + ]. + ]. ]. ! @@ -47,20 +47,20 @@ #( 'Acton' 'Ashdown' 'Ashton' 'Astin' 'Aston' 'Austen' 'Austin' 'Austine' 'Axten') do:[:w | - code := soundex value:(w). - self assert:( code = 'A235'). + code := soundex value:(w). + self assert:( code = 'A235'). ]. #( 'Reader' 'Reeder' 'Rider' 'Ritter' 'Rothera' 'Rothra' 'Ruder' 'Rutter' 'Ryder') do:[:w | - code := soundex value:(w). - self assert:( code = 'R360'). + code := soundex value:(w). + self assert:( code = 'R360'). ]. #( 'Wace' 'Waugh' 'Wookey') do:[:w | - code := soundex value:(w). - self assert:( code = 'W200'). + code := soundex value:(w). + self assert:( code = 'W200'). ]. code := soundex value:('Abbot'). @@ -124,19 +124,19 @@ "/ self assert: ( soundex value:( 'Ashcroft' )) = 'A22613' . self assert: ( soundex value:( 'Ashcroft' )) = 'A226' . - self assert: ( soundex value:( 'Tymczak' )) = 'T522' . - self assert: ( soundex value:( 'Jackson' )) = 'J250' . - self assert: ( soundex value:( 'Pfister' )) = 'P236' . - self assert: ( soundex value:( 'Gutierrez' )) = 'G362' . - self assert: ( soundex value:( 'Lee' )) = 'L000' . - "/ self assert: ( soundex value:( 'Washington' )) = 'W25235' . - self assert: ( soundex value:( 'Washington' )) = 'W252' . + self assert: ( soundex value:( 'Tymczak' )) = 'T522' . + self assert: ( soundex value:( 'Jackson' )) = 'J250' . + self assert: ( soundex value:( 'Pfister' )) = 'P236' . + self assert: ( soundex value:( 'Gutierrez' )) = 'G362' . + self assert: ( soundex value:( 'Lee' )) = 'L000' . + "/ self assert: ( soundex value:( 'Washington' )) = 'W25235' . + self assert: ( soundex value:( 'Washington' )) = 'W252' . - self assert: ( soundex value:( 'Williams' )) = 'W452' . - "/ self assert: ( soundex value:( 'Baragwanath' )) = 'B6253' . - self assert: ( soundex value:( 'Baragwanath' )) = 'B625' . - self assert: ( soundex value:( 'Donnell' )) = 'D540' . - self assert: ( soundex value:( 'Lloyd' )) = 'L300' . + self assert: ( soundex value:( 'Williams' )) = 'W452' . + "/ self assert: ( soundex value:( 'Baragwanath' )) = 'B6253' . + self assert: ( soundex value:( 'Baragwanath' )) = 'B625' . + self assert: ( soundex value:( 'Donnell' )) = 'D540' . + self assert: ( soundex value:( 'Lloyd' )) = 'L300' . self assert: ( soundex value:( 'Woolcock' )) = 'W422' . self assert: ( soundex value:( 'Cook' )) = 'C200' .