From aa6d43e8b28ff73d69a920e9b3a7b284cfce00c3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:51 -0500
Subject: [PATCH] Extract SessionManager from GitBlit singleton
---
src/test/java/com/gitblit/tests/HtpasswdUserServiceTest.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/HtpasswdUserServiceTest.java b/src/test/java/com/gitblit/tests/HtpasswdUserServiceTest.java
index e223e6b..282debb 100644
--- a/src/test/java/com/gitblit/tests/HtpasswdUserServiceTest.java
+++ b/src/test/java/com/gitblit/tests/HtpasswdUserServiceTest.java
@@ -15,12 +15,6 @@
*/
package com.gitblit.tests;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException;
@@ -34,13 +28,14 @@
import com.gitblit.HtpasswdUserService;
import com.gitblit.models.UserModel;
import com.gitblit.tests.mock.MemorySettings;
+import com.gitblit.tests.mock.MockRuntimeManager;
import com.gitblit.utils.StringUtils;
/**
* Test the Htpasswd user service.
*
*/
-public class HtpasswdUserServiceTest {
+public class HtpasswdUserServiceTest extends GitblitUnitTest {
private static final String RESOURCE_DIR = "src/test/resources/htpasswdUSTest/";
private static final String KEY_SUPPORT_PLAINTEXT_PWD = "realm.htpasswd.supportPlaintextPasswords";
@@ -78,13 +73,13 @@
private void setupUS()
{
htpwdUserService = new HtpasswdUserService();
- htpwdUserService.setup(getSettings());
+ htpwdUserService.setup(new MockRuntimeManager(getSettings()));
}
private void setupUS(boolean overrideLA)
{
htpwdUserService = new HtpasswdUserService();
- htpwdUserService.setup(getSettings(overrideLA));
+ htpwdUserService.setup(new MockRuntimeManager(getSettings(overrideLA)));
}
--
Gitblit v1.9.1