Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing LANG-320. I modified the tests to only check that the listed languages and countries are contained in the result, not that they exactly equal the result 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/lang/trunk@508733 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Henri Yandell 2007-02-17 08:41:20 +00:00
parent 6c0c39eb4d
commit 1b19377446
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/org/apache/commons/lang/LocaleUtilsTest.java
View File

@ -391,7 +391,10 @@ public class LocaleUtilsTest extends TestCase {
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
/** /**
* Make sure the language by country is correct. * Make sure the language by country is correct. It checks that
* the LocaleUtils.languagesByCountry(country) call contains the
* array of languages passed in. It may contain more due to JVM
* variations.
* *
* @param country * @param country
* @param languages array of languages that should be returned * @param languages array of languages that should be returned
@ -401,7 +404,6 @@ public class LocaleUtilsTest extends TestCase {
List list2 = LocaleUtils.languagesByCountry(country); List list2 = LocaleUtils.languagesByCountry(country);
assertNotNull(list); assertNotNull(list);
assertSame(list, list2); assertSame(list, list2);
assertEquals(languages.length, list.size());
//search through langauges //search through langauges
for (int i = 0; i < languages.length; i++) { for (int i = 0; i < languages.length; i++) {
Iterator iterator = list.iterator(); Iterator iterator = list.iterator();
@ -438,7 +440,11 @@ public class LocaleUtilsTest extends TestCase {
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
/** /**
* Make sure the country by language is correct. * Make sure the country by language is correct. It checks that
* the LocaleUtils.countryByLanguage(language) call contains the
* array of countries passed in. It may contain more due to JVM
* variations.
*
* *
* @param language * @param language
* @param countries array of countries that should be returned * @param countries array of countries that should be returned
@ -448,7 +454,6 @@ public class LocaleUtilsTest extends TestCase {
List list2 = LocaleUtils.countriesByLanguage(language); List list2 = LocaleUtils.countriesByLanguage(language);
assertNotNull(list); assertNotNull(list);
assertSame(list, list2); assertSame(list, list2);
assertEquals(countries.length, list.size());
//search through langauges //search through langauges
for (int i = 0; i < countries.length; i++) { for (int i = 0; i < countries.length; i++) {
Iterator iterator = list.iterator(); Iterator iterator = list.iterator();