From fe7c01a8bd76dff240e74bb770212911e227ba59 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 03 Feb 2012 17:24:51 -0500 Subject: [PATCH] Return to Users page after add/edit team --- tests/com/gitblit/tests/GitBlitTest.java | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 106 insertions(+), 8 deletions(-) diff --git a/tests/com/gitblit/tests/GitBlitTest.java b/tests/com/gitblit/tests/GitBlitTest.java index 853ca39..418f938 100644 --- a/tests/com/gitblit/tests/GitBlitTest.java +++ b/tests/com/gitblit/tests/GitBlitTest.java @@ -15,16 +15,24 @@ */ package com.gitblit.tests; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import java.util.List; -import junit.framework.TestCase; +import org.junit.Test; +import com.gitblit.Constants.AccessRestrictionType; +import com.gitblit.FileSettings; import com.gitblit.GitBlit; import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; -public class GitBlitTest extends TestCase { +public class GitBlitTest { + @Test public void testRepositoryModel() throws Exception { List<String> repositories = GitBlit.self().getRepositoryList(); assertTrue("Repository list is empty!", repositories.size() > 0); @@ -35,22 +43,112 @@ RepositoryModel model = GitBlit.self().getRepositoryModel( GitBlitSuite.getHelloworldRepository().getDirectory().getName()); assertTrue("Helloworld model is null!", model != null); - assertTrue(model.toString().equals( - GitBlitSuite.getHelloworldRepository().getDirectory().getName())); + assertEquals(GitBlitSuite.getHelloworldRepository().getDirectory().getName(), model.name); + assertTrue(GitBlit.self().calculateSize(model) > 22000L); } + @Test public void testUserModel() throws Exception { List<String> users = GitBlit.self().getAllUsernames(); assertTrue("No users found!", users.size() > 0); assertTrue("Admin not found", users.contains("admin")); UserModel model = GitBlit.self().getUserModel("admin"); - assertTrue(model.toString().equals("admin")); + assertEquals("admin", model.toString()); assertTrue("Admin missing #admin role!", model.canAdmin); model.canAdmin = false; - assertFalse("Admin should not hae #admin!", model.canAdmin); + assertFalse("Admin should not have #admin!", model.canAdmin); String repository = GitBlitSuite.getHelloworldRepository().getDirectory().getName(); - assertFalse("Admin can still access repository!", model.canAccessRepository(repository)); + RepositoryModel repositoryModel = GitBlit.self().getRepositoryModel(repository); + assertFalse("Admin can still access repository!", + model.canAccessRepository(repositoryModel)); model.addRepository(repository); - assertTrue("Admin can't access repository!", model.canAccessRepository(repository)); + assertTrue("Admin can't access repository!", model.canAccessRepository(repositoryModel)); + assertEquals(GitBlit.self().getRepositoryModel(model, "pretend"), null); + assertNotNull(GitBlit.self().getRepositoryModel(model, repository)); + assertTrue(GitBlit.self().getRepositoryModels(model).size() > 0); + } + + @Test + public void testAccessRestrictionTypes() throws Exception { + assertTrue(AccessRestrictionType.PUSH.exceeds(AccessRestrictionType.NONE)); + assertTrue(AccessRestrictionType.CLONE.exceeds(AccessRestrictionType.PUSH)); + assertTrue(AccessRestrictionType.VIEW.exceeds(AccessRestrictionType.CLONE)); + + assertFalse(AccessRestrictionType.NONE.exceeds(AccessRestrictionType.PUSH)); + assertFalse(AccessRestrictionType.PUSH.exceeds(AccessRestrictionType.CLONE)); + assertFalse(AccessRestrictionType.CLONE.exceeds(AccessRestrictionType.VIEW)); + + assertTrue(AccessRestrictionType.PUSH.atLeast(AccessRestrictionType.NONE)); + assertTrue(AccessRestrictionType.CLONE.atLeast(AccessRestrictionType.PUSH)); + assertTrue(AccessRestrictionType.VIEW.atLeast(AccessRestrictionType.CLONE)); + + assertFalse(AccessRestrictionType.NONE.atLeast(AccessRestrictionType.PUSH)); + assertFalse(AccessRestrictionType.PUSH.atLeast(AccessRestrictionType.CLONE)); + assertFalse(AccessRestrictionType.CLONE.atLeast(AccessRestrictionType.VIEW)); + + assertTrue(AccessRestrictionType.PUSH.toString().equals("PUSH")); + assertTrue(AccessRestrictionType.CLONE.toString().equals("CLONE")); + assertTrue(AccessRestrictionType.VIEW.toString().equals("VIEW")); + + assertEquals(AccessRestrictionType.NONE, AccessRestrictionType.fromName("none")); + assertEquals(AccessRestrictionType.PUSH, AccessRestrictionType.fromName("push")); + assertEquals(AccessRestrictionType.CLONE, AccessRestrictionType.fromName("clone")); + assertEquals(AccessRestrictionType.VIEW, AccessRestrictionType.fromName("view")); + } + + @Test + public void testFileSettings() throws Exception { + FileSettings settings = new FileSettings("distrib/gitblit.properties"); + assertEquals(true, settings.getBoolean("missing", true)); + assertEquals("default", settings.getString("missing", "default")); + assertEquals(10, settings.getInteger("missing", 10)); + assertEquals(5, settings.getInteger("realm.realmFile", 5)); + + assertTrue(settings.getBoolean("git.enableGitServlet", false)); + assertEquals("users.conf", settings.getString("realm.userService", null)); + assertEquals(5, settings.getInteger("realm.minPasswordLength", 0)); + List<String> mdExtensions = settings.getStrings("web.markdownExtensions"); + assertTrue(mdExtensions.size() > 0); + assertTrue(mdExtensions.contains("md")); + + List<String> keys = settings.getAllKeys("server"); + assertTrue(keys.size() > 0); + assertTrue(keys.contains("server.httpsPort")); + + assertTrue(settings.getChar("web.forwardSlashCharacter", ' ') == '/'); + } + + @Test + public void testGitblitSettings() throws Exception { + // These are already tested by above test method. + assertTrue(GitBlit.getBoolean("missing", true)); + assertEquals("default", GitBlit.getString("missing", "default")); + assertEquals(10, GitBlit.getInteger("missing", 10)); + assertEquals(5, GitBlit.getInteger("realm.userService", 5)); + + assertTrue(GitBlit.getBoolean("git.enableGitServlet", false)); + assertEquals("test-users.conf", GitBlit.getString("realm.userService", null)); + assertEquals(5, GitBlit.getInteger("realm.minPasswordLength", 0)); + List<String> mdExtensions = GitBlit.getStrings("web.markdownExtensions"); + assertTrue(mdExtensions.size() > 0); + assertTrue(mdExtensions.contains("md")); + + List<String> keys = GitBlit.getAllKeys("server"); + assertTrue(keys.size() > 0); + assertTrue(keys.contains("server.httpsPort")); + + assertTrue(GitBlit.getChar("web.forwardSlashCharacter", ' ') == '/'); + assertFalse(GitBlit.isDebugMode()); + } + + @Test + public void testAuthentication() throws Exception { + assertTrue(GitBlit.self().authenticate("admin", "admin".toCharArray()) != null); + } + + @Test + public void testRepositories() throws Exception { + assertTrue(GitBlit.self().getRepository("missing") == null); + assertTrue(GitBlit.self().getRepositoryModel("missing") == null); } } -- Gitblit v1.9.1