From d40a44c8c8df8f6bd81c93e72314224f85656f18 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 07 Mar 2015 09:27:05 -0500
Subject: [PATCH] Merge branch 'ticket/245' into develop
---
src/test/java/com/gitblit/tests/ByteFormatTest.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/ByteFormatTest.java b/src/test/java/com/gitblit/tests/ByteFormatTest.java
index d59055e..a6a9870 100644
--- a/src/test/java/com/gitblit/tests/ByteFormatTest.java
+++ b/src/test/java/com/gitblit/tests/ByteFormatTest.java
@@ -15,22 +15,30 @@
*/
package com.gitblit.tests;
-import static org.junit.Assert.assertEquals;
+import java.util.Locale;
import org.junit.Test;
import com.gitblit.utils.ByteFormat;
-public class ByteFormatTest {
+public class ByteFormatTest extends GitblitUnitTest {
@Test
public void testByteFormat() throws Exception {
- ByteFormat format = new ByteFormat();
- assertEquals("10 b", format.format(10));
- assertEquals("10 KB", format.format(1024 * 10));
- assertEquals("1,000 KB", format.format(1024 * 1000));
- assertEquals("2.0 MB", format.format(2 * 1024 * 1000));
- assertEquals("1,000.0 MB", format.format(1024 * 1024 * 1000));
- assertEquals("2.0 GB", format.format(2 * 1024 * 1024 * 1000));
+ // sets locale for this test
+ Locale defaultLocale = Locale.getDefault();
+
+ try {
+ Locale.setDefault(Locale.ENGLISH);
+ ByteFormat format = new ByteFormat();
+ assertEquals("10 b", format.format(10));
+ assertEquals("10 KB", format.format(1024 * 10));
+ assertEquals("1,000 KB", format.format(1024 * 1000));
+ assertEquals("2.0 MB", format.format(2 * 1024 * 1000));
+ assertEquals("1,000.0 MB", format.format(1024 * 1024 * 1000));
+ assertEquals("2.0 GB", format.format(2 * 1024 * 1024 * 1000));
+ } finally {
+ Locale.setDefault(defaultLocale);
+ }
}
}
--
Gitblit v1.9.1