From 56b92cda4ea148abd33793a39ffc36606ac3781b Mon Sep 17 00:00:00 2001 From: overmeulen Date: Mon, 19 Feb 2018 17:47:52 +0100 Subject: [PATCH 1/2] QPID-8105: [Broker-J] broker-core unit tests are failing because of wrong locale --- .../qpid/server/logging/messages/BrokerMessages.java | 2 +- .../server/logging/messages/BrokerMessagesTest.java | 4 ++-- .../server/stats/FormattingStatisticsResolverTest.java | 10 ++++++---- .../VirtualHostStoreUpgraderAndRecovererTest.java | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java index 79319befca..dbf7e16405 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java +++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java @@ -41,7 +41,7 @@ public class BrokerMessages { private static ResourceBundle _messages; - private static Locale _currentLocale; + static Locale _currentLocale; static { diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java index aa18ddd535..9d43f38f7c 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java +++ b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java @@ -130,8 +130,8 @@ public void testBrokerMemory() List log = performLog(); String[] expected = {"Maximum Memory :", - "Heap", NumberFormat.getNumberInstance().format(oneGiga), "bytes", - "Direct", NumberFormat.getNumberInstance().format(twoGiga), "bytes" + "Heap", NumberFormat.getNumberInstance(BrokerMessages._currentLocale).format(oneGiga), "bytes", + "Direct", NumberFormat.getNumberInstance(BrokerMessages._currentLocale).format(twoGiga), "bytes" }; validateLogMessage(log, "BRK-1011", expected); diff --git a/broker-core/src/test/java/org/apache/qpid/server/stats/FormattingStatisticsResolverTest.java b/broker-core/src/test/java/org/apache/qpid/server/stats/FormattingStatisticsResolverTest.java index 88642613d7..1dad621fe0 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/stats/FormattingStatisticsResolverTest.java +++ b/broker-core/src/test/java/org/apache/qpid/server/stats/FormattingStatisticsResolverTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.text.DecimalFormatSymbols; import java.util.Date; import java.util.Map; @@ -42,6 +43,7 @@ public class FormattingStatisticsResolverTest extends QpidTestCase private static final String SMALLER_NEGATIVE_VALUE_STAT_NAME = "smallerNegativeValue"; private static final String SMALLEST_NEGATIVE_VALUE_STAT_NAME = "smallestNegativeValue"; private static final String EPOCH_DATE_STAT_NAME = "epochDateStatName"; + private static final char DECIMAL_SEPARATOR = DecimalFormatSymbols.getInstance().getDecimalSeparator(); private FormattingStatisticsResolver _resolver; @@ -88,13 +90,13 @@ public void testDateTime() throws Exception public void testIEC80000BinaryPrefixed() throws Exception { - assertEquals("1.0 MiB", _resolver.resolve(LARGEST_POSITIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null)); - assertEquals("1.0 KiB", _resolver.resolve(LARGER_POSITIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null)); + assertEquals(String.format("1%c0 MiB", DECIMAL_SEPARATOR), _resolver.resolve(LARGEST_POSITIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null)); + assertEquals(String.format("1%c0 KiB", DECIMAL_SEPARATOR), _resolver.resolve(LARGER_POSITIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null)); assertEquals("10 B", _resolver.resolve(POSITIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null)); assertEquals("0 B", _resolver.resolve(ZERO_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null)); assertEquals("-1 B", _resolver.resolve(NEGATIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null)); - assertEquals("-1.0 KiB", _resolver.resolve(SMALLER_NEGATIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null)); - assertEquals("-1.0 MiB", _resolver.resolve(SMALLEST_NEGATIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null)); + assertEquals(String.format("-1%c0 KiB", DECIMAL_SEPARATOR), _resolver.resolve(SMALLER_NEGATIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null)); + assertEquals(String.format("-1%c0 MiB", DECIMAL_SEPARATOR), _resolver.resolve(SMALLEST_NEGATIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null)); } } \ No newline at end of file diff --git a/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java b/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java index 40c11ee5d0..d6ac38db7d 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java +++ b/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.text.DecimalFormatSymbols; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -31,7 +32,6 @@ import java.util.UUID; import org.apache.qpid.server.model.Broker; -import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.OverflowPolicy; import org.apache.qpid.server.model.VirtualHostNode; import org.apache.qpid.test.utils.QpidTestCase; @@ -80,7 +80,7 @@ public void testUpgradeFlowControlFrom_6_1() throws Exception assertEquals("Unexpected maximumQueueDepthBytes", 1000, upgradedAttributes.get("maximumQueueDepthBytes")); assertEquals("Unexpected queue.queueFlowResumeLimit", - "70.00", + String.format("70%c00", DecimalFormatSymbols.getInstance().getDecimalSeparator()), ((Map) upgradedAttributes.get("context")).get("queue.queueFlowResumeLimit")); assertEquals("Unexpected overflowPolicy", From b4b1bceedaf76fdd68770263e841ebf8d928cad5 Mon Sep 17 00:00:00 2001 From: overmeulen Date: Wed, 21 Feb 2018 10:46:57 +0100 Subject: [PATCH 2/2] QPID-8105: [Broker-J] broker-core unit tests are failing because of wrong locale --- .../apache/qpid/server/logging/messages/BrokerMessages.java | 6 +++++- .../qpid/server/logging/messages/BrokerMessagesTest.java | 4 ++-- .../org/apache/qpid/server/logging/messages/LogMessages.vm | 5 +++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java index dbf7e16405..6a2831be2e 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java +++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java @@ -41,7 +41,7 @@ public class BrokerMessages { private static ResourceBundle _messages; - static Locale _currentLocale; + private static Locale _currentLocale; static { @@ -991,6 +991,10 @@ public int hashCode() }; } + static Locale getCurrentLocale() + { + return _currentLocale; + } private BrokerMessages() { diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java index 9d43f38f7c..e63d0897ac 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java +++ b/broker-core/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java @@ -130,8 +130,8 @@ public void testBrokerMemory() List log = performLog(); String[] expected = {"Maximum Memory :", - "Heap", NumberFormat.getNumberInstance(BrokerMessages._currentLocale).format(oneGiga), "bytes", - "Direct", NumberFormat.getNumberInstance(BrokerMessages._currentLocale).format(twoGiga), "bytes" + "Heap", NumberFormat.getNumberInstance(BrokerMessages.getCurrentLocale()).format(oneGiga), "bytes", + "Direct", NumberFormat.getNumberInstance(BrokerMessages.getCurrentLocale()).format(twoGiga), "bytes" }; validateLogMessage(log, "BRK-1011", expected); diff --git a/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm b/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm index ecc06f8cae..7e0ee39078 100644 --- a/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm +++ b/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm @@ -226,6 +226,11 @@ public class ${type.name}Messages #end + static Locale getCurrentLocale() + { + return _currentLocale; + } + private ${type.name}Messages() { }