From dcf57518555f7a8874533da047f3efaf7330a90a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 21 Dec 2011 21:23:29 -0500
Subject: [PATCH] Unit testing fixes and regression fixes.
---
tests/com/gitblit/tests/UserServiceTest.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/tests/com/gitblit/tests/UserServiceTest.java b/tests/com/gitblit/tests/UserServiceTest.java
index 93e7f60..b1f0247 100644
--- a/tests/com/gitblit/tests/UserServiceTest.java
+++ b/tests/com/gitblit/tests/UserServiceTest.java
@@ -57,13 +57,19 @@
UserModel admin = service.getUserModel("admin");
assertTrue(admin == null);
- // add admin
+ // add admin and admins team
+ TeamModel admins = new TeamModel("admins");
+ admins.mailingLists.add("admins@localhost.com");
+
admin = new UserModel("admin");
admin.password = "password";
admin.canAdmin = true;
admin.excludeFromFederation = true;
+ admin.teams.add(admins);
+
service.updateUserModel(admin);
admin = null;
+ admins = null;
// add new user
UserModel newUser = new UserModel("test");
@@ -111,8 +117,9 @@
protected void testTeams(IUserService service) {
- // confirm we have no teams
- assertEquals(0, service.getAllTeamNames().size());
+ // confirm we have 1 team (admins)
+ assertEquals(1, service.getAllTeamNames().size());
+ assertEquals("admins", service.getAllTeamNames().get(0));
// remove newrepo1 from test user
// now test user has no repositories
@@ -211,6 +218,13 @@
// delete both teams
service.deleteTeam("testteam");
service.deleteTeam("nextteam");
- assertEquals(0, service.getAllTeamNames().size());
+
+ // assert we still have the admins team
+ assertEquals(1, service.getAllTeamNames().size());
+ assertEquals("admins", service.getAllTeamNames().get(0));
+
+ team = service.getTeamModel("admins");
+ assertEquals(1, team.mailingLists.size());
+ assertTrue(team.mailingLists.contains("admins@localhost.com"));
}
}
\ No newline at end of file
--
Gitblit v1.9.1