From d6372fccccce790d8a75fc447510c1437f55e653 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sat, 14 Jul 2012 00:26:58 -0400 Subject: [PATCH] Reset build identifiers for the next release --- tests/com/gitblit/tests/LuceneExecutorTest.java | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/tests/com/gitblit/tests/LuceneExecutorTest.java b/tests/com/gitblit/tests/LuceneExecutorTest.java index d221744..21454fe 100644 --- a/tests/com/gitblit/tests/LuceneExecutorTest.java +++ b/tests/com/gitblit/tests/LuceneExecutorTest.java @@ -16,6 +16,8 @@ package com.gitblit.tests; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; @@ -27,8 +29,8 @@ import com.gitblit.models.RefModel; import com.gitblit.models.RepositoryModel; import com.gitblit.models.SearchResult; +import com.gitblit.utils.FileUtils; import com.gitblit.utils.JGitUtils; -import com.gitblit.utils.StringUtils; /** * Tests Lucene indexing and querying. @@ -44,8 +46,7 @@ private RepositoryModel newRepositoryModel(Repository repository) { RepositoryModel model = new RepositoryModel(); - model.name = StringUtils.getRelativePath(GitBlitSuite.REPOSITORIES.getAbsolutePath(), - repository.getDirectory().getAbsolutePath()); + model.name = FileUtils.getRelativePath(GitBlitSuite.REPOSITORIES, repository.getDirectory()); model.hasCommits = JGitUtils.hasCommits(repository); // index all local branches @@ -159,4 +160,17 @@ lucene.close(); assertEquals(10, results.size()); } + + @Test + public void testDeleteBlobFromIndex() throws Exception { + // start with a fresh reindex of entire repository + LuceneExecutor lucene = new LuceneExecutor(null, GitBlitSuite.REPOSITORIES); + Repository repository = GitBlitSuite.getHelloworldRepository(); + RepositoryModel model = newRepositoryModel(repository); + lucene.reindex(model, repository); + + // now delete a blob + assertTrue(lucene.deleteBlob(model.name, "refs/heads/master", "java.java")); + assertFalse(lucene.deleteBlob(model.name, "refs/heads/master", "java.java")); + } } \ No newline at end of file -- Gitblit v1.9.1