Apache/openjpa
1
0
Fork 0
mirror of https://github.com/apache/openjpa.git synced 2025-02-23 02:48:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed assumption by test case that the default locale would not be GERMANY, which was special-cased in the test.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@436941 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Marc Prud'hommeaux 2006-08-25 20:53:28 +00:00
parent caffb77405
commit 8adfc84d9c
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestLocalizer.java
View File

@ -1,10 +1,10 @@
/* /*
* Copyright 2006 The Apache Software Foundation. * Copyright 2006 The Apache Software Foundation.
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
@ -37,14 +37,16 @@ public class TestLocalizer extends TestCase {
} }
public void setUp() { public void setUp() {
_locals = Localizer.forPackage(LocalizerTestHelper.class); _locals = Localizer.forPackage(LocalizerTestHelper.class,
Locale.GERMANY);
} }
/** /**
* Test getting a string for a class. * Test getting a string for a class.
*/ */
public void testForClass() { public void testForClass() {
assertEquals("value1", _locals.get("test.local1")); assertEquals(Locale.getDefault() == Locale.GERMANY
? "value1_de" : "value1", _locals.get("test.local1"));
} }
/** /**
@ -62,7 +64,8 @@ public class TestLocalizer extends TestCase {
public void testFallbackLocale() { public void testFallbackLocale() {
Localizer locl = Localizer.forPackage(LocalizerTestHelper.class, Localizer locl = Localizer.forPackage(LocalizerTestHelper.class,
Locale.FRANCE); Locale.FRANCE);
assertEquals("value1", locl.get("test.local1")); assertEquals(Locale.getDefault() == Locale.GERMANY
? "value1_de" : "value1", locl.get("test.local1"));
} }
/** /**
@ -78,11 +81,14 @@ public class TestLocalizer extends TestCase {
* Test that the message formatting works correctly. * Test that the message formatting works correctly.
*/ */
public void testMessageFormat() { public void testMessageFormat() {
assertEquals("value2 x sep y", _locals.get("test.local2", String suffix = Locale.getDefault() == Locale.GERMANY ? "_de" : "";
assertEquals("value2" + suffix + " x sep y", _locals.get("test.local2",
new String[]{ "x", "y" })); new String[]{ "x", "y" }));
// test that it treates single objects as single-element arrays // test that it treates single objects as single-element arrays
assertEquals("value2 x sep {1}", _locals.get("test.local2", "x")); assertEquals("value2" + suffix + " x sep {1}",
_locals.get("test.local2", "x"));
} }
/** /**