From 78907dd20fcdcc911dc287949a687d0579b25abb Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 20 Dec 2013 12:25:36 -0500
Subject: [PATCH] Update to JGit 3.2.0
---
src/test/java/com/gitblit/tests/LuceneExecutorTest.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/LuceneExecutorTest.java b/src/test/java/com/gitblit/tests/LuceneExecutorTest.java
index 0e1aee1..319c09c 100644
--- a/src/test/java/com/gitblit/tests/LuceneExecutorTest.java
+++ b/src/test/java/com/gitblit/tests/LuceneExecutorTest.java
@@ -23,12 +23,14 @@
import org.junit.Before;
import org.junit.Test;
-import com.gitblit.GitBlit;
import com.gitblit.Keys;
-import com.gitblit.LuceneExecutor;
+import com.gitblit.manager.RepositoryManager;
+import com.gitblit.manager.RuntimeManager;
+import com.gitblit.manager.UserManager;
import com.gitblit.models.RefModel;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.SearchResult;
+import com.gitblit.service.LuceneService;
import com.gitblit.tests.mock.MemorySettings;
import com.gitblit.utils.FileUtils;
import com.gitblit.utils.JGitUtils;
@@ -41,13 +43,15 @@
*/
public class LuceneExecutorTest extends GitblitUnitTest {
- LuceneExecutor lucene;
+ LuceneService lucene;
- private LuceneExecutor newLuceneExecutor() {
+ private LuceneService newLuceneExecutor() {
MemorySettings settings = new MemorySettings();
settings.put(Keys.git.repositoriesFolder, GitBlitSuite.REPOSITORIES);
- GitBlit gitblit = new GitBlit(settings, GitBlitSuite.REPOSITORIES);
- return new LuceneExecutor(settings, gitblit);
+ RuntimeManager runtime = new RuntimeManager(settings, GitBlitSuite.BASEFOLDER).start();
+ UserManager users = new UserManager(runtime).start();
+ RepositoryManager repos = new RepositoryManager(runtime, users);
+ return new LuceneService(settings, repos);
}
private RepositoryModel newRepositoryModel(Repository repository) {
@@ -74,7 +78,7 @@
}
@Test
- public void testIndex() throws Exception {
+ public void testIndex() {
// reindex helloworld
Repository repository = GitBlitSuite.getHelloworldRepository();
RepositoryModel model = newRepositoryModel(repository);
--
Gitblit v1.9.1