From 874be0d933eb52d548a07b67d112a0975e900b14 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 01 Aug 2012 09:47:30 -0400
Subject: [PATCH] Fixed Lucene unit tests
---
tests/com/gitblit/tests/mock/MemorySettings.java | 6 +++---
tests/com/gitblit/tests/LuceneExecutorTest.java | 9 +++++++--
tests/com/gitblit/tests/LdapUserServiceTest.java | 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/tests/com/gitblit/tests/LdapUserServiceTest.java b/tests/com/gitblit/tests/LdapUserServiceTest.java
index 390fa00..ffe8264 100644
--- a/tests/com/gitblit/tests/LdapUserServiceTest.java
+++ b/tests/com/gitblit/tests/LdapUserServiceTest.java
@@ -68,7 +68,7 @@
}
private MemorySettings getSettings() {
- Map<Object, Object> backingMap = new HashMap<Object, Object>();
+ Map<String, Object> backingMap = new HashMap<String, Object>();
backingMap.put("realm.ldap.server", "ldap://localhost:" + ldapPort);
backingMap.put("realm.ldap.domain", "");
backingMap.put("realm.ldap.username", "cn=Directory Manager");
diff --git a/tests/com/gitblit/tests/LuceneExecutorTest.java b/tests/com/gitblit/tests/LuceneExecutorTest.java
index 21454fe..6b45b9f 100644
--- a/tests/com/gitblit/tests/LuceneExecutorTest.java
+++ b/tests/com/gitblit/tests/LuceneExecutorTest.java
@@ -20,7 +20,9 @@
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.eclipse.jgit.lib.Repository;
import org.junit.Test;
@@ -29,6 +31,7 @@
import com.gitblit.models.RefModel;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.SearchResult;
+import com.gitblit.tests.mock.MemorySettings;
import com.gitblit.utils.FileUtils;
import com.gitblit.utils.JGitUtils;
@@ -41,7 +44,9 @@
public class LuceneExecutorTest {
private LuceneExecutor newLuceneExecutor() {
- return new LuceneExecutor(null, GitBlitSuite.REPOSITORIES);
+ Map<String, Object> map = new HashMap<String, Object>();
+ MemorySettings settings = new MemorySettings(map);
+ return new LuceneExecutor(settings, GitBlitSuite.REPOSITORIES);
}
private RepositoryModel newRepositoryModel(Repository repository) {
@@ -164,7 +169,7 @@
@Test
public void testDeleteBlobFromIndex() throws Exception {
// start with a fresh reindex of entire repository
- LuceneExecutor lucene = new LuceneExecutor(null, GitBlitSuite.REPOSITORIES);
+ LuceneExecutor lucene = newLuceneExecutor();
Repository repository = GitBlitSuite.getHelloworldRepository();
RepositoryModel model = newRepositoryModel(repository);
lucene.reindex(model, repository);
diff --git a/tests/com/gitblit/tests/mock/MemorySettings.java b/tests/com/gitblit/tests/mock/MemorySettings.java
index 8b55935..1b3e238 100644
--- a/tests/com/gitblit/tests/mock/MemorySettings.java
+++ b/tests/com/gitblit/tests/mock/MemorySettings.java
@@ -23,9 +23,9 @@
public class MemorySettings extends IStoredSettings {
- private Map<Object, Object> backingMap;
+ private Map<String, Object> backingMap;
- public MemorySettings(Map<Object, Object> backingMap) {
+ public MemorySettings(Map<String, Object> backingMap) {
super(MemorySettings.class);
this.backingMap = backingMap;
}
@@ -39,7 +39,7 @@
}
public void put(Object key, Object value) {
- backingMap.put(key, value);
+ backingMap.put(key.toString(), value);
}
@Override
--
Gitblit v1.9.1