/hg/icedtea-web: Translator made immutable
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Fri Sep 19 14:13:58 UTC 2014
changeset 85ede1a5ab91 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=85ede1a5ab91
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Sep 19 14:06:23 2014 +0200
Translator made immutable
diffstat:
ChangeLog | 10 ++
netx/net/sourceforge/jnlp/runtime/Translator.java | 48 ++++++---
tests/netx/unit/net/sourceforge/jnlp/runtime/TranslatorTest.java | 36 ++++++-
3 files changed, 73 insertions(+), 21 deletions(-)
diffs (172 lines):
diff -r e1c7156ed0a1 -r 85ede1a5ab91 ChangeLog
--- a/ChangeLog Thu Sep 18 13:18:11 2014 -0400
+++ b/ChangeLog Fri Sep 19 14:06:23 2014 +0200
@@ -1,3 +1,13 @@
+2014-09-19 Jiri Vanek <jvanek at redhat.com>
+
+ Translator made immutable
+ * netx/net/sourceforge/jnlp/runtime/Translator.java: changed form enum to class,
+ initialization handled by holder pattern, resources made final, removed
+ loadResourceBundle, getMessage made protected.
+ * tests/netx/unit/net/sourceforge/jnlp/runtime/TranslatorTest.java: (setup)
+ (and all tests) now uses special instance based on fake resources. Added
+ two tests to test singleton instance itself.
+
2014-09-18 Lukasz Dracz <ldracz at redhat.com>
Added New Option Parser and used in boot of javaws
diff -r e1c7156ed0a1 -r 85ede1a5ab91 netx/net/sourceforge/jnlp/runtime/Translator.java
--- a/netx/net/sourceforge/jnlp/runtime/Translator.java Thu Sep 18 13:18:11 2014 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/Translator.java Fri Sep 19 14:06:23 2014 +0200
@@ -24,24 +24,43 @@
/**
* Utility class to provide simple methods to help localize messages
*/
-public enum Translator {
+public class Translator {
- INSTANCE;
+ private static class TranslatorHolder {
- /** the localized resource strings */
- private ResourceBundle resources;
+ //https://en.wikipedia.org/wiki/Double-checked_locking#Usage_in_Java
+ //https://en.wikipedia.org/wiki/Initialization_on_demand_holder_idiom
+ private static final Translator INSTANCE = new Translator();
- private Translator() {
- try {
- resources = ResourceBundle.getBundle("net.sourceforge.jnlp.resources.Messages");
- } catch (Exception ex) {
- throw new IllegalStateException("No bundles found for Locale: " + Locale.getDefault().toString() +
- "and missing base resource bundle in netx.jar:net/sourceforge/jnlp/resource/Messages.properties");
+ private static Translator getTransaltor() {
+ return TranslatorHolder.INSTANCE;
}
}
+ /**
+ * the localized resource strings
+ */
+ private final ResourceBundle resources;
+
+ Translator() {
+ this("net.sourceforge.jnlp.resources.Messages");
+ }
+
+ Translator(String s) {
+ try {
+ resources = ResourceBundle.getBundle(s);
+ } catch (Exception ex) {
+ throw new IllegalStateException("No bundles found for Locale: " + Locale.getDefault().toString()
+ + "and missing base resource bundle in netx.jar:net/sourceforge/jnlp/resource/Messages.properties");
+ }
+ }
+
+ Translator(ResourceBundle resources) {
+ this.resources = resources;
+ }
+
public static Translator getInstance() {
- return Translator.INSTANCE;
+ return TranslatorHolder.getTransaltor();
}
/**
@@ -60,16 +79,13 @@
return getInstance().getMessage(message, params);
}
- protected void loadResourceBundle(ResourceBundle bundle) {
- this.resources = bundle;
- }
-
+
/**
* Returns the localized resource string using the specified arguments.
*
* @param args the formatting arguments to the resource string
*/
- private String getMessage(String key, Object... args) {
+ protected String getMessage(String key, Object... args) {
return MessageFormat.format(getMessage(key), args);
}
diff -r e1c7156ed0a1 -r 85ede1a5ab91 tests/netx/unit/net/sourceforge/jnlp/runtime/TranslatorTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/runtime/TranslatorTest.java Thu Sep 18 13:18:11 2014 -0400
+++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/TranslatorTest.java Fri Sep 19 14:06:23 2014 +0200
@@ -9,12 +9,27 @@
import java.net.URLClassLoader;
import java.util.Locale;
import java.util.ResourceBundle;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
public class TranslatorTest {
+ private static class TestableTranslator extends Translator {
+
+ public TestableTranslator(ResourceBundle bundle) {
+ super(bundle);
+ }
+
+ public String translate(String message, Object... params) {
+ return super.getMessage(message, params);
+ }
+ }
+ TestableTranslator translator;
+
+
+
@Before
public void setup() throws IOException {
File f = new File(System.getProperty("java.io.tmpdir"), "test.properties");
@@ -31,30 +46,41 @@
ClassLoader loader = new URLClassLoader(new URL[] {u});
ResourceBundle bundle = ResourceBundle.getBundle("test", Locale.getDefault(), loader);
- Translator.getInstance().loadResourceBundle(bundle);
+ translator = new TestableTranslator(bundle);
}
@Test
public void testTranslateNonExistingMessage() {
- String message = Translator.R("doesn't-exist");
+ String message = translator.translate("doesn't-exist");
assertEquals("no-resource", message);
}
@Test
public void testTranslateNullMessage() {
- String message = Translator.R(null);
+ String message = translator.translate(null);
assertEquals("no-resource", message);
}
@Test
public void testTranslateMessage() {
- String message = Translator.R("key");
+ String message = translator.translate("key");
assertEquals("value", message);
}
@Test
public void testTranslateMessageWithArgs() {
- String message = Translator.R("argkey", new Object[] {"Hello"});
+ String message = translator.translate("argkey", new Object[] {"Hello"});
assertEquals("value Hello", message);
}
+
+ @Test
+ public void singletonTest1() {
+ String message = Translator.R("key");
+ Assert.assertNotEquals("value", message);
+ }
+ @Test
+ public void singletonTest2() {
+ String message = Translator.R("unknown-key");
+ Assert.assertTrue(message.contains("unknown-key"));
+ }
}
More information about the distro-pkg-dev
mailing list