From 93f4729cdfc856d2a3b155bcf3e97f85b47ce760 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 04 Dec 2011 16:55:42 -0500
Subject: [PATCH] Implemented ConfigUserService. Fixed and deprecated FileUserService.
---
tests/com/gitblit/tests/GitBlitSuite.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/com/gitblit/tests/GitBlitSuite.java b/tests/com/gitblit/tests/GitBlitSuite.java
index ad87cb0..a2ab3e8 100644
--- a/tests/com/gitblit/tests/GitBlitSuite.java
+++ b/tests/com/gitblit/tests/GitBlitSuite.java
@@ -25,8 +25,8 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.storage.file.FileRepository;
+import com.gitblit.ConfigUserService;
import com.gitblit.FileSettings;
-import com.gitblit.FileUserService;
import com.gitblit.GitBlit;
import com.gitblit.GitBlitException;
import com.gitblit.GitBlitServer;
@@ -57,6 +57,7 @@
suite.addTestSuite(JsonUtilsTest.class);
suite.addTestSuite(ByteFormatTest.class);
suite.addTestSuite(ObjectCacheTest.class);
+ suite.addTestSuite(UserServiceTest.class);
suite.addTestSuite(MarkdownUtilsTest.class);
suite.addTestSuite(JGitUtilsTest.class);
suite.addTestSuite(SyndicationUtilsTest.class);
@@ -91,7 +92,7 @@
GitBlitServer.main("--httpPort", "" + port, "--httpsPort", "0", "--shutdownPort",
"" + shutdownPort, "--repositoriesFolder",
"\"" + GitBlitSuite.REPOSITORIES.getAbsolutePath() + "\"", "--userService",
- "distrib/users.properties");
+ "distrib/users.conf");
}
});
@@ -111,7 +112,7 @@
protected void setUp() throws Exception {
FileSettings settings = new FileSettings("distrib/gitblit.properties");
GitBlit.self().configureContext(settings, true);
- FileUserService loginService = new FileUserService(new File("distrib/users.properties"));
+ ConfigUserService loginService = new ConfigUserService(new File("distrib/users.conf"));
GitBlit.self().setUserService(loginService);
if (REPOSITORIES.exists() || REPOSITORIES.mkdirs()) {
--
Gitblit v1.9.1