From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java b/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
index b42d29a..8897ef7 100644
--- a/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
+++ b/src/test/java/com/gitblit/tests/mock/MockRuntimeManager.java
@@ -17,15 +17,20 @@
import java.io.File;
import java.util.Date;
+import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
import com.gitblit.Constants;
import com.gitblit.IStoredSettings;
+import com.gitblit.manager.IManager;
import com.gitblit.manager.IRuntimeManager;
import com.gitblit.models.ServerSettings;
import com.gitblit.models.ServerStatus;
import com.gitblit.models.SettingModel;
+import com.gitblit.utils.XssFilter;
+import com.gitblit.utils.XssFilter.AllowXssFilter;
+import com.google.inject.Injector;
public class MockRuntimeManager implements IRuntimeManager {
@@ -48,10 +53,15 @@
public MockRuntimeManager(IStoredSettings settings) {
this.settings = settings;
- this.serverStatus = new ServerStatus(true);
+ this.serverStatus = new ServerStatus();
this.serverStatus.servletContainer = "MockServer";
this.serverSettings = new ServerSettings();
+ }
+
+ @Override
+ public Injector getInjector() {
+ return null;
}
@Override
@@ -70,8 +80,8 @@
}
@Override
- public boolean isServingRepositories() {
- return true;
+ public Locale getLocale() {
+ return Locale.getDefault();
}
@Override
@@ -126,8 +136,22 @@
}
@Override
+ public XssFilter getXssFilter() {
+ return new AllowXssFilter();
+ }
+
+ @Override
public boolean updateSettings(Map<String, String> updatedSettings) {
return settings.saveSettings(updatedSettings);
}
+ @Override
+ public IManager stop() {
+ return this;
+ }
+
+ @Override
+ public IRuntimeManager start() {
+ return this;
+ }
}
--
Gitblit v1.9.1