Support multiple locales string for accept language list

chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/PwsClientImplTest.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.physicalweb;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.text.TextUtils;
@@ skipping 62 matching lines @@
         // Ensure Accept-Language also contains the language code by itself. Include the separator
         // character so we don't match, for instance, the "en" in "en-US".
         assertTrue(acceptLanguage.startsWith(languageCode + ",")
                 || acceptLanguage.contains(languageCode + ";")
                 || acceptLanguage.equals(languageCode));
     }
 
     @SmallTest
     public void testLanguageTagIsPrepended() {
         String locale = new Locale("aa", "AA").toString();
-        String languageList = "xx-XX,xx,xx-YY";
+        String languageList = "xx-XX,xx-YY,xx";
 
         // Should prepend the language tag "aa-AA" as well as the language code "aa".
         String languageListWithTag = PwsClientImpl.prependToAcceptLanguagesIfNecessary(locale,
                 languageList);
-        assertEquals("aa-AA,aa,xx-XX,xx,xx-YY", languageListWithTag);
+        assertEquals("aa-AA,aa,xx-XX,xx-YY,xx", languageListWithTag);
     }
 
     @SmallTest
+    public void testMultipleLanguageTagIsPrepended() {
+        String locale = "aa_AA,bb_BB";
+        String languageList = "xx-XX,xx-YY,xx";
+
+        // Should prepend the language tag "aa-AA" as well as the language code "aa".
+        String languageListWithTag = PwsClientImpl.prependToAcceptLanguagesIfNecessary(locale,
+                languageList);
+        assertEquals("aa-AA,aa,bb-BB,bb,xx-XX,xx-YY,xx", languageListWithTag);
+
+        // Make sure the language code is only inserted after the last languageTag that
+        // contains that language.
+        locale = "aa_AA,bb_BB,bb_XX";
+        languageListWithTag = PwsClientImpl.prependToAcceptLanguagesIfNecessary(locale,
+             languageList);
+        assertEquals("aa-AA,aa,bb-BB,bb-XX,bb,xx-XX,xx-YY,xx", languageListWithTag);
+    }
+
+    @SmallTest
     public void testLanguageTagIsPrependedWhenListContainsLanguageCode() {
         String locale = new Locale("xx", "XX").toString();
         String languageList = "xx-YY,xx";
 
         // Should prepend the language tag "xx-XX" but not the language code "xx" as it's already
         // included at the end of the list.
         String languageListWithTag = PwsClientImpl.prependToAcceptLanguagesIfNecessary(locale,
                 languageList);
         assertEquals("xx-XX,xx-YY,xx", languageListWithTag);
 
         // Test again with the language code "xx" in the middle of the list.
-        languageList = "xx-YY,xx,xx-ZZ";
+        languageList = "xx-YY,xx-ZZ,xx";
         languageListWithTag = PwsClientImpl.prependToAcceptLanguagesIfNecessary(locale,
                 languageList);
-        assertEquals("xx-XX,xx-YY,xx,xx-ZZ", languageListWithTag);
+        assertEquals("xx-XX,xx-YY,xx-ZZ,xx", languageListWithTag);
     }
 
     @SmallTest
     public void testInvalidLanguageTagNotPrepended() {
         String locale = "not_valid";
         String languageList = "xx-XX,xx";
 
         // Language list should be unmodified since the language tag is invalid.
         String languageListWithTag = PwsClientImpl.prependToAcceptLanguagesIfNecessary(locale,
                 languageList);
         assertEquals(languageList, languageListWithTag);
     }
 
     @SmallTest
     public void testLanguageTagNotPrependedWhenUnnecessary() {
         String locale = new Locale("xx", "XX").toString();
-        String languageList = "xx-XX,xx,xx-YY";
+        String languageList = "xx-XX,xx-YY,xx";
 
         // Language list should be unmodified since the tag is already present.
         String languageListWithTag = PwsClientImpl.prependToAcceptLanguagesIfNecessary(locale,
+                languageList);
+        assertEquals(languageList, languageListWithTag);
+    }
+
+    @SmallTest
+    public void testMultiLanguageTagNotPrependedWhenUnnecessary() {
+        String locale = "xx-XX,yy-YY";
+        String languageList = "xx-XX,xx,yy-YY,yy";
+
+        // Language list should be unmodified since the tag is already present.
+        String languageListWithTag = PwsClientImpl.prependToAcceptLanguagesIfNecessary(locale,
                 languageList);
         assertEquals(languageList, languageListWithTag);
     }
 
     @SmallTest
     public void testAcceptLanguageQvalues() {
-        String languageList = "xx-XX,xx,xx-YY,zz-ZZ,zz";
+        String languageList = "xx-XX,xx-YY,xx,zz-ZZ,zz";
 
         // Should insert q-values for each item except the first which implicitly has q=1.0.
         String acceptLanguage = PwsClientImpl.generateAcceptLanguageHeader(languageList);
-        assertEquals("xx-XX,xx;q=0.8,xx-YY;q=0.6,zz-ZZ;q=0.4,zz;q=0.2", acceptLanguage);
+        assertEquals("xx-XX,xx-YY;q=0.8,xx;q=0.6,zz-ZZ;q=0.4,zz;q=0.2", acceptLanguage);
 
         // When there are six or more items, the q-value should not go below 0.2.
         languageList = "xx-XA,xx-XB,xx-XC,xx-XD,xx-XE,xx-XF";
         acceptLanguage = PwsClientImpl.generateAcceptLanguageHeader(languageList);
         assertEquals("xx-XA,xx-XB;q=0.8,xx-XC;q=0.6,xx-XD;q=0.4,xx-XE;q=0.2,xx-XF;q=0.2",
                 acceptLanguage);
     }
 }