From 8f73a7cc630bb61d088c7cdad30a6708870184ee Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 14 Sep 2011 09:13:51 -0400
Subject: [PATCH] Implemented Federation Sets. Documentation.
---
tests/com/gitblit/tests/GitBlitSuite.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/tests/com/gitblit/tests/GitBlitSuite.java b/tests/com/gitblit/tests/GitBlitSuite.java
index e13e1bb..2908383 100644
--- a/tests/com/gitblit/tests/GitBlitSuite.java
+++ b/tests/com/gitblit/tests/GitBlitSuite.java
@@ -25,9 +25,9 @@
import org.eclipse.jgit.storage.file.FileRepository;
import com.gitblit.FileSettings;
+import com.gitblit.FileUserService;
import com.gitblit.GitBlit;
import com.gitblit.GitBlitException;
-import com.gitblit.JettyLoginService;
import com.gitblit.models.RepositoryModel;
import com.gitblit.utils.JGitUtils;
@@ -40,11 +40,13 @@
public static Test suite() {
TestSuite suite = new TestSuite();
+ suite.addTestSuite(FileUtilsTest.class);
suite.addTestSuite(TimeUtilsTest.class);
suite.addTestSuite(StringUtilsTest.class);
suite.addTestSuite(ByteFormatTest.class);
suite.addTestSuite(MarkdownUtilsTest.class);
suite.addTestSuite(JGitUtilsTest.class);
+ suite.addTestSuite(SyndicationUtilsTest.class);
suite.addTestSuite(DiffUtilsTest.class);
suite.addTestSuite(MetricUtilsTest.class);
suite.addTestSuite(TicgitUtilsTest.class);
@@ -72,9 +74,8 @@
protected void setUp() throws Exception {
FileSettings settings = new FileSettings("distrib/gitblit.properties");
GitBlit.self().configureContext(settings);
- JettyLoginService loginService = new JettyLoginService(new File("distrib/users.properties"));
- loginService.loadUsers();
- GitBlit.self().setLoginService(loginService);
+ FileUserService loginService = new FileUserService(new File("distrib/users.properties"));
+ GitBlit.self().setUserService(loginService);
if (REPOSITORIES.exists() || REPOSITORIES.mkdirs()) {
cloneOrFetch("helloworld.git", "https://github.com/git/hello-world.git");
@@ -101,7 +102,7 @@
try {
RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
model.useTickets = true;
- GitBlit.self().editRepositoryModel(model.name, model, false);
+ GitBlit.self().updateRepositoryModel(model.name, model, false);
} catch (GitBlitException g) {
g.printStackTrace();
}
@@ -111,7 +112,7 @@
try {
RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
model.useDocs = true;
- GitBlit.self().editRepositoryModel(model.name, model, false);
+ GitBlit.self().updateRepositoryModel(model.name, model, false);
} catch (GitBlitException g) {
g.printStackTrace();
}
@@ -121,7 +122,7 @@
try {
RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
model.showRemoteBranches = true;
- GitBlit.self().editRepositoryModel(model.name, model, false);
+ GitBlit.self().updateRepositoryModel(model.name, model, false);
} catch (GitBlitException g) {
g.printStackTrace();
}
--
Gitblit v1.9.1