From faed6ecc170ffaeea6e0c67eb8b607bb526ff6f9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 19 Oct 2014 22:14:47 -0400
Subject: [PATCH] Merged #206 "New Ticket Type - Maintenance"
---
src/test/java/com/gitblit/tests/TimeUtilsTest.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/TimeUtilsTest.java b/src/test/java/com/gitblit/tests/TimeUtilsTest.java
index f9d5d83..ef506ef 100644
--- a/src/test/java/com/gitblit/tests/TimeUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/TimeUtilsTest.java
@@ -15,16 +15,13 @@
*/
package com.gitblit.tests;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import java.util.Date;
import org.junit.Test;
import com.gitblit.utils.TimeUtils;
-public class TimeUtilsTest {
+public class TimeUtilsTest extends GitblitUnitTest {
private Date offset(long subtract) {
return new Date(System.currentTimeMillis() - subtract);
@@ -43,12 +40,12 @@
@Test
public void testToday() throws Exception {
- assertTrue(TimeUtils.isToday(new Date()));
+ assertTrue(TimeUtils.isToday(new Date(), null));
}
@Test
public void testYesterday() throws Exception {
- assertTrue(TimeUtils.isYesterday(offset(TimeUtils.ONEDAY)));
+ assertTrue(TimeUtils.isYesterday(offset(TimeUtils.ONEDAY), null));
}
@Test
@@ -103,9 +100,9 @@
@Test
public void testFrequency() {
- assertEquals(5, TimeUtils.convertFrequencyToMinutes("2 mins"));
- assertEquals(10, TimeUtils.convertFrequencyToMinutes("10 mins"));
- assertEquals(600, TimeUtils.convertFrequencyToMinutes("10 hours"));
- assertEquals(14400, TimeUtils.convertFrequencyToMinutes(" 10 days "));
+ assertEquals(5, TimeUtils.convertFrequencyToMinutes("2 mins", 5));
+ assertEquals(10, TimeUtils.convertFrequencyToMinutes("10 mins", 5));
+ assertEquals(600, TimeUtils.convertFrequencyToMinutes("10 hours", 5));
+ assertEquals(14400, TimeUtils.convertFrequencyToMinutes(" 10 days ", 5));
}
}
--
Gitblit v1.9.1