From a5c920e5d616082f9de101ce960068ec3e512a1f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 14 Mar 2012 16:21:56 -0400
Subject: [PATCH] Replaced "committed" with "authored" on activity page
---
tests/com/gitblit/tests/LuceneUtilsTest.java | 54 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/tests/com/gitblit/tests/LuceneUtilsTest.java b/tests/com/gitblit/tests/LuceneUtilsTest.java
index a544621..01858f5 100644
--- a/tests/com/gitblit/tests/LuceneUtilsTest.java
+++ b/tests/com/gitblit/tests/LuceneUtilsTest.java
@@ -24,6 +24,7 @@
import com.gitblit.models.SearchResult;
import com.gitblit.utils.LuceneUtils;
+import com.gitblit.utils.StringUtils;
/**
* Tests Lucene indexing and querying.
@@ -34,22 +35,32 @@
public class LuceneUtilsTest {
@Test
- public void testFullIndex() throws Exception {
+ public void testIndex() throws Exception {
// reindex helloworld
Repository repository = GitBlitSuite.getHelloworldRepository();
- LuceneUtils.index(repository);
+ String name = StringUtils.getRelativePath(GitBlitSuite.REPOSITORIES.getAbsolutePath(),
+ repository.getDirectory().getAbsolutePath());
+ LuceneUtils.reindex(name, repository);
+ SearchResult result = LuceneUtils.search("type:blob AND path:bit.bit", 1, repository).get(0);
+ assertEquals("Mike Donaghy", result.author);
+ result = LuceneUtils.search("type:blob AND path:clipper.prg", 1, repository).get(0);
+ assertEquals("tinogomes", result.author);
repository.close();
// reindex theoretical physics
repository = GitBlitSuite.getTheoreticalPhysicsRepository();
- LuceneUtils.index(repository);
+ name = StringUtils.getRelativePath(GitBlitSuite.REPOSITORIES.getAbsolutePath(),
+ repository.getDirectory().getAbsolutePath());
+ LuceneUtils.reindex(name, repository);
repository.close();
-
- // reindex bluez-gnome
- repository = GitBlitSuite.getBluezGnomeRepository();
- LuceneUtils.index(repository);
+
+ // reindex JGit
+ repository = GitBlitSuite.getJGitRepository();
+ name = StringUtils.getRelativePath(GitBlitSuite.REPOSITORIES.getAbsolutePath(),
+ repository.getDirectory().getAbsolutePath());
+ LuceneUtils.reindex(name, repository);
repository.close();
-
+
LuceneUtils.close();
}
@@ -59,6 +70,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);
@@ -68,39 +82,33 @@
// blob test
results = LuceneUtils.search("type: blob AND \"import std.stdio\"", 10, repository);
assertEquals(1, results.size());
- assertEquals("d.D", results.get(0).id);
+ assertEquals("d.D", results.get(0).path);
// 1 occurrence on the gh-pages branch
repository = GitBlitSuite.getTheoreticalPhysicsRepository();
results = LuceneUtils.search("\"add the .nojekyll file\"", 10, repository);
assertEquals(1, results.size());
assertEquals("Ondrej Certik", results.get(0).author);
- assertEquals("2648c0c98f2101180715b4d432fc58d0e21a51d7", results.get(0).id);
+ assertEquals("2648c0c98f2101180715b4d432fc58d0e21a51d7", results.get(0).commitId);
+ 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());
// hash id tests
- results = LuceneUtils.search("id:57c4f26f157ece24b02f4f10f5f68db1d2ce7ff5", 10, repository);
+ results = LuceneUtils.search("commit:57c4f26f157ece24b02f4f10f5f68db1d2ce7ff5", 10, repository);
assertEquals(1, results.size());
- results = LuceneUtils.search("id:57c4f26f157*", 10, repository);
+ results = LuceneUtils.search("commit:57c4f26f157*", 10, repository);
assertEquals(1, results.size());
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 +119,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