From eb0f7ea03074bb45c67d2ad877af3c5c85e6b3fc Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 03 Mar 2014 11:33:24 -0500
Subject: [PATCH] Fix compare page exception when a submodule changes (issue-375)
---
src/test/java/com/gitblit/tests/GitBlitSuite.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/GitBlitSuite.java b/src/test/java/com/gitblit/tests/GitBlitSuite.java
index f623032..9fe7312 100644
--- a/src/test/java/com/gitblit/tests/GitBlitSuite.java
+++ b/src/test/java/com/gitblit/tests/GitBlitSuite.java
@@ -33,11 +33,11 @@
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
-import com.gitblit.GitBlit;
import com.gitblit.GitBlitException;
import com.gitblit.GitBlitServer;
import com.gitblit.manager.IRepositoryManager;
import com.gitblit.models.RepositoryModel;
+import com.gitblit.servlet.GitblitContext;
import com.gitblit.utils.JGitUtils;
/**
@@ -56,14 +56,17 @@
@RunWith(Suite.class)
@SuiteClasses({ ArrayUtilsTest.class, FileUtilsTest.class, TimeUtilsTest.class,
StringUtilsTest.class, Base64Test.class, JsonUtilsTest.class, ByteFormatTest.class,
- ObjectCacheTest.class, PermissionsTest.class, UserServiceTest.class, LdapUserServiceTest.class,
+ UserModelTest.class, UserChoiceTest.class,
+ ObjectCacheTest.class, PermissionsTest.class, UserServiceTest.class, LdapAuthenticationTest.class,
MarkdownUtilsTest.class, JGitUtilsTest.class, SyndicationUtilsTest.class,
DiffUtilsTest.class, MetricUtilsTest.class, X509UtilsTest.class,
GitBlitTest.class, FederationTests.class, RpcTests.class, GitServletTest.class, GitDaemonTest.class,
GroovyScriptTest.class, LuceneExecutorTest.class, RepositoryModelTest.class,
- FanoutServiceTest.class, Issue0259Test.class, Issue0271Test.class, HtpasswdUserServiceTest.class,
- ModelUtilsTest.class, JnaUtilsTest.class })
+ FanoutServiceTest.class, Issue0259Test.class, Issue0271Test.class, HtpasswdAuthenticationTest.class,
+ ModelUtilsTest.class, JnaUtilsTest.class, LdapSyncServiceTest.class })
public class GitBlitSuite {
+
+ public static final File BASEFOLDER = new File("data");
public static final File REPOSITORIES = new File("data/git");
@@ -83,30 +86,35 @@
private static AtomicBoolean started = new AtomicBoolean(false);
- public static Repository getHelloworldRepository() throws Exception {
+ public static Repository getHelloworldRepository() {
return getRepository("helloworld.git");
}
- public static Repository getTicgitRepository() throws Exception {
+ public static Repository getTicgitRepository() {
return getRepository("ticgit.git");
}
- public static Repository getJGitRepository() throws Exception {
+ public static Repository getJGitRepository() {
return getRepository("test/jgit.git");
}
- public static Repository getAmbitionRepository() throws Exception {
+ public static Repository getAmbitionRepository() {
return getRepository("test/ambition.git");
}
- public static Repository getGitectiveRepository() throws Exception {
+ public static Repository getGitectiveRepository() {
return getRepository("test/gitective.git");
}
- private static Repository getRepository(String name) throws Exception {
- File gitDir = FileKey.resolve(new File(REPOSITORIES, name), FS.DETECTED);
- Repository repository = new FileRepositoryBuilder().setGitDir(gitDir).build();
- return repository;
+ private static Repository getRepository(String name) {
+ try {
+ File gitDir = FileKey.resolve(new File(REPOSITORIES, name), FS.DETECTED);
+ Repository repository = new FileRepositoryBuilder().setGitDir(gitDir).build();
+ return repository;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
}
public static boolean startGitblit() throws Exception {
@@ -180,7 +188,7 @@
private static void showRemoteBranches(String repositoryName) {
try {
- IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);
+ IRepositoryManager repositoryManager = GitblitContext.getManager(IRepositoryManager.class);
RepositoryModel model = repositoryManager.getRepositoryModel(repositoryName);
model.showRemoteBranches = true;
repositoryManager.updateRepositoryModel(model.name, model, false);
@@ -191,7 +199,7 @@
private static void automaticallyTagBranchTips(String repositoryName) {
try {
- IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);
+ IRepositoryManager repositoryManager = GitblitContext.getManager(IRepositoryManager.class);
RepositoryModel model = repositoryManager.getRepositoryModel(repositoryName);
model.useIncrementalPushTags = true;
repositoryManager.updateRepositoryModel(model.name, model, false);
--
Gitblit v1.9.1