diff --git a/utils/src/com/cloud/utils/StringUtils.java b/utils/src/com/cloud/utils/StringUtils.java index 02a616b93a9..76f7806befc 100644 --- a/utils/src/com/cloud/utils/StringUtils.java +++ b/utils/src/com/cloud/utils/StringUtils.java @@ -52,6 +52,10 @@ public class StringUtils { return Charset.isSupported(UTF8); } + public static Charset getDefaultCharset() { + return Charset.defaultCharset(); + } + public static String join(final Iterable iterable, final String delim) { final StringBuilder sb = new StringBuilder(); if (iterable != null) { diff --git a/utils/test/com/cloud/utils/StringUtilsTest.java b/utils/test/com/cloud/utils/StringUtilsTest.java index a9eeac752a4..3619ede84b2 100644 --- a/utils/test/com/cloud/utils/StringUtilsTest.java +++ b/utils/test/com/cloud/utils/StringUtilsTest.java @@ -42,7 +42,11 @@ public class StringUtilsTest { @Test public void testGetDefaultCharset() { - assertEquals(StringUtils.getPreferredCharset(), Charset.defaultCharset()); + // Is this test irrelevant? Is wrapping the Charset.defaultCharset() too much? + // This test was added in order to cover the new StringUtils.getDefaultCharset(). + // One cannot be sure that StringUtils.getPreferredCharset() will always be + // equals to Charset.defaultCharset() + assertEquals(StringUtils.getDefaultCharset(), Charset.defaultCharset()); } @Test