From 514da0237f6239322193d5d4b11b58fe4095da2b Mon Sep 17 00:00:00 2001
From: SHaselbauer <sarah.haselbauer@akquinet.de>
Date: Wed, 23 Jan 2013 10:27:42 -0500
Subject: [PATCH] seleniumFixV2: connected thread pool creation to condition web.allowLuceneIndexing (otherwise thread pool will be kept open for more than a minute, what hinders the start of another gitblit instance in the same jvm during selenium test case execution), fixed naming of xpath variables, added missing property to gitblit.properties and test-ui-gitblit.properties, changed naming of methods (according to decision that owners is a much shorter word than repository administrator and that owners is fits better if you think of collective responsibilities and collective ownership)
---
tests/com/gitblit/tests/ByteFormatTest.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/tests/com/gitblit/tests/ByteFormatTest.java b/tests/com/gitblit/tests/ByteFormatTest.java
index e969c4d..d59055e 100644
--- a/tests/com/gitblit/tests/ByteFormatTest.java
+++ b/tests/com/gitblit/tests/ByteFormatTest.java
@@ -15,19 +15,22 @@
*/
package com.gitblit.tests;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
import com.gitblit.utils.ByteFormat;
-public class ByteFormatTest extends TestCase {
+public class ByteFormatTest {
+ @Test
public void testByteFormat() throws Exception {
ByteFormat format = new ByteFormat();
- assertTrue(format.format(10).equals("10 b"));
- assertTrue(format.format(1024*10).equals("10.0 KB"));
- assertTrue(format.format(1024*1000).equals("1,000.0 KB"));
- assertTrue(format.format(2*1024*1000).equals("2.0 MB"));
- assertTrue(format.format(1024*1024*1000).equals("1,000.0 MB"));
- assertTrue(format.format(2*1024*1024*1000).equals("2.0 GB"));
+ 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));
}
}
--
Gitblit v1.9.1