diff options
| author | James Moger <james.moger@gitblit.com> | 2011-12-21 21:23:29 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2011-12-21 21:23:29 -0500 |
| commit | dcf57518555f7a8874533da047f3efaf7330a90a (patch) | |
| tree | 8f52ce3451ffb06bc23cb500c834a11f77c71b13 /tests | |
| parent | e3d0d4642a8b5a1a9b9b492cdd033896ef787871 (diff) | |
| download | gitblit-dcf57518555f7a8874533da047f3efaf7330a90a.tar.gz gitblit-dcf57518555f7a8874533da047f3efaf7330a90a.zip | |
Unit testing fixes and regression fixes.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/com/gitblit/tests/GitServletTest.java | 2 | ||||
| -rw-r--r-- | tests/com/gitblit/tests/RpcTests.java | 5 | ||||
| -rw-r--r-- | tests/com/gitblit/tests/UserServiceTest.java | 22 |
3 files changed, 24 insertions, 5 deletions
diff --git a/tests/com/gitblit/tests/GitServletTest.java b/tests/com/gitblit/tests/GitServletTest.java index b3cf41ab..f0aedce1 100644 --- a/tests/com/gitblit/tests/GitServletTest.java +++ b/tests/com/gitblit/tests/GitServletTest.java @@ -83,7 +83,7 @@ public class GitServletTest { clone.call();
cloned = true;
} catch (Exception e) {
- e.printStackTrace();
+ // swallow the exception which we expect
}
// restore anonymous repository access
diff --git a/tests/com/gitblit/tests/RpcTests.java b/tests/com/gitblit/tests/RpcTests.java index 123dd972..f85dd79a 100644 --- a/tests/com/gitblit/tests/RpcTests.java +++ b/tests/com/gitblit/tests/RpcTests.java @@ -352,6 +352,11 @@ public class RpcTests { // restore setting
newValue = !newValue;
updated.put(Keys.web.showRepositorySizes, String.valueOf(newValue));
+ success = RpcUtils.updateSettings(updated, url, account, password.toCharArray());
+ assertTrue("Failed to update server settings", success);
+ settings = RpcUtils.getSettings(url, account, password.toCharArray());
+ showSizes = settings.get(Keys.web.showRepositorySizes).getBoolean(true);
+ assertEquals(newValue, showSizes);
}
@Test
diff --git a/tests/com/gitblit/tests/UserServiceTest.java b/tests/com/gitblit/tests/UserServiceTest.java index 93e7f606..b1f02472 100644 --- a/tests/com/gitblit/tests/UserServiceTest.java +++ b/tests/com/gitblit/tests/UserServiceTest.java @@ -57,13 +57,19 @@ public class UserServiceTest { 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 @@ public class UserServiceTest { 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 @@ public class UserServiceTest { // 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 |