TimeUtils: Move unit test to same package as TimeUtils is

For some reason the `TimeUtilsTest` class is, like almost all tests, in
the `com.gitblit.tests` package. But this way all methods in classes
which we might predominately need for tests have to be public.
So move the unit test class `TimeUtilsTest` to the same package as the
class it is testing, i.e. `com.gitblit.utils.TimeUtils`.
This way we ca set the new added methods which get the current time
passed in to be at least not public.

1 files changed, 0 insertions, 265 deletions

diff --git a/src/test/java/com/gitblit/tests/TimeUtilsTest.java b/src/test/java/com/gitblit/tests/TimeUtilsTest.java
deleted file mode 100644
index 2dde6d51..00000000
--- a/src/test/java/com/gitblit/tests/TimeUtilsTest.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*

- * Copyright 2011 gitblit.com.

- *

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *     http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-package com.gitblit.tests;

-

-import java.util.Calendar;

-import java.util.Date;

-import java.util.TimeZone;

-

-import org.junit.Test;

-

-import com.gitblit.utils.TimeUtils;

-

-public class TimeUtilsTest extends GitblitUnitTest {

-

-	private Date offset(long subtract) {

-		return new Date(System.currentTimeMillis() - subtract);

-	}

-

-	private Date offset(long now, long subtract) {

-		return new Date(now - subtract);

-	}

-

-	@Test

-	public void testBasicTimeFunctions() throws Exception {

-		assertEquals(2, TimeUtils.minutesAgo(offset(2 * TimeUtils.MIN), false));

-		assertEquals(3, TimeUtils.minutesAgo(offset((2 * TimeUtils.MIN) + (35 * 1000L)), true));

-

-		assertEquals(2, TimeUtils.hoursAgo(offset(2 * TimeUtils.ONEHOUR), false));

-		assertEquals(3, TimeUtils.hoursAgo(offset(5 * TimeUtils.HALFHOUR), true));

-

-		assertEquals(4, TimeUtils.daysAgo(offset(4 * TimeUtils.ONEDAY)));

-	}

-

-	@Test

-	public void testToday() throws Exception {

-		assertTrue(TimeUtils.isToday(new Date(), null));

-	}

-

-	@Test

-	public void testYesterday() throws Exception {

-		assertTrue(TimeUtils.isYesterday(offset(TimeUtils.ONEDAY), null));

-	}

-

-	@Test

-	public void testDurations() throws Exception {

-		TimeUtils timeUtils = new TimeUtils();

-		assertEquals("1 day", timeUtils.duration(1));

-		assertEquals("5 days", timeUtils.duration(5));

-		assertEquals("3 months", timeUtils.duration(75));

-		assertEquals("12 months", timeUtils.duration(364));

-		assertEquals("1 year", timeUtils.duration(365 + 0));

-		assertEquals("1 year", timeUtils.duration(365 + 10));

-		assertEquals("1 year, 1 month", timeUtils.duration(365 + 15));

-		assertEquals("1 year, 1 month", timeUtils.duration(365 + 30));

-		assertEquals("1 year, 1 month", timeUtils.duration(365 + 44));

-		assertEquals("1 year, 2 months", timeUtils.duration(365 + 45));

-		assertEquals("1 year, 2 months", timeUtils.duration(365 + 60));

-

-		assertEquals("2 years", timeUtils.duration(2 * 365 + 0));

-		assertEquals("2 years", timeUtils.duration(2 * 365 + 10));

-		assertEquals("2 years, 1 month", timeUtils.duration(2 * 365 + 15));

-		assertEquals("2 years, 1 month", timeUtils.duration(2 * 365 + 30));

-		assertEquals("2 years, 1 month", timeUtils.duration(2 * 365 + 44));

-		assertEquals("2 years, 2 months", timeUtils.duration(2 * 365 + 45));

-		assertEquals("2 years, 2 months", timeUtils.duration(2 * 365 + 60));

-	}

-

-	@Test

-	public void testTimeAgo() throws Exception {

-		// standard time ago tests

-		TimeUtils timeUtils = new TimeUtils();

-		assertEquals("just now", timeUtils.timeAgo(offset(1 * TimeUtils.MIN)));

-		assertEquals("60 mins ago", timeUtils.timeAgo(offset(60 * TimeUtils.MIN)));

-		assertEquals("2 hours ago", timeUtils.timeAgo(offset(120 * TimeUtils.MIN)));

-		assertEquals("15 hours ago", timeUtils.timeAgo(offset(15 * TimeUtils.ONEHOUR)));

-		assertEquals("yesterday", timeUtils.timeAgo(offset(24 * TimeUtils.ONEHOUR)));

-		assertEquals("2 days ago", timeUtils.timeAgo(offset(2 * TimeUtils.ONEDAY)));

-		assertEquals("5 weeks ago", timeUtils.timeAgo(offset(35 * TimeUtils.ONEDAY)));

-		assertEquals("3 months ago", timeUtils.timeAgo(offset(84 * TimeUtils.ONEDAY)));

-		assertEquals("3 months ago", timeUtils.timeAgo(offset(95 * TimeUtils.ONEDAY)));

-		assertEquals("4 months ago", timeUtils.timeAgo(offset(104 * TimeUtils.ONEDAY)));

-		assertEquals("1 year ago", timeUtils.timeAgo(offset(365 * TimeUtils.ONEDAY)));

-		assertEquals("13 months ago", timeUtils.timeAgo(offset(395 * TimeUtils.ONEDAY)));

-		assertEquals("2 years ago", timeUtils.timeAgo(offset((2 * 365 + 30) * TimeUtils.ONEDAY)));

-	}

-

-	@Test

-	public void testTimeAgoCss() throws Exception {

-		// css class tests

-		TimeUtils timeUtils = new TimeUtils();

-		assertEquals("age0", timeUtils.timeAgoCss(offset(1 * TimeUtils.MIN)));

-		assertEquals("age0", timeUtils.timeAgoCss(offset(60 * TimeUtils.MIN)));

-		assertEquals("age1", timeUtils.timeAgoCss(offset(120 * TimeUtils.MIN)));

-		assertEquals("age1", timeUtils.timeAgoCss(offset(24 * TimeUtils.ONEHOUR)));

-		assertEquals("age2", timeUtils.timeAgoCss(offset(2 * TimeUtils.ONEDAY)));

-	}

-

-

-	@Test

-	public void testTimeAgoYesterday() throws Exception {

-		TimeZone myTimezone = TimeZone.getTimeZone("GMT");

-		TimeUtils timeUtils = new TimeUtils(null, myTimezone);

-

-		Calendar myCal = Calendar.getInstance(myTimezone);

-		myCal.set(Calendar.HOUR_OF_DAY, 12);

-		myCal.set(Calendar.MINUTE, 0);

-		long now = myCal.getTime().getTime();

-

-		assertNotEquals("yesterday", timeUtils.timeAgo(offset(now,23 * TimeUtils.ONEHOUR), false, now));

-		assertNotEquals("yesterday", timeUtils.timeAgo(offset(now,(23 * TimeUtils.ONEHOUR) + (29 * TimeUtils.MIN)), false, now));

-

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,(23 * TimeUtils.ONEHOUR) + (31 * TimeUtils.MIN)), false, now));

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,24 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,35 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,36 * TimeUtils.ONEHOUR), false, now));

-

-		assertNotEquals("yesterday", timeUtils.timeAgo(offset(now,37 * TimeUtils.ONEHOUR), false, now));

-		assertNotEquals("yesterday", timeUtils.timeAgo(offset(now,44 * TimeUtils.ONEHOUR), false, now));

-	}

-

-	@Test

-	public void testTimeAgoYesterdayCET() throws Exception {

-		TimeZone myTimezone = TimeZone.getTimeZone("CET");

-		TimeUtils timeUtils = new TimeUtils(null, myTimezone);

-

-		Calendar myCal = Calendar.getInstance(myTimezone);

-		myCal.set(Calendar.HOUR_OF_DAY, 22);

-		myCal.set(Calendar.MINUTE, 0);

-		long now = myCal.getTime().getTime();

-

-		assertNotEquals("yesterday", timeUtils.timeAgo(offset(now,23 * TimeUtils.ONEHOUR), false, now));

-		assertNotEquals("yesterday", timeUtils.timeAgo(offset(now,(23 * TimeUtils.ONEHOUR) + (29 * TimeUtils.MIN)), false, now));

-

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,(23 * TimeUtils.ONEHOUR) + (31 * TimeUtils.MIN)), false, now));

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,24 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,36 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,46 * TimeUtils.ONEHOUR), false, now));

-

-		assertNotEquals("yesterday", timeUtils.timeAgo(offset(now,47 * TimeUtils.ONEHOUR), false, now));

-		assertNotEquals("yesterday", timeUtils.timeAgo(offset(now,56 * TimeUtils.ONEHOUR), false, now));

-	}

-

-

-	@Test

-	public void testTimeAgoYesterdayPST() throws Exception {

-		TimeZone myTimezone = TimeZone.getTimeZone("PST");

-		TimeUtils timeUtils = new TimeUtils(null, myTimezone);

-

-		Calendar myCal = Calendar.getInstance(myTimezone);

-		myCal.set(Calendar.HOUR_OF_DAY, 8);

-		myCal.set(Calendar.MINUTE, 0);

-		long now = myCal.getTime().getTime();

-

-		assertNotEquals("yesterday", timeUtils.timeAgo(offset(now,23 * TimeUtils.ONEHOUR), false, now));

-		assertNotEquals("yesterday", timeUtils.timeAgo(offset(now,(23 * TimeUtils.ONEHOUR) + (29 * TimeUtils.MIN)), false, now));

-

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,(23 * TimeUtils.ONEHOUR) + (31 * TimeUtils.MIN)), false, now));

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,24 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,30 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,32 * TimeUtils.ONEHOUR), false, now));

-

-		assertNotEquals("yesterday", timeUtils.timeAgo(offset(now,33 * TimeUtils.ONEHOUR), false, now));

-		assertNotEquals("yesterday", timeUtils.timeAgo(offset(now,48 * TimeUtils.ONEHOUR), false, now));

-	}

-

-	@Test

-	public void testFrequency() {

-		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));

-	}

-

-

-	@Test

-	public void testTimeAgoDaysAgo() throws Exception {

-		TimeZone myTimezone = TimeZone.getTimeZone("GMT");

-		TimeUtils timeUtils = new TimeUtils(null, myTimezone);

-

-		Calendar myCal = Calendar.getInstance(myTimezone);

-		myCal.set(Calendar.HOUR_OF_DAY, 12);

-		myCal.set(Calendar.MINUTE, 0);

-		long now = myCal.getTime().getTime();

-

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,24 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,36 * TimeUtils.ONEHOUR), false, now));

-

-		assertEquals("2 days ago", timeUtils.timeAgo(offset(now,37 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("2 days ago", timeUtils.timeAgo(offset(now,48 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("2 days ago", timeUtils.timeAgo(offset(now,60 * TimeUtils.ONEHOUR), false, now));

-

-		assertEquals("3 days ago", timeUtils.timeAgo(offset(now,61 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("3 days ago", timeUtils.timeAgo(offset(now,72 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("3 days ago", timeUtils.timeAgo(offset(now,84 * TimeUtils.ONEHOUR), false, now));

-

- 		assertEquals("4 days ago", timeUtils.timeAgo(offset(now,85 * TimeUtils.ONEHOUR), false, now));

-	}

-

-

-

-	@Test

-	public void testTimeAgoDaysAgoCET() throws Exception {

-		TimeZone myTimezone = TimeZone.getTimeZone("CET");

-		TimeUtils timeUtils = new TimeUtils(null, myTimezone);

-

-		Calendar myCal = Calendar.getInstance(myTimezone);

-		myCal.set(Calendar.HOUR_OF_DAY, 8);

-		myCal.set(Calendar.MINUTE, 0);

-		long now = myCal.getTime().getTime();

-

-

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,24 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,32 * TimeUtils.ONEHOUR), false, now));

-

-		assertEquals("2 days ago", timeUtils.timeAgo(offset(now,33 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("2 days ago", timeUtils.timeAgo(offset(now,48 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("2 days ago", timeUtils.timeAgo(offset(now,56 * TimeUtils.ONEHOUR), false, now));

-

-		assertEquals("3 days ago", timeUtils.timeAgo(offset(now,57 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("3 days ago", timeUtils.timeAgo(offset(now,72 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("3 days ago", timeUtils.timeAgo(offset(now,80 * TimeUtils.ONEHOUR), false, now));

-

-		assertEquals("4 days ago", timeUtils.timeAgo(offset(now,81 * TimeUtils.ONEHOUR), false, now));

-	}

-

-

-

-	@Test

-	public void testTimeAgoDaysAgoPST() throws Exception {

-		TimeZone myTimezone = TimeZone.getTimeZone("PST");

-		TimeUtils timeUtils = new TimeUtils(null, myTimezone);

-

-		Calendar myCal = Calendar.getInstance(myTimezone);

-		myCal.set(Calendar.HOUR_OF_DAY, 22);

-		myCal.set(Calendar.MINUTE, 0);

-		long now = myCal.getTime().getTime();

-

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,24 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("yesterday", timeUtils.timeAgo(offset(now,46 * TimeUtils.ONEHOUR), false, now));

-

-		assertEquals("2 days ago", timeUtils.timeAgo(offset(now,47 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("2 days ago", timeUtils.timeAgo(offset(now,48 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("2 days ago", timeUtils.timeAgo(offset(now,70 * TimeUtils.ONEHOUR), false, now));

-

-		assertEquals("3 days ago", timeUtils.timeAgo(offset(now,71 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("3 days ago", timeUtils.timeAgo(offset(now,72 * TimeUtils.ONEHOUR), false, now));

-		assertEquals("3 days ago", timeUtils.timeAgo(offset(now,94 * TimeUtils.ONEHOUR), false, now));

-

-		assertEquals("4 days ago", timeUtils.timeAgo(offset(now,95 * TimeUtils.ONEHOUR), false, now));

-	}

-

-}