From fddab0300aaec0741f8b2de86952c675f82948dd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 04 Dec 2012 11:20:22 -0500
Subject: [PATCH] Fixed regression in sendmail-html.groovy
---
tests/com/gitblit/tests/GitBlitTest.java | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 165 insertions(+), 14 deletions(-)
diff --git a/tests/com/gitblit/tests/GitBlitTest.java b/tests/com/gitblit/tests/GitBlitTest.java
index 50d3606..1c9bbd0 100644
--- a/tests/com/gitblit/tests/GitBlitTest.java
+++ b/tests/com/gitblit/tests/GitBlitTest.java
@@ -1,36 +1,187 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
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);
- assertTrue("Missing Helloworld repository!", repositories.contains(GitBlitSuite.getHelloworldRepository().getDirectory().getName()));
- RepositoryModel model = GitBlit.self().getRepositoryModel(GitBlitSuite.getHelloworldRepository().getDirectory().getName());
+ assertTrue(
+ "Missing Helloworld repository!",
+ repositories.contains(GitBlitSuite.getHelloworldRepository().getDirectory()
+ .getName()));
+ 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"));
- assertTrue("Admin missing #admin role!", model.canAdmin);
- model.canAdmin = false;
- assertFalse("Admin should not hae #admin!", model.canAdmin);
+ UserModel user = GitBlit.self().getUserModel("admin");
+ assertEquals("admin", user.toString());
+ assertTrue("Admin missing #admin role!", user.canAdmin);
+ user.canAdmin = false;
+ assertFalse("Admin should not have #admin!", user.canAdmin);
String repository = GitBlitSuite.getHelloworldRepository().getDirectory().getName();
- assertFalse("Admin can still access repository!", model.canAccessRepository(repository));
- model.addRepository(repository);
- assertTrue("Admin can't access repository!", model.canAccessRepository(repository));
+ RepositoryModel repositoryModel = GitBlit.self().getRepositoryModel(repository);
+ repositoryModel.accessRestriction = AccessRestrictionType.VIEW;
+ assertFalse("Admin can still access repository!",
+ user.canView(repositoryModel));
+ user.addRepositoryPermission(repository);
+ assertTrue("Admin can't access repository!", user.canView(repositoryModel));
+ assertEquals(GitBlit.self().getRepositoryModel(user, "pretend"), null);
+ assertNotNull(GitBlit.self().getRepositoryModel(user, repository));
+ assertTrue(GitBlit.self().getRepositoryModels(user).size() > 0);
+ }
+
+ @Test
+ public void testUserModelVerification() throws Exception {
+ UserModel user = new UserModel("james");
+ user.displayName = "James Moger";
+
+ assertTrue(user.is("James", null));
+ assertTrue(user.is("James", ""));
+ assertTrue(user.is("JaMeS", "anything"));
+
+ assertTrue(user.is("james moger", null));
+ assertTrue(user.is("james moger", ""));
+ assertTrue(user.is("james moger", "anything"));
+
+ assertFalse(user.is("joe", null));
+ assertFalse(user.is("joe", ""));
+ assertFalse(user.is("joe", "anything"));
+
+ // specify email address which results in address verification
+ user.emailAddress = "something";
+
+ assertFalse(user.is("James", null));
+ assertFalse(user.is("James", ""));
+ assertFalse(user.is("JaMeS", "anything"));
+
+ assertFalse(user.is("james moger", null));
+ assertFalse(user.is("james moger", ""));
+ assertFalse(user.is("james moger", "anything"));
+
+ assertTrue(user.is("JaMeS", user.emailAddress));
+ assertTrue(user.is("JaMeS mOgEr", user.emailAddress));
+ }
+
+ @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