X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2Fengine%2FLanguageTest.java;h=be787ebf53fa1be7f7a55b0fa9bc2c1a662c391b;hb=2fc669d88306d563fc9c899d8d91b25d591692ea;hp=24fe094ffe99563e7478ed36167ac1ac9b331a94;hpb=e479ba38bbcb261951399326623c20ffacc147d4;p=DictionaryPC.git diff --git a/src/com/hughes/android/dictionary/engine/LanguageTest.java b/src/com/hughes/android/dictionary/engine/LanguageTest.java index 24fe094..be787eb 100644 --- a/src/com/hughes/android/dictionary/engine/LanguageTest.java +++ b/src/com/hughes/android/dictionary/engine/LanguageTest.java @@ -21,12 +21,12 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import junit.framework.TestCase; - import com.hughes.android.dictionary.parser.DictFileParser; import com.hughes.android.dictionary.parser.wiktionary.WiktionaryLangs; import com.ibm.icu.text.Transliterator; +import junit.framework.TestCase; + public class LanguageTest extends TestCase { public void testGermanSort() { @@ -73,10 +73,10 @@ public class LanguageTest extends TestCase { assertEquals("hulle", normalizer.transform("Hulle")); - final List sorted = new ArrayList(words); + final List sorted = new ArrayList<>(words); // Collections.shuffle(shuffled, new Random(0)); - Collections.sort(sorted, comparator); - System.out.println(sorted.toString()); + sorted.sort(comparator); + System.out.println(sorted); for (int i = 0; i < words.size(); ++i) { System.out.println(words.get(i) + "\t" + sorted.get(i)); assertEquals(words.get(i), sorted.get(i)); @@ -92,9 +92,9 @@ public class LanguageTest extends TestCase { "preppy", "preprocess"); - final List sorted = new ArrayList(words); + final List sorted = new ArrayList<>(words); final NormalizeComparator comparator = new NormalizeComparator(normalizer, Language.en.getCollator(), 7); - Collections.sort(sorted, comparator); + sorted.sort(comparator); for (int i = 0; i < words.size(); ++i) { if (i > 0) { assertTrue(comparator.compare(words.get(i-1), words.get(i)) < 0); @@ -183,8 +183,8 @@ public class LanguageTest extends TestCase { public void testEnWiktionaryNames() { - final Set enLangs = new LinkedHashSet(WiktionaryLangs.isoCodeToEnWikiName.keySet()); - final List names = new ArrayList(); + final Set enLangs = new LinkedHashSet<>(WiktionaryLangs.isoCodeToEnWikiName.keySet()); + final List names = new ArrayList<>(); for (final String code : WiktionaryLangs.isoCodeToEnWikiName.keySet()) { names.add(WiktionaryLangs.isoCodeToEnWikiName.get(code)); enLangs.add(code.toLowerCase());