From 8db2b5e52d8039513ad320fffcf22639f6c9faa2 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 07 May 2014 13:02:25 -0400
Subject: [PATCH] Prepare 1.5.1 release
---
src/test/java/com/gitblit/tests/FileUtilsTest.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/FileUtilsTest.java b/src/test/java/com/gitblit/tests/FileUtilsTest.java
index 8e5cf8a..fd97084 100644
--- a/src/test/java/com/gitblit/tests/FileUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/FileUtilsTest.java
@@ -15,16 +15,13 @@
*/
package com.gitblit.tests;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import java.io.File;
import org.junit.Test;
import com.gitblit.utils.FileUtils;
-public class FileUtilsTest {
+public class FileUtilsTest extends GitblitUnitTest {
@Test
public void testReadContent() throws Exception {
@@ -47,7 +44,7 @@
assertEquals(-1, FileUtils.folderSize(null));
assertEquals(-1, FileUtils.folderSize(new File(System.getProperty("user.dir"), "pretend")));
- File dir = new File(System.getProperty("user.dir"), "distrib");
+ File dir = new File(System.getProperty("user.dir"), "src/main/distrib");
long size = FileUtils.folderSize(dir);
assertTrue("size is actually " + size, size >= 470000L);
@@ -55,7 +52,7 @@
size = FileUtils.folderSize(file);
assertEquals("size is actually " + size, 11556L, size);
}
-
+
@Test
public void testStringSizes() throws Exception {
assertEquals(50 * FileUtils.KB, FileUtils.convertSizeToInt("50k", 0));
@@ -73,7 +70,7 @@
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));
--
Gitblit v1.9.1