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 | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/tests/com/gitblit/tests/LuceneUtilsTest.java b/tests/com/gitblit/tests/LuceneUtilsTest.java
index 3b21e71..01858f5 100644
--- a/tests/com/gitblit/tests/LuceneUtilsTest.java
+++ b/tests/com/gitblit/tests/LuceneUtilsTest.java
@@ -35,42 +35,32 @@
public class LuceneUtilsTest {
@Test
- public void testQuickIndex() throws Exception {
+ public void testIndex() throws Exception {
// reindex helloworld
Repository repository = GitBlitSuite.getHelloworldRepository();
String name = StringUtils.getRelativePath(GitBlitSuite.REPOSITORIES.getAbsolutePath(),
repository.getDirectory().getAbsolutePath());
- LuceneUtils.reindex(name, repository, false);
+ 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();
name = StringUtils.getRelativePath(GitBlitSuite.REPOSITORIES.getAbsolutePath(),
repository.getDirectory().getAbsolutePath());
- LuceneUtils.reindex(name, repository, false);
+ LuceneUtils.reindex(name, repository);
repository.close();
// reindex JGit
repository = GitBlitSuite.getJGitRepository();
name = StringUtils.getRelativePath(GitBlitSuite.REPOSITORIES.getAbsolutePath(),
repository.getDirectory().getAbsolutePath());
- LuceneUtils.reindex(name, repository, false);
+ LuceneUtils.reindex(name, repository);
repository.close();
- LuceneUtils.close();
- }
-
- @Test
- public void testFullIndex() throws Exception {
- // reindex helloworld
- Repository repository = GitBlitSuite.getHelloworldRepository();
- String name = StringUtils.getRelativePath(GitBlitSuite.REPOSITORIES.getAbsolutePath(),
- repository.getDirectory().getAbsolutePath());
- LuceneUtils.reindex(name, repository, true);
- SearchResult result = LuceneUtils.search("type:blob AND id:bit.bit", 1, repository).get(0);
- repository.close();
- assertEquals("Mike Donaghy", result.author);
- //assertEquals("Mike Donaghy", result.date);
LuceneUtils.close();
}
@@ -92,24 +82,24 @@
// 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);
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();
--
Gitblit v1.9.1