Fixed broken Lucene blob delete

2 files changed, 20 insertions, 3 deletions

diff --git a/tests/com/gitblit/tests/IssuesTest.java b/tests/com/gitblit/tests/IssuesTest.java
index 11f95514..54cac335 100644
--- a/tests/com/gitblit/tests/IssuesTest.java
+++ b/tests/com/gitblit/tests/IssuesTest.java
@@ -134,7 +134,7 @@ public class IssuesTest {
 			lucene.index(name, anIssue);

 		}

 		List<SearchResult> hits = lucene.search("working", 1, 10, name);

-		assertTrue(hits.size() > 0);

+		assertTrue(hits.size() == 1);

 		

 		// reindex an issue

 		issue = allIssues.get(0);

@@ -144,6 +144,10 @@ public class IssuesTest {
 		issue = IssueUtils.getIssue(repository, issue.id);

 		lucene.index(name, issue);

 

+		hits = lucene.search("working", 1, 10, name);

+		assertTrue(hits.size() == 1);

+

+		

 		// delete all issues

 		for (IssueModel anIssue : allIssues) {

 			assertTrue(IssueUtils.deleteIssue(repository, anIssue.id, "D"));

diff --git a/tests/com/gitblit/tests/LuceneExecutorTest.java b/tests/com/gitblit/tests/LuceneExecutorTest.java
index ec81fd8e..21454fe4 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;

@@ -23,14 +25,12 @@ import java.util.List;
 import org.eclipse.jgit.lib.Repository;

 import org.junit.Test;

 

-import com.gitblit.GitBlit;

 import com.gitblit.LuceneExecutor;

 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.

@@ -160,4 +160,17 @@ public class LuceneExecutorTest {
 		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