From 67f40367cdd5b49b59a2b79acbada34790dd2be6 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 18 Apr 2017 21:35:54 +0200
Subject: [PATCH] use Languages class as source of locales to test

---
 .../java/org/fdroid/fdroid/LocalizationTest.java         | 9 +++++----
 app/src/main/java/org/fdroid/fdroid/Languages.java       | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/androidTest/java/org/fdroid/fdroid/LocalizationTest.java b/app/src/androidTest/java/org/fdroid/fdroid/LocalizationTest.java
index 5a38b2788..d9e763b8e 100644
--- a/app/src/androidTest/java/org/fdroid/fdroid/LocalizationTest.java
+++ b/app/src/androidTest/java/org/fdroid/fdroid/LocalizationTest.java
@@ -14,9 +14,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -35,7 +34,7 @@ public class LocalizationTest {
 
     private final Pattern androidFormat = Pattern.compile("(%[a-z0-9]\\$?[a-z]?)");
     private final Locale[] locales = Locale.getAvailableLocales();
-    private final ArrayList<String> localeNames = new ArrayList<>(locales.length);
+    private final HashSet<String> localeNames = new HashSet<>(locales.length);
 
     private AssetManager assets;
     private Configuration config;
@@ -43,10 +42,12 @@ public class LocalizationTest {
 
     @Before
     public void setUp() {
+        for (Locale locale : Languages.LOCALES_TO_TEST) {
+            localeNames.add(locale.toString());
+        }
         for (Locale locale : locales) {
             localeNames.add(locale.toString());
         }
-        Collections.sort(localeNames);
 
         Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
         Context context = instrumentation.getTargetContext();
diff --git a/app/src/main/java/org/fdroid/fdroid/Languages.java b/app/src/main/java/org/fdroid/fdroid/Languages.java
index ed5c572e6..ee9bb542b 100644
--- a/app/src/main/java/org/fdroid/fdroid/Languages.java
+++ b/app/src/main/java/org/fdroid/fdroid/Languages.java
@@ -203,7 +203,7 @@ public final class Languages {
         return Character.toUpperCase(line.charAt(0)) + line.substring(1);
     }
 
-    private static final Locale[] LOCALES_TO_TEST = {
+    public static final Locale[] LOCALES_TO_TEST = {
             Locale.ENGLISH,
             Locale.FRENCH,
             Locale.GERMAN,