From 7e8873a14ccc2cb25213489d7d7ba97f09673831 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 07 Dec 2011 19:14:34 -0500
Subject: [PATCH] Unit testing overhaul.
---
tests/com/gitblit/tests/UserServiceTest.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/tests/com/gitblit/tests/UserServiceTest.java b/tests/com/gitblit/tests/UserServiceTest.java
index 3dfdf7a..3f410fa 100644
--- a/tests/com/gitblit/tests/UserServiceTest.java
+++ b/tests/com/gitblit/tests/UserServiceTest.java
@@ -15,33 +15,42 @@
*/
package com.gitblit.tests;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.IOException;
-import junit.framework.TestCase;
+import org.junit.Test;
import com.gitblit.ConfigUserService;
import com.gitblit.FileUserService;
import com.gitblit.IUserService;
+import com.gitblit.models.TeamModel;
import com.gitblit.models.UserModel;
-public class UserServiceTest extends TestCase {
+public class UserServiceTest {
+ @Test
public void testFileUserService() throws IOException {
File file = new File("us-test.properties");
file.delete();
- test(new FileUserService(file));
+ IUserService service = new FileUserService(file);
+ testUsers(service);
file.delete();
}
+ @Test
public void testConfigUserService() throws IOException {
File file = new File("us-test.conf");
file.delete();
- test(new ConfigUserService(file));
+ IUserService service = new ConfigUserService(file);
+ testUsers(service);
file.delete();
}
- protected void test(IUserService service) {
+ protected void testUsers(IUserService service) {
UserModel admin = service.getUserModel("admin");
assertTrue(admin == null);
--
Gitblit v1.9.1