From ea01a539b3bc4139230b9025124060211a408edd Mon Sep 17 00:00:00 2001
From: Simon Harrer <simon.harrer@gmail.com>
Date: Wed, 23 Oct 2013 05:25:37 -0400
Subject: [PATCH] Change locale to english for ByteFormatTest to run successful on systems with german locale
---
src/test/java/com/gitblit/tests/ByteFormatTest.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/ByteFormatTest.java b/src/test/java/com/gitblit/tests/ByteFormatTest.java
index d59055e..ec3b395 100644
--- a/src/test/java/com/gitblit/tests/ByteFormatTest.java
+++ b/src/test/java/com/gitblit/tests/ByteFormatTest.java
@@ -17,6 +17,8 @@
import static org.junit.Assert.assertEquals;
+import java.util.Locale;
+
import org.junit.Test;
import com.gitblit.utils.ByteFormat;
@@ -25,12 +27,20 @@
@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