From 43e32ec71a508e1bb68b247fdca74f64bcf629b3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 28 Feb 2012 22:41:31 -0500
Subject: [PATCH] Draft integration of Lucene search mechanism and web ui
---
tests/com/gitblit/tests/LuceneUtilsTest.java | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/tests/com/gitblit/tests/LuceneUtilsTest.java b/tests/com/gitblit/tests/LuceneUtilsTest.java
index a544621..5e38823 100644
--- a/tests/com/gitblit/tests/LuceneUtilsTest.java
+++ b/tests/com/gitblit/tests/LuceneUtilsTest.java
@@ -37,17 +37,17 @@
public void testFullIndex() throws Exception {
// reindex helloworld
Repository repository = GitBlitSuite.getHelloworldRepository();
- LuceneUtils.index(repository);
+ LuceneUtils.reindex(repository);
repository.close();
// reindex theoretical physics
repository = GitBlitSuite.getTheoreticalPhysicsRepository();
- LuceneUtils.index(repository);
+ LuceneUtils.reindex(repository);
repository.close();
- // reindex bluez-gnome
- repository = GitBlitSuite.getBluezGnomeRepository();
- LuceneUtils.index(repository);
+ // reindex JGit
+ repository = GitBlitSuite.getJGitRepository();
+ LuceneUtils.reindex(repository);
repository.close();
LuceneUtils.close();
@@ -59,6 +59,9 @@
Repository repository = GitBlitSuite.getHelloworldRepository();
List<SearchResult> results = LuceneUtils.search("ada", 10, repository);
assertEquals(2, results.size());
+ for (SearchResult res : results) {
+ assertEquals("refs/heads/master", res.branch);
+ }
// author test
results = LuceneUtils.search("author: tinogomes", 10, repository);
@@ -76,14 +79,8 @@
assertEquals(1, results.size());
assertEquals("Ondrej Certik", results.get(0).author);
assertEquals("2648c0c98f2101180715b4d432fc58d0e21a51d7", results.get(0).id);
+ assertEquals("refs/heads/gh-pages", results.get(0).branch);
- // tag test
- results = LuceneUtils.search("\"qft split\"", 10, repository);
- assertEquals(1, results.size());
- assertEquals("Ondrej Certik", results.get(0).author);
- assertEquals("57c4f26f157ece24b02f4f10f5f68db1d2ce7ff5", results.get(0).id);
- assertEquals("[1st-edition]", results.get(0).labels.toString());
-
results = LuceneUtils.search("type:blob AND \"src/intro.rst\"", 10, repository);
assertEquals(4, results.size());
@@ -97,10 +94,10 @@
repository.close();
// annotated tag test
- repository = GitBlitSuite.getBluezGnomeRepository();
- results = LuceneUtils.search("\"release 1.8\"", 10, repository);
+ repository = GitBlitSuite.getJGitRepository();
+ results = LuceneUtils.search("I663208919f297836a9c16bf458e4a43ffaca4c12", 10, repository);
assertEquals(1, results.size());
- assertEquals("[1.8]", results.get(0).labels.toString());
+ assertEquals("[v1.3.0.201202151440-r]", results.get(0).labels.toString());
repository.close();
@@ -111,7 +108,7 @@
public void testMultiSearch() throws Exception {
List<SearchResult> results = LuceneUtils.search("test", 10,
GitBlitSuite.getHelloworldRepository(),
- GitBlitSuite.getBluezGnomeRepository());
+ GitBlitSuite.getJGitRepository());
LuceneUtils.close();
assertEquals(10, results.size());
}
--
Gitblit v1.9.1