From 9dcd534f3e1edb72944fcfb98076cccb36a71df4 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 14 Nov 2011 17:24:16 -0500
Subject: [PATCH] Added optional Gravatar support
---
tests/com/gitblit/tests/GitBlitTest.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/tests/com/gitblit/tests/GitBlitTest.java b/tests/com/gitblit/tests/GitBlitTest.java
index 81616c3..669b25a 100644
--- a/tests/com/gitblit/tests/GitBlitTest.java
+++ b/tests/com/gitblit/tests/GitBlitTest.java
@@ -52,9 +52,10 @@
model.canAdmin = false;
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(model, 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);
@@ -111,13 +112,13 @@
public void testGitblitSettings() throws Exception {
// These are already tested by above test method.
assertTrue(GitBlit.getBoolean("missing", true));
- assertTrue(GitBlit.getString("missing", "default").equals("default"));
- assertTrue(GitBlit.getInteger("missing", 10) == 10);
- assertTrue(GitBlit.getInteger("realm.userService", 5) == 5);
+ 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));
- assertTrue(GitBlit.getString("realm.userService", null).equals("users.properties"));
- assertTrue(GitBlit.getInteger("realm.minPasswordLength", 0) == 5);
+ 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"));
--
Gitblit v1.9.1