From open-jpa-commits-return-342-apmail-incubator-open-jpa-commits-archive=incubator.apache.org@incubator.apache.org Fri Aug 25 20:53:53 2006 Return-Path: Delivered-To: apmail-incubator-open-jpa-commits-archive@locus.apache.org Received: (qmail 98323 invoked from network); 25 Aug 2006 20:53:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 Aug 2006 20:53:51 -0000 Received: (qmail 35410 invoked by uid 500); 25 Aug 2006 20:53:51 -0000 Delivered-To: apmail-incubator-open-jpa-commits-archive@incubator.apache.org Received: (qmail 35369 invoked by uid 500); 25 Aug 2006 20:53:51 -0000 Mailing-List: contact open-jpa-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: open-jpa-dev@incubator.apache.org Delivered-To: mailing list open-jpa-commits@incubator.apache.org Received: (qmail 35360 invoked by uid 99); 25 Aug 2006 20:53:51 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Aug 2006 13:53:51 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Aug 2006 13:53:49 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id BEF731A981A; Fri, 25 Aug 2006 13:53:29 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r436941 - /incubator/openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestLocalizer.java Date: Fri, 25 Aug 2006 20:53:29 -0000 To: open-jpa-commits@incubator.apache.org From: mprudhom@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060825205329.BEF731A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mprudhom Date: Fri Aug 25 13:53:28 2006 New Revision: 436941 URL: http://svn.apache.org/viewvc?rev=436941&view=rev Log: Fixed assumption by test case that the default locale would not be GERMANY, which was special-cased in the test. Modified: incubator/openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestLocalizer.java Modified: incubator/openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestLocalizer.java URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestLocalizer.java?rev=436941&r1=436940&r2=436941&view=diff ============================================================================== --- incubator/openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestLocalizer.java (original) +++ incubator/openjpa/trunk/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestLocalizer.java Fri Aug 25 13:53:28 2006 @@ -1,10 +1,10 @@ /* * 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 obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and @@ -37,14 +37,16 @@ } public void setUp() { - _locals = Localizer.forPackage(LocalizerTestHelper.class); + _locals = Localizer.forPackage(LocalizerTestHelper.class, + Locale.GERMANY); } /** * Test getting a string for a class. */ 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 void testFallbackLocale() { Localizer locl = Localizer.forPackage(LocalizerTestHelper.class, Locale.FRANCE); - assertEquals("value1", locl.get("test.local1")); + assertEquals(Locale.getDefault() == Locale.GERMANY + ? "value1_de" : "value1", locl.get("test.local1")); } /** @@ -78,11 +81,14 @@ * Test that the message formatting works correctly. */ 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" })); // 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")); } /**