QPID-8105 : Fix assumptions on Locale separators
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 14164e4..ccb12e7 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
@@ -22,6 +22,7 @@
import java.text.NumberFormat;
import java.util.List;
+import java.util.Locale;
import org.junit.Test;
@@ -139,9 +140,12 @@
_logMessage = BrokerMessages.MAX_MEMORY(oneGiga, twoGiga);
List<Object> log = performLog();
+ // Log messages always use US Locale format for numbers
+ NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);
+
String[] expected = {"Maximum Memory :",
- "Heap", NumberFormat.getNumberInstance().format(oneGiga), "bytes",
- "Direct", NumberFormat.getNumberInstance().format(twoGiga), "bytes"
+ "Heap", numberFormat.format(oneGiga), "bytes",
+ "Direct", numberFormat.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 afb55ee..3c7cf96 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
@@ -25,6 +25,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.text.NumberFormat;
import java.util.Date;
import java.util.Map;
@@ -102,9 +103,13 @@
@Test
public void testIEC80000BinaryPrefixed() throws Exception
{
- assertEquals("1.0 MiB",
+ NumberFormat formatter = NumberFormat.getInstance();
+ formatter.setMinimumFractionDigits(1);
+ String ONE_POINT_ZERO = formatter.format(1L);
+
+ assertEquals(ONE_POINT_ZERO + " MiB",
_resolver.resolve(LARGEST_POSITIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
- assertEquals("1.0 KiB",
+ assertEquals(ONE_POINT_ZERO + " KiB",
_resolver.resolve(LARGER_POSITIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
assertEquals("10 B",
_resolver.resolve(POSITIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
@@ -112,10 +117,10 @@
_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",
+ assertEquals("-"+ ONE_POINT_ZERO + " KiB",
_resolver.resolve(SMALLER_NEGATIVE_VALUE_STAT_NAME + ":" + FormattingStatisticsResolver.BYTEUNIT, null));
- assertEquals("-1.0 MiB",
+ assertEquals("-" + ONE_POINT_ZERO + " MiB",
_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 c40ec53..0f2cf93 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
@@ -27,6 +27,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.text.NumberFormat;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
@@ -86,8 +87,11 @@
assertEquals("Unexpected maximumQueueDepthBytes", 1000, upgradedAttributes.get("maximumQueueDepthBytes"));
+ NumberFormat formatter = NumberFormat.getInstance();
+ formatter.setMinimumFractionDigits(2);
+
assertEquals("Unexpected queue.queueFlowResumeLimit",
- "70.00",
+ formatter.format(70L),
((Map<String, String>) upgradedAttributes.get("context")).get("queue.queueFlowResumeLimit"));
assertEquals("Unexpected overflowPolicy",
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/controller/v6_1/category/QueueControllerTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/controller/v6_1/category/QueueControllerTest.java
index 0684636..c02c248 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/controller/v6_1/category/QueueControllerTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/controller/v6_1/category/QueueControllerTest.java
@@ -28,6 +28,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.text.NumberFormat;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -156,6 +157,8 @@
assertThat(contextObject, is(instanceOf(Map.class)));
final Map<?,?> context =(Map<?,?>)contextObject;
- assertThat(context.get("queue.queueFlowResumeLimit"), is(equalTo("70.00")));
+ NumberFormat formatter = NumberFormat.getInstance();
+ formatter.setMinimumFractionDigits(2);
+ assertThat(context.get("queue.queueFlowResumeLimit"), is(equalTo(formatter.format(70L))));
}
-}
\ No newline at end of file
+}
