Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ReloadableResourceBundleMessageSource correctly calculates filenames for locales with variant but without country now (SPR-5716)

Browse Source
This commit is contained in:
Juergen Hoeller
2009-05-07 09:24:34 +00:00
parent 7d4da0085c
commit 4ccb352aac
2 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
org.springframework.context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2008 the original author or authors.
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
package org.springframework.context.support;
import java.util.List;
import java.util.Locale;
import java.util.Properties;
@@ -267,4 +268,36 @@ public class ResourceBundleMessageSourceTests extends TestCase {
assertEquals("message2", ms.getMessage("code2", null, Locale.GERMAN));
}
public void testReloadableResourceBundleMessageSourceFileNameCalculation() {
ReloadableResourceBundleMessageSource ms = new ReloadableResourceBundleMessageSource();
List<String> filenames = ms.calculateFilenamesForLocale("messages", Locale.ENGLISH);
assertEquals(1, filenames.size());
assertEquals("messages_en", filenames.get(0));
filenames = ms.calculateFilenamesForLocale("messages", Locale.UK);
assertEquals(2, filenames.size());
assertEquals("messages_en", filenames.get(1));
assertEquals("messages_en_GB", filenames.get(0));
filenames = ms.calculateFilenamesForLocale("messages", new Locale("en", "GB", "POSIX"));
assertEquals(3, filenames.size());
assertEquals("messages_en", filenames.get(2));
assertEquals("messages_en_GB", filenames.get(1));
assertEquals("messages_en_GB_POSIX", filenames.get(0));
filenames = ms.calculateFilenamesForLocale("messages", new Locale("en", "", "POSIX"));
assertEquals(2, filenames.size());
assertEquals("messages_en", filenames.get(1));
assertEquals("messages_en__POSIX", filenames.get(0));
filenames = ms.calculateFilenamesForLocale("messages", new Locale("", "UK", "POSIX"));
assertEquals(2, filenames.size());
assertEquals("messages__UK", filenames.get(1));
assertEquals("messages__UK_POSIX", filenames.get(0));
filenames = ms.calculateFilenamesForLocale("messages", new Locale("", "", "POSIX"));
assertEquals(0, filenames.size());
}
}