From f762b160efd5cafd919a6fd7f9587f578eceb454 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 02 Oct 2011 16:59:44 -0400
Subject: [PATCH] Merge branch 'master' into rpc
---
tests/com/gitblit/tests/GitBlitTest.java | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/tests/com/gitblit/tests/GitBlitTest.java b/tests/com/gitblit/tests/GitBlitTest.java
index 13705f1..81616c3 100644
--- a/tests/com/gitblit/tests/GitBlitTest.java
+++ b/tests/com/gitblit/tests/GitBlitTest.java
@@ -39,6 +39,7 @@
assertTrue("Helloworld model is null!", model != null);
assertTrue(model.toString().equals(
GitBlitSuite.getHelloworldRepository().getDirectory().getName()));
+ assertTrue(GitBlit.self().calculateSize(model) > 22000L);
}
public void testUserModel() throws Exception {
@@ -54,8 +55,11 @@
assertFalse("Admin can still access repository!", model.canAccessRepository(repository));
model.addRepository(repository);
assertTrue("Admin can't access repository!", model.canAccessRepository(repository));
+ assertEquals(GitBlit.self().getRepositoryModel(model, "pretend"), null);
+ assertNotNull(GitBlit.self().getRepositoryModel(model, repository));
+ assertTrue(GitBlit.self().getRepositoryModels(model).size() > 0);
}
-
+
public void testAccessRestrictionTypes() throws Exception {
assertTrue(AccessRestrictionType.PUSH.exceeds(AccessRestrictionType.NONE));
assertTrue(AccessRestrictionType.CLONE.exceeds(AccessRestrictionType.PUSH));
@@ -72,7 +76,7 @@
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"));
@@ -82,50 +86,55 @@
assertTrue(AccessRestrictionType.fromName("clone").equals(AccessRestrictionType.CLONE));
assertTrue(AccessRestrictionType.fromName("view").equals(AccessRestrictionType.VIEW));
}
-
+
public void testFileSettings() throws Exception {
FileSettings settings = new FileSettings("distrib/gitblit.properties");
- assertTrue(settings.getBoolean("missing", true) == true);
+ assertTrue(settings.getBoolean("missing", true));
assertTrue(settings.getString("missing", "default").equals("default"));
assertTrue(settings.getInteger("missing", 10) == 10);
assertTrue(settings.getInteger("realm.realmFile", 5) == 5);
-
- assertTrue(settings.getBoolean("git.enableGitServlet", false) == true);
- assertTrue(settings.getString("realm.realmFile", null).equals("users.properties"));
+
+ assertTrue(settings.getBoolean("git.enableGitServlet", false));
+ assertTrue(settings.getString("realm.userService", null).equals("users.properties"));
assertTrue(settings.getInteger("realm.minPasswordLength", 0) == 5);
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", ' ') == '/');
}
-
+
public void testGitblitSettings() throws Exception {
// These are already tested by above test method.
- assertTrue(GitBlit.getBoolean("missing", true) == true);
+ assertTrue(GitBlit.getBoolean("missing", true));
assertTrue(GitBlit.getString("missing", "default").equals("default"));
assertTrue(GitBlit.getInteger("missing", 10) == 10);
- assertTrue(GitBlit.getInteger("realm.realmFile", 5) == 5);
-
- assertTrue(GitBlit.getBoolean("git.enableGitServlet", false) == true);
- assertTrue(GitBlit.getString("realm.realmFile", null).equals("users.properties"));
+ assertTrue(GitBlit.getInteger("realm.userService", 5) == 5);
+
+ assertTrue(GitBlit.getBoolean("git.enableGitServlet", false));
+ assertTrue(GitBlit.getString("realm.userService", null).equals("users.properties"));
assertTrue(GitBlit.getInteger("realm.minPasswordLength", 0) == 5);
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());
}
-
- public void testAuthentication() throws Exception {
+
+ public void testAuthentication() throws Exception {
assertTrue(GitBlit.self().authenticate("admin", "admin".toCharArray()) != null);
}
-
- public void testRepositories() throws Exception {
+
+ public void testRepositories() throws Exception {
assertTrue(GitBlit.self().getRepository("missing") == null);
assertTrue(GitBlit.self().getRepositoryModel("missing") == null);
}
--
Gitblit v1.9.1