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/de/akquinet/devops/GitBlitServer4UITests.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/test/java/de/akquinet/devops/GitBlitServer4UITests.java b/src/test/java/de/akquinet/devops/GitBlitServer4UITests.java
index 2d54be2..8d6d703 100644
--- a/src/test/java/de/akquinet/devops/GitBlitServer4UITests.java
+++ b/src/test/java/de/akquinet/devops/GitBlitServer4UITests.java
@@ -1,12 +1,16 @@
package de.akquinet.devops;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import com.beust.jcommander.JCommander;
-import com.beust.jcommander.ParameterException;
-import com.gitblit.GitBlit;
+import org.kohsuke.args4j.CmdLineException;
+import org.kohsuke.args4j.CmdLineParser;
+
import com.gitblit.GitBlitServer;
+import com.gitblit.IStoredSettings;
+import com.gitblit.Keys;
+import com.gitblit.servlet.GitblitContext;
public class GitBlitServer4UITests extends GitBlitServer {
@@ -33,14 +37,14 @@
Params.baseFolder = folder;
Params params = new Params();
- JCommander jc = new JCommander(params);
+ CmdLineParser parser = new CmdLineParser(params);
try {
- jc.parse(filtered.toArray(new String[filtered.size()]));
+ parser.parseArgument(filtered);
if (params.help) {
- server.usage(jc, null);
+ server.usage(parser, null);
}
- } catch (ParameterException t) {
- server.usage(jc, t);
+ } catch (CmdLineException t) {
+ server.usage(parser, t);
}
if (params.stop) {
@@ -50,13 +54,9 @@
}
}
- private GitBlit4UITests instance;
-
@Override
- protected GitBlit getGitBlitInstance() {
- if (instance == null) {
- instance = new GitBlit4UITests(false);
- }
- return instance;
+ protected GitblitContext newGitblit(IStoredSettings settings, File baseFolder) {
+ settings.overrideSetting(Keys.web.allowLuceneIndexing, false);
+ return new GitblitContext(settings, baseFolder);
}
}
--
Gitblit v1.9.1