From 0e44acbb2fec928a1606dc60f427a148fff405c9 Mon Sep 17 00:00:00 2001
From: Mohamed Ragab <moragab@gmail.com>
Date: Wed, 02 May 2012 11:15:01 -0400
Subject: [PATCH] Added a script to facilitate setting the proxy host and port and no proxy hosts, and then it concatenates all the java system properties for setting the java proxy configurations and puts the resulting string in an environment variable JAVA_PROXY_CONFIG, modified the scirpts gitblit, gitblit-ubuntu, and gitblit-centos to source the java-proxy-config.sh script and then include the resulting java proxy configuration in the java command
---
tests/com/gitblit/tests/UserServiceTest.java | 147 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 140 insertions(+), 7 deletions(-)
diff --git a/tests/com/gitblit/tests/UserServiceTest.java b/tests/com/gitblit/tests/UserServiceTest.java
index 3dfdf7a..03051bd 100644
--- a/tests/com/gitblit/tests/UserServiceTest.java
+++ b/tests/com/gitblit/tests/UserServiceTest.java
@@ -15,44 +15,61 @@
*/
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);
+ testTeams(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);
+ testTeams(service);
file.delete();
}
- protected void test(IUserService service) {
+ protected void testUsers(IUserService service) {
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");
@@ -63,12 +80,15 @@
service.updateUserModel(newUser);
// add one more new user and then test reload of first new user
- newUser = new UserModel("garbage");
+ newUser = new UserModel("GARBAGE");
newUser.password = "garbage";
service.updateUserModel(newUser);
// confirm all added users
assertEquals(3, service.getAllUsernames().size());
+ assertTrue(service.getUserModel("garbage") != null);
+ assertTrue(service.getUserModel("GaRbAgE") != null);
+ assertTrue(service.getUserModel("GARBAGE") != null);
// confirm reloaded test user
newUser = service.getUserModel("test");
@@ -97,4 +117,117 @@
testUser = service.getUserModel("test");
assertTrue(testUser.hasRepository("newrepo1"));
}
+
+ protected void testTeams(IUserService service) {
+
+ // 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
+ UserModel user = service.getUserModel("test");
+ user.repositories.clear();
+ service.updateUserModel(user);
+ user = service.getUserModel("test");
+ assertEquals(0, user.repositories.size());
+ assertFalse(user.canAccessRepository("newrepo1"));
+ assertFalse(user.canAccessRepository("NEWREPO1"));
+
+ // create test team and add test user and newrepo1
+ TeamModel team = new TeamModel("testteam");
+ team.addUser("test");
+ team.addRepository("newrepo1");
+ service.updateTeamModel(team);
+
+ // confirm 1 user and 1 repo
+ team = service.getTeamModel("testteam");
+ assertEquals(1, team.repositories.size());
+ assertEquals(1, team.users.size());
+
+ // confirm team membership
+ user = service.getUserModel("test");
+ assertEquals(0, user.repositories.size());
+ assertEquals(1, user.teams.size());
+
+ // confirm team access
+ assertTrue(team.hasRepository("newrepo1"));
+ assertTrue(user.hasTeamAccess("newrepo1"));
+ assertTrue(team.hasRepository("NEWREPO1"));
+ assertTrue(user.hasTeamAccess("NEWREPO1"));
+
+ // rename the team and add new repository
+ team.addRepository("newrepo2");
+ team.name = "testteam2";
+ service.updateTeamModel("testteam", team);
+
+ team = service.getTeamModel("testteam2");
+ user = service.getUserModel("test");
+
+ // confirm user and team can access newrepo2
+ assertEquals(2, team.repositories.size());
+ assertTrue(team.hasRepository("newrepo2"));
+ assertTrue(user.hasTeamAccess("newrepo2"));
+ assertTrue(team.hasRepository("NEWREPO2"));
+ assertTrue(user.hasTeamAccess("NEWREPO2"));
+
+ // delete testteam2
+ service.deleteTeam("testteam2");
+ team = service.getTeamModel("testteam2");
+ user = service.getUserModel("test");
+
+ // confirm team does not exist and user can not access newrepo1 and 2
+ assertEquals(null, team);
+ assertFalse(user.canAccessRepository("newrepo1"));
+ assertFalse(user.canAccessRepository("newrepo2"));
+
+ // create new team and add it to user
+ // this tests the inverse team creation/team addition
+ team = new TeamModel("testteam");
+ team.addRepository("NEWREPO1");
+ team.addRepository("NEWREPO2");
+ user.teams.add(team);
+ service.updateUserModel(user);
+
+ // confirm the inverted team addition
+ user = service.getUserModel("test");
+ team = service.getTeamModel("testteam");
+ assertTrue(user.hasTeamAccess("newrepo1"));
+ assertTrue(user.hasTeamAccess("newrepo2"));
+ assertTrue(team.hasUser("test"));
+
+ // drop testteam from user and add nextteam to user
+ team = new TeamModel("nextteam");
+ team.addRepository("NEWREPO1");
+ team.addRepository("NEWREPO2");
+ user.teams.clear();
+ user.teams.add(team);
+ service.updateUserModel(user);
+
+ // confirm implicit drop
+ user = service.getUserModel("test");
+ team = service.getTeamModel("testteam");
+ assertTrue(user.hasTeamAccess("newrepo1"));
+ assertTrue(user.hasTeamAccess("newrepo2"));
+ assertFalse(team.hasUser("test"));
+ team = service.getTeamModel("nextteam");
+ assertTrue(team.hasUser("test"));
+
+ // delete the user and confirm team no longer has user
+ service.deleteUser("test");
+ team = service.getTeamModel("testteam");
+ assertFalse(team.hasUser("test"));
+
+ // delete both teams
+ service.deleteTeam("testteam");
+ service.deleteTeam("nextteam");
+
+ // 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