From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001
From: Gerard Smyth <gerard.smyth@gmail.com>
Date: Thu, 08 May 2014 13:09:30 -0400
Subject: [PATCH] Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored.
---
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