From a3a18a0ebfeb65777ad5bd065e26fa9c00e8100c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gmail.com>
Date: Sat, 10 Oct 2015 08:13:12 -0400
Subject: [PATCH] Merge pull request #921 from paulsputer/git-lfs-support
---
src/test/java/com/gitblit/tests/GitblitUnitTest.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/GitblitUnitTest.java b/src/test/java/com/gitblit/tests/GitblitUnitTest.java
index fc70e10..58bc60e 100644
--- a/src/test/java/com/gitblit/tests/GitblitUnitTest.java
+++ b/src/test/java/com/gitblit/tests/GitblitUnitTest.java
@@ -15,16 +15,17 @@
*/
package com.gitblit.tests;
-import com.gitblit.GitBlit;
import com.gitblit.IStoredSettings;
+import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.manager.IFederationManager;
-import com.gitblit.manager.IGitblitManager;
+import com.gitblit.manager.IFilestoreManager;
+import com.gitblit.manager.IGitblit;
import com.gitblit.manager.INotificationManager;
import com.gitblit.manager.IProjectManager;
import com.gitblit.manager.IRepositoryManager;
import com.gitblit.manager.IRuntimeManager;
-import com.gitblit.manager.ISessionManager;
import com.gitblit.manager.IUserManager;
+import com.gitblit.servlet.GitblitContext;
public class GitblitUnitTest extends org.junit.Assert {
@@ -34,34 +35,38 @@
}
public static IRuntimeManager runtime() {
- return GitBlit.getManager(IRuntimeManager.class);
+ return GitblitContext.getManager(IRuntimeManager.class);
}
public static INotificationManager notifier() {
- return GitBlit.getManager(INotificationManager.class);
+ return GitblitContext.getManager(INotificationManager.class);
}
public static IUserManager users() {
- return GitBlit.getManager(IUserManager.class);
+ return GitblitContext.getManager(IUserManager.class);
}
- public static ISessionManager session() {
- return GitBlit.getManager(ISessionManager.class);
+ public static IAuthenticationManager authentication() {
+ return GitblitContext.getManager(IAuthenticationManager.class);
}
public static IRepositoryManager repositories() {
- return GitBlit.getManager(IRepositoryManager.class);
+ return GitblitContext.getManager(IRepositoryManager.class);
}
public static IProjectManager projects() {
- return GitBlit.getManager(IProjectManager.class);
+ return GitblitContext.getManager(IProjectManager.class);
}
public static IFederationManager federation() {
- return GitBlit.getManager(IFederationManager.class);
+ return GitblitContext.getManager(IFederationManager.class);
}
- public static IGitblitManager gitblit() {
- return GitBlit.getManager(IGitblitManager.class);
+ public static IGitblit gitblit() {
+ return GitblitContext.getManager(IGitblit.class);
+ }
+
+ public static IFilestoreManager filestore() {
+ return GitblitContext.getManager(IFilestoreManager.class);
}
}
--
Gitblit v1.9.1