diff options
| author | James Moger <james.moger@gitblit.com> | 2012-03-09 20:45:52 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-03-09 20:45:52 -0500 |
| commit | 3d0494ad6db80843add9bf9d6eac783a691ac5a1 (patch) | |
| tree | 2b2322ce73622f777da8e017986f07d746fc5d4e /tests/com | |
| parent | 9357e929bdc1237577b6f6302861dce0e9d1e39c (diff) | |
| download | gitblit-3d0494ad6db80843add9bf9d6eac783a691ac5a1.tar.gz gitblit-3d0494ad6db80843add9bf9d6eac783a691ac5a1.zip | |
More Lucene progress
Diffstat (limited to 'tests/com')
| -rw-r--r-- | tests/com/gitblit/tests/IssuesTest.java | 7 | ||||
| -rw-r--r-- | tests/com/gitblit/tests/LuceneUtilsTest.java | 17 |
2 files changed, 17 insertions, 7 deletions
diff --git a/tests/com/gitblit/tests/IssuesTest.java b/tests/com/gitblit/tests/IssuesTest.java index 92952119..eb7b66dd 100644 --- a/tests/com/gitblit/tests/IssuesTest.java +++ b/tests/com/gitblit/tests/IssuesTest.java @@ -36,6 +36,7 @@ import com.gitblit.models.SearchResult; import com.gitblit.utils.IssueUtils;
import com.gitblit.utils.IssueUtils.IssueFilter;
import com.gitblit.utils.LuceneUtils;
+import com.gitblit.utils.StringUtils;
/**
* Tests the mechanics of distributed issue management on the gb-issues branch.
@@ -48,6 +49,8 @@ public class IssuesTest { @Test
public void testLifecycle() throws Exception {
Repository repository = GitBlitSuite.getIssuesTestRepository();
+ String name = StringUtils.getRelativePath(GitBlitSuite.REPOSITORIES.getAbsolutePath(),
+ repository.getDirectory().getAbsolutePath());
// create and insert an issue
Change c1 = newChange("testCreation() " + Long.toHexString(System.currentTimeMillis()));
@@ -128,7 +131,7 @@ public class IssuesTest { // build a new Lucene index
LuceneUtils.deleteIndex(repository);
for (IssueModel anIssue : allIssues) {
- LuceneUtils.index(repository, anIssue);
+ LuceneUtils.index(name, repository, anIssue);
}
List<SearchResult> hits = LuceneUtils.search("working", 10, repository);
assertTrue(hits.size() > 0);
@@ -139,7 +142,7 @@ public class IssuesTest { change.comment("this is a test of reindexing an issue");
IssueUtils.updateIssue(repository, issue.id, change);
issue = IssueUtils.getIssue(repository, issue.id);
- LuceneUtils.index(repository, issue);
+ LuceneUtils.index(name, repository, issue);
// delete all issues
for (IssueModel anIssue : allIssues) {
diff --git a/tests/com/gitblit/tests/LuceneUtilsTest.java b/tests/com/gitblit/tests/LuceneUtilsTest.java index 5e388237..53710090 100644 --- a/tests/com/gitblit/tests/LuceneUtilsTest.java +++ b/tests/com/gitblit/tests/LuceneUtilsTest.java @@ -24,6 +24,7 @@ import org.junit.Test; import com.gitblit.models.SearchResult;
import com.gitblit.utils.LuceneUtils;
+import com.gitblit.utils.StringUtils;
/**
* Tests Lucene indexing and querying.
@@ -37,19 +38,25 @@ public class LuceneUtilsTest { public void testFullIndex() throws Exception {
// reindex helloworld
Repository repository = GitBlitSuite.getHelloworldRepository();
- LuceneUtils.reindex(repository);
+ String name = StringUtils.getRelativePath(GitBlitSuite.REPOSITORIES.getAbsolutePath(),
+ repository.getDirectory().getAbsolutePath());
+ LuceneUtils.reindex(name, repository, false);
repository.close();
// reindex theoretical physics
repository = GitBlitSuite.getTheoreticalPhysicsRepository();
- LuceneUtils.reindex(repository);
+ name = StringUtils.getRelativePath(GitBlitSuite.REPOSITORIES.getAbsolutePath(),
+ repository.getDirectory().getAbsolutePath());
+ LuceneUtils.reindex(name, repository, false);
repository.close();
-
+
// reindex JGit
repository = GitBlitSuite.getJGitRepository();
- LuceneUtils.reindex(repository);
+ name = StringUtils.getRelativePath(GitBlitSuite.REPOSITORIES.getAbsolutePath(),
+ repository.getDirectory().getAbsolutePath());
+ LuceneUtils.reindex(name, repository, false);
repository.close();
-
+
LuceneUtils.close();
}
|