From e493cfdfa99ba780f1cd61c5575e169c8eb46845 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 09 Nov 2011 17:01:59 -0500
Subject: [PATCH] Restored html content to feeds. Include regex substitutions in content.
---
tests/com/gitblit/tests/GitBlitTest.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/tests/com/gitblit/tests/GitBlitTest.java b/tests/com/gitblit/tests/GitBlitTest.java
index 2229768..1d20ced 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,6 +55,9 @@
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 {
@@ -85,12 +89,12 @@
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.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");
@@ -100,18 +104,20 @@
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.getString("missing", "default").equals("default"));
- assertTrue(GitBlit.getInteger("missing", 10) == 10);
- assertTrue(GitBlit.getInteger("realm.userService", 5) == 5);
+ 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) == true);
- assertTrue(GitBlit.getString("realm.userService", null).equals("users.properties"));
- assertTrue(GitBlit.getInteger("realm.minPasswordLength", 0) == 5);
+ assertTrue(GitBlit.getBoolean("git.enableGitServlet", false));
+ assertEquals("distrib/users.properties", 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"));
@@ -119,6 +125,9 @@
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 {
--
Gitblit v1.9.1