/hg/icedtea-web: Added new utility class for retrieving localize...
aazores at icedtea.classpath.org
aazores at icedtea.classpath.org
Fri Sep 13 06:28:26 PDT 2013
changeset 14082a0be646 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=14082a0be646
author: Andrew Azores <aazores at redhat.com>
date: Fri Sep 13 09:28:03 2013 -0400
Added new utility class for retrieving localized messages for reproducers.
diffstat:
ChangeLog | 9 +
tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java | 15 +-
tests/test-extensions-tests/net/sourceforge/jnlp/MessagePropertiesTest.java | 99 ++++++++++
tests/test-extensions/net/sourceforge/jnlp/tools/MessageProperties.java | 81 ++++++++
4 files changed, 191 insertions(+), 13 deletions(-)
diffs (250 lines):
diff -r 6124fd87eaba -r 14082a0be646 ChangeLog
--- a/ChangeLog Wed Sep 11 12:05:44 2013 +0200
+++ b/ChangeLog Fri Sep 13 09:28:03 2013 -0400
@@ -1,3 +1,12 @@
+2013-09-13 Andrew Azores <aazores at redhat.com>
+
+ * tests/test-extensions/net/sourceforge/jnlp/tools/MessageProperties.java:
+ new utility class to handle retrieving localized messages for reproducers
+ * tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java:
+ refactored to use new MessageProperties class
+ * tests/test-extensions-tests/net/sourceforge/jnlp/MessagePropertiesTest.java:
+ tests for new MessageProperties class
+
2013-09-11 Jacob Wisor <gitne at gmx.de>
* netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java
diff -r 6124fd87eaba -r 14082a0be646 tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java
--- a/tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java Wed Sep 11 12:05:44 2013 +0200
+++ b/tests/reproducers/signed/CacheReproducer/testcases/CacheReproducerTest.java Fri Sep 13 09:28:03 2013 -0400
@@ -51,6 +51,7 @@
import net.sourceforge.jnlp.ProcessResult;
import net.sourceforge.jnlp.annotations.KnownToFail;
import net.sourceforge.jnlp.config.Defaults;
+import net.sourceforge.jnlp.tools.MessageProperties;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -77,17 +78,6 @@
"locks" + File.separator +
"netx_running");
- private static final String messageResourcePath = "net/sourceforge/jnlp/resources/Messages.properties";
- private static PropertyResourceBundle messageBundle = null;
-
- static {
- try {
- messageBundle =
- new PropertyResourceBundle(CacheReproducerTest.class.getClassLoader().getResourceAsStream(messageResourcePath));
- } catch (IOException e) {
- }
- }
-
String testS = "#netx file\n"
+ "#Mon Dec 12 16:20:46 CET 2011\n"
+ "1323703236508,0=/home/xp13/.icedtea/cache/0/http/localhost/ReadPropertiesBySignedHack.jnlp\n"
@@ -284,7 +274,7 @@
Thread.sleep(1000);
pr = tryToClearcache();
- String cacheClearError = messageBundle.getString("CCannotClearCache");
+ String cacheClearError = MessageProperties.getMessage("CCannotClearCache");
Assert.assertTrue("Stderr should contain " + cacheClearError + ", but did not.", pr.stderr.contains(cacheClearError));
assertCacheIsNotEmpty();
}
@@ -325,7 +315,6 @@
}
@Test
- @KnownToFail
public void testAlreadyLoadedCached11() throws Exception {
testsBody(CR11, 1);
testsBody(CR11, 2);
diff -r 6124fd87eaba -r 14082a0be646 tests/test-extensions-tests/net/sourceforge/jnlp/MessagePropertiesTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-extensions-tests/net/sourceforge/jnlp/MessagePropertiesTest.java Fri Sep 13 09:28:03 2013 -0400
@@ -0,0 +1,99 @@
+/* MessagePropertiesTest.java
+ Copyright (C) 2013 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package net.sourceforge.jnlp.tools;
+
+import java.util.Locale;
+import net.sourceforge.jnlp.tools.MessageProperties;
+import org.junit.Test;
+import org.junit.Assert;
+
+public class MessagePropertiesTest {
+
+ private static final Locale locale_en = MessageProperties.SupportedLanguage.en.getLocale(),
+ locale_cs = MessageProperties.SupportedLanguage.cs.getLocale(),
+ locale_de = MessageProperties.SupportedLanguage.de.getLocale(),
+ locale_pl = MessageProperties.SupportedLanguage.pl.getLocale();
+
+ private void testMessageStringEquals(Locale locale, String key, String expected) {
+ String message = MessageProperties.getMessage(locale, key);
+ Assert.assertEquals(message, expected);
+ }
+
+ @Test
+ public void testLocalization_en() throws Exception {
+ testMessageStringEquals(locale_en, "Continue", "Do you want to continue?");
+ }
+
+ @Test
+ public void testLocalization_cs() throws Exception {
+ testMessageStringEquals(locale_cs, "Continue", "Chcete pokra\u010dovat?");
+ }
+
+ @Test
+ public void testLocalization_de() throws Exception {
+ testMessageStringEquals(locale_de, "Continue", "Soll fortgefahren werden?");
+ }
+
+ @Test
+ public void testLocalization_pl() throws Exception {
+ testMessageStringEquals(locale_pl, "Continue", "Czy chcesz kontynuowa\u0107?");
+ }
+
+ @Test
+ public void testNonexistentLocalization() throws Exception {
+ String message_en = MessageProperties.getMessage(locale_en, "Continue");
+ String message_abcd = MessageProperties.getMessage(new Locale("abcd"), "Continue");
+ Assert.assertEquals(message_en, message_abcd); // There is no abcd localization, should fall back to English
+ }
+
+ @Test
+ public void testDefaultLocalization() throws Exception {
+ String sysPropLang = System.getProperty("user.language");
+ Locale sysPropLocale = new Locale(sysPropLang);
+
+ Locale defaultLocale = Locale.getDefault();
+
+ String sysPropMessage = MessageProperties.getMessage(sysPropLocale, "LThreadInterruptedInfo");
+ String defaultMessage = MessageProperties.getMessage(defaultLocale, "LThreadInterruptedInfo");
+ String implMessage = MessageProperties.getMessage("LThreadInterruptedInfo");
+
+ Assert.assertEquals(sysPropMessage, implMessage);
+ Assert.assertEquals(defaultMessage, implMessage);
+ }
+
+}
diff -r 6124fd87eaba -r 14082a0be646 tests/test-extensions/net/sourceforge/jnlp/tools/MessageProperties.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-extensions/net/sourceforge/jnlp/tools/MessageProperties.java Fri Sep 13 09:28:03 2013 -0400
@@ -0,0 +1,81 @@
+/* MessageProperties.java
+ Copyright (C) 2013 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package net.sourceforge.jnlp.tools;
+
+import java.util.Locale;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
+import java.io.IOException;
+
+public class MessageProperties {
+
+ public enum SupportedLanguage {
+ en("en"), cs("cs"), de("de"), pl("pl");
+ private Locale locale;
+
+ private SupportedLanguage(String lang) {
+ this.locale = new Locale(lang);
+ }
+
+ public Locale getLocale() {
+ return this.locale;
+ }
+ }
+
+ private static final String resourcePath = "net/sourceforge/jnlp/resources/Messages";
+
+ /**
+ * Same as {@link #getMessage(Locale, String)}, using the current default Locale
+ */
+ public static String getMessage(String key) {
+ return getMessage(Locale.getDefault(), key);
+ }
+
+ /**
+ * Retrieve a localized message from resource file
+ * @param locale the localization of Messages.properties to search
+ * @param key
+ * @return the message corresponding to the given key from the specified localization
+ * @throws IOException if the specified Messages localization is unavailable
+ */
+ public static String getMessage(Locale locale, String key) {
+ ResourceBundle bundle = PropertyResourceBundle.getBundle(resourcePath, locale);
+ return bundle.getString(key);
+ }
+
+}
More information about the distro-pkg-dev
mailing list