Refactor user services and separate authentication (issue-281)

James Moger

2013-11-24 04a98505a4ab8f48aee22800fcac193d9367d0ae

 src/test/java/com/gitblit/tests/LuceneExecutorTest.java

@@ -16,19 +16,21 @@
package com.gitblit.tests;



import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



import org.eclipse.jgit.lib.Repository;

import org.junit.After;

import org.junit.Before;

import org.junit.Test;



import com.gitblit.LuceneExecutor;

import com.gitblit.Keys;

import com.gitblit.manager.RepositoryManager;

import com.gitblit.manager.RuntimeManager;

import com.gitblit.manager.UserManager;

import com.gitblit.models.RefModel;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.SearchResult;

import com.gitblit.service.LuceneService;

import com.gitblit.tests.mock.MemorySettings;

import com.gitblit.utils.FileUtils;

import com.gitblit.utils.JGitUtils;

@@ -41,12 +43,15 @@
 */

public class LuceneExecutorTest extends GitblitUnitTest {



   LuceneExecutor lucene;

   LuceneService lucene;



   private LuceneExecutor newLuceneExecutor() {

      Map<String, Object> map = new HashMap<String, Object>();

      MemorySettings settings = new MemorySettings(map);

      return new LuceneExecutor(settings, GitBlitSuite.REPOSITORIES);

   private LuceneService newLuceneExecutor() {

      MemorySettings settings = new MemorySettings();

      settings.put(Keys.git.repositoriesFolder, GitBlitSuite.REPOSITORIES);

      RuntimeManager runtime = new RuntimeManager(settings, GitBlitSuite.BASEFOLDER).start();

      UserManager users = new UserManager(runtime).start();

      RepositoryManager repos = new RepositoryManager(runtime, users);

      return new LuceneService(settings, repos);

   }



   private RepositoryModel newRepositoryModel(Repository repository) {

@@ -73,7 +78,7 @@
   }



   @Test

   public void testIndex() throws Exception {

   public void testIndex() {

      // reindex helloworld

      Repository repository = GitBlitSuite.getHelloworldRepository();

      RepositoryModel model = newRepositoryModel(repository);