From bb15bf10a7052adf0f5feb55db4f894a9053adac Mon Sep 17 00:00:00 2001
From: Florian Zschocke <f.zschocke+git@gmail.com>
Date: Sat, 23 Oct 2021 23:41:25 +0200
Subject: [PATCH] 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.
---
 src/main/java/com/gitblit/utils/TimeUtils.java         | 10 +++++-----
 src/test/java/com/gitblit/tests/GitBlitSuite.java      |  1 +
 .../com/gitblit/{tests => utils}/TimeUtilsTest.java    |  7 ++++---
 3 files changed, 10 insertions(+), 8 deletions(-)
 rename src/test/java/com/gitblit/{tests => utils}/TimeUtilsTest.java (96%)

diff --git a/src/main/java/com/gitblit/utils/TimeUtils.java b/src/main/java/com/gitblit/utils/TimeUtils.java
index 001e6be6..12737047 100644
--- a/src/main/java/com/gitblit/utils/TimeUtils.java
+++ b/src/main/java/com/gitblit/utils/TimeUtils.java
@@ -63,7 +63,7 @@ public class TimeUtils {
 	}
 
 
-	public static boolean isToday(Date date, TimeZone timezone, Date now) {
+	static boolean isToday(Date date, TimeZone timezone, Date now) {
 		SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
 		if (timezone != null) {
 			df.setTimeZone(timezone);
@@ -82,7 +82,7 @@ public class TimeUtils {
 	}
 
 
-	public static boolean isYesterday(Date date, TimeZone timezone, Date now) {
+	static boolean isYesterday(Date date, TimeZone timezone, Date now) {
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(now);
 		cal.add(Calendar.DATE, -1);
@@ -170,7 +170,7 @@ public class TimeUtils {
 	}
 
 
-	public static int hoursAgo(Date date, long now, boolean roundup) {
+	static int hoursAgo(Date date, long now, boolean roundup) {
 		long diff = now - date.getTime();
 		int hours = (int) (diff / ONEHOUR);
 		if (roundup && (diff % ONEHOUR) >= HALFHOUR) {
@@ -189,7 +189,7 @@ public class TimeUtils {
 		return daysAgo(date, System.currentTimeMillis());
 	}
 
-	public static int daysAgo(Date date, long now) {
+	static int daysAgo(Date date, long now) {
 		long today = ONEDAY * (now/ONEDAY);
 		long day = ONEDAY * (date.getTime()/ONEDAY);
 		long diff = today - day;
@@ -239,7 +239,7 @@ public class TimeUtils {
 	}
 
 
-	public String timeAgo(Date date, boolean css, long now) {
+	String timeAgo(Date date, boolean css, long now) {
 		Date dNow = new Date(now);
 		if (isToday(date, timezone, dNow) || isYesterday(date, timezone, dNow)) {
 			int mins = minutesAgo(date, now, true);
diff --git a/src/test/java/com/gitblit/tests/GitBlitSuite.java b/src/test/java/com/gitblit/tests/GitBlitSuite.java
index 3292d090..fbae039c 100644
--- a/src/test/java/com/gitblit/tests/GitBlitSuite.java
+++ b/src/test/java/com/gitblit/tests/GitBlitSuite.java
@@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+import com.gitblit.utils.TimeUtilsTest;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.lib.RepositoryCache;
diff --git a/src/test/java/com/gitblit/tests/TimeUtilsTest.java b/src/test/java/com/gitblit/utils/TimeUtilsTest.java
similarity index 96%
rename from src/test/java/com/gitblit/tests/TimeUtilsTest.java
rename to src/test/java/com/gitblit/utils/TimeUtilsTest.java
index 2dde6d51..77710e06 100644
--- a/src/test/java/com/gitblit/tests/TimeUtilsTest.java
+++ b/src/test/java/com/gitblit/utils/TimeUtilsTest.java
@@ -13,17 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gitblit.tests;
+package com.gitblit.utils;
 
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 
+import com.gitblit.tests.GitblitUnitTest;
 import org.junit.Test;
 
-import com.gitblit.utils.TimeUtils;
 
-public class TimeUtilsTest extends GitblitUnitTest {
+public class TimeUtilsTest extends GitblitUnitTest
+{
 
 	private Date offset(long subtract) {
 		return new Date(System.currentTimeMillis() - subtract);
-- 
2.39.5