From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
tests/com/gitblit/tests/MetricUtilsTest.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/tests/com/gitblit/tests/MetricUtilsTest.java b/tests/com/gitblit/tests/MetricUtilsTest.java
index bfa34b4..bb8261a 100644
--- a/tests/com/gitblit/tests/MetricUtilsTest.java
+++ b/tests/com/gitblit/tests/MetricUtilsTest.java
@@ -15,34 +15,40 @@
*/
package com.gitblit.tests;
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import java.util.List;
+import java.util.TimeZone;
import org.eclipse.jgit.lib.Repository;
+import org.junit.Test;
import com.gitblit.models.Metric;
import com.gitblit.utils.MetricUtils;
-public class MetricUtilsTest extends TestCase {
+public class MetricUtilsTest {
+ @Test
public void testMetrics() throws Exception {
testMetrics(GitBlitSuite.getHelloworldRepository());
- testMetrics(GitBlitSuite.getBluezGnomeRepository());
+ testMetrics(GitBlitSuite.getJGitRepository());
}
private void testMetrics(Repository repository) throws Exception {
- List<Metric> metrics = MetricUtils.getDateMetrics(repository, null, true, null);
+ List<Metric> metrics = MetricUtils.getDateMetrics(repository, null, true, null,
+ TimeZone.getDefault());
repository.close();
assertTrue("No date metrics found!", metrics.size() > 0);
}
+ @Test
public void testAuthorMetrics() throws Exception {
Repository repository = GitBlitSuite.getHelloworldRepository();
List<Metric> byEmail = MetricUtils.getAuthorMetrics(repository, null, true);
List<Metric> byName = MetricUtils.getAuthorMetrics(repository, null, false);
repository.close();
- assertTrue("No author metrics found!", byEmail.size() == 9);
- assertTrue("No author metrics found!", byName.size() == 8);
+ assertEquals("No author metrics found!", 9, byEmail.size());
+ assertEquals("No author metrics found!", 8, byName.size());
}
}
\ No newline at end of file
--
Gitblit v1.9.1