Made LucenePage stateless

James Moger

2012-03-13 7d97c619b1c067f971cfe0fda2ca8a56eef1a316

 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.reindex(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.reindex(repository);

      name = StringUtils.getRelativePath(GitBlitSuite.REPOSITORIES.getAbsolutePath(),

            repository.getDirectory().getAbsolutePath());

      LuceneUtils.reindex(name, repository);

      repository.close();



		
      // reindex JGit

      repository = GitBlitSuite.getJGitRepository();

      LuceneUtils.reindex(repository);

      name = StringUtils.getRelativePath(GitBlitSuite.REPOSITORIES.getAbsolutePath(),

            repository.getDirectory().getAbsolutePath());

      LuceneUtils.reindex(name, repository);

      repository.close();



		
      LuceneUtils.close();

   }



@@ -71,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();