From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master

---
 tests/com/gitblit/tests/FileUtilsTest.java |   41 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/tests/com/gitblit/tests/FileUtilsTest.java b/tests/com/gitblit/tests/FileUtilsTest.java
index 025a223..8e5cf8a 100644
--- a/tests/com/gitblit/tests/FileUtilsTest.java
+++ b/tests/com/gitblit/tests/FileUtilsTest.java
@@ -15,20 +15,25 @@
  */
 package com.gitblit.tests;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import com.gitblit.utils.FileUtils;
 
-public class FileUtilsTest extends TestCase {
+public class FileUtilsTest {
 
+	@Test
 	public void testReadContent() throws Exception {
 		File dir = new File(System.getProperty("user.dir"));
 		String rawContent = FileUtils.readContent(new File(dir, "LICENSE"), "\n");
 		assertTrue(rawContent.trim().startsWith("Apache License"));
 	}
-	
+
+	@Test
 	public void testWriteContent() throws Exception {
 		String contentA = "this is a test";
 		File tmp = File.createTempFile("gitblit-", ".test");
@@ -37,6 +42,7 @@
 		assertEquals(contentA, contentB);
 	}
 
+	@Test
 	public void testFolderSize() throws Exception {
 		assertEquals(-1, FileUtils.folderSize(null));
 		assertEquals(-1, FileUtils.folderSize(new File(System.getProperty("user.dir"), "pretend")));
@@ -47,7 +53,34 @@
 
 		File file = new File(System.getProperty("user.dir"), "LICENSE");
 		size = FileUtils.folderSize(file);
-		assertTrue("size is actually " + size, size == 11556L);
+		assertEquals("size is actually " + size, 11556L, size);
+	}
+	
+	@Test
+	public void testStringSizes() throws Exception {
+		assertEquals(50 * FileUtils.KB, FileUtils.convertSizeToInt("50k", 0));
+		assertEquals(50 * FileUtils.MB, FileUtils.convertSizeToInt("50m", 0));
+		assertEquals(2 * FileUtils.GB, FileUtils.convertSizeToInt("2g", 0));
+
+		assertEquals(50 * FileUtils.KB, FileUtils.convertSizeToInt("50kb", 0));
+		assertEquals(50 * FileUtils.MB, FileUtils.convertSizeToInt("50mb", 0));
+		assertEquals(2 * FileUtils.GB, FileUtils.convertSizeToInt("2gb", 0));
+
+		assertEquals(50L * FileUtils.KB, FileUtils.convertSizeToLong("50k", 0));
+		assertEquals(50L * FileUtils.MB, FileUtils.convertSizeToLong("50m", 0));
+		assertEquals(50L * FileUtils.GB, FileUtils.convertSizeToLong("50g", 0));
+
+		assertEquals(50L * FileUtils.KB, FileUtils.convertSizeToLong("50kb", 0));
+		assertEquals(50L * FileUtils.MB, FileUtils.convertSizeToLong("50mb", 0));
+		assertEquals(50L * FileUtils.GB, FileUtils.convertSizeToLong("50gb", 0));
+		
+		assertEquals(50 * FileUtils.KB, FileUtils.convertSizeToInt("50 k", 0));
+		assertEquals(50 * FileUtils.MB, FileUtils.convertSizeToInt("50 m", 0));
+		assertEquals(2 * FileUtils.GB, FileUtils.convertSizeToInt("2 g", 0));
+
+		assertEquals(50 * FileUtils.KB, FileUtils.convertSizeToInt("50 kb", 0));
+		assertEquals(50 * FileUtils.MB, FileUtils.convertSizeToInt("50 mb", 0));
+		assertEquals(2 * FileUtils.GB, FileUtils.convertSizeToInt("2 gb", 0));
 
 	}
 }
\ No newline at end of file

--
Gitblit v1.9.1