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 | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/HtpasswdUserServiceTest.java b/src/test/java/com/gitblit/tests/HtpasswdUserServiceTest.java
index b5f85cd..282debb 100644
--- a/src/test/java/com/gitblit/tests/HtpasswdUserServiceTest.java
+++ b/src/test/java/com/gitblit/tests/HtpasswdUserServiceTest.java
@@ -1,10 +1,19 @@
+/*
+ * Copyright 2013 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
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;
@@ -19,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";
@@ -63,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)));
}
@@ -77,7 +87,8 @@
{
File dir = new File(RESOURCE_DIR);
FilenameFilter filter = new FilenameFilter() {
- public boolean accept(File dir, String file) {
+ @Override
+ public boolean accept(File dir, String file) {
return file.endsWith(".in");
}
};
@@ -92,7 +103,8 @@
{
File dir = new File(RESOURCE_DIR);
FilenameFilter filter = new FilenameFilter() {
- public boolean accept(File dir, String file) {
+ @Override
+ public boolean accept(File dir, String file) {
return !(file.endsWith(".in"));
}
};
--
Gitblit v1.9.1