From 43ddbf959829a732f5aefcccf72d2812a41fdbfd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 30 Sep 2014 07:51:31 -0400
Subject: [PATCH] Support GITBLIT_HOME as a system property and environment variable
---
src/test/java/com/gitblit/tests/LuceneExecutorTest.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/LuceneExecutorTest.java b/src/test/java/com/gitblit/tests/LuceneExecutorTest.java
index 4041a06..a8358b9 100644
--- a/src/test/java/com/gitblit/tests/LuceneExecutorTest.java
+++ b/src/test/java/com/gitblit/tests/LuceneExecutorTest.java
@@ -24,16 +24,18 @@
import org.junit.Test;
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;
+import com.gitblit.utils.XssFilter;
+import com.gitblit.utils.XssFilter.AllowXssFilter;
/**
* Tests Lucene indexing and querying.
@@ -43,15 +45,16 @@
*/
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);
- RuntimeManager runtime = new RuntimeManager(settings);
- UserManager users = new UserManager(runtime);
- RepositoryManager repos = new RepositoryManager(runtime, users);
- return new LuceneExecutor(settings, repos);
+ XssFilter xssFilter = new AllowXssFilter();
+ RuntimeManager runtime = new RuntimeManager(settings, xssFilter, GitBlitSuite.BASEFOLDER).start();
+ UserManager users = new UserManager(runtime, null).start();
+ RepositoryManager repos = new RepositoryManager(runtime, null, users);
+ return new LuceneService(settings, repos);
}
private RepositoryModel newRepositoryModel(Repository repository) {
@@ -78,7 +81,7 @@
}
@Test
- public void testIndex() throws Exception {
+ public void testIndex() {
// reindex helloworld
Repository repository = GitBlitSuite.getHelloworldRepository();
RepositoryModel model = newRepositoryModel(repository);
--
Gitblit v1.9.1