From a568f2ac97f4c7b73ee0cdf2007f553bb8c81c2c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Nov 2011 08:10:19 -0500
Subject: [PATCH] Refresh log on display. Adjusted spacing of status panel.
---
tests/com/gitblit/tests/GitBlitSuite.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/tests/com/gitblit/tests/GitBlitSuite.java b/tests/com/gitblit/tests/GitBlitSuite.java
index bbf7c4b..ad87cb0 100644
--- a/tests/com/gitblit/tests/GitBlitSuite.java
+++ b/tests/com/gitblit/tests/GitBlitSuite.java
@@ -16,6 +16,7 @@
package com.gitblit.tests;
import java.io.File;
+import java.util.concurrent.Executors;
import junit.extensions.TestSetup;
import junit.framework.Test;
@@ -24,15 +25,24 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.storage.file.FileRepository;
-import com.gitblit.FileUserService;
import com.gitblit.FileSettings;
+import com.gitblit.FileUserService;
import com.gitblit.GitBlit;
import com.gitblit.GitBlitException;
+import com.gitblit.GitBlitServer;
import com.gitblit.models.RepositoryModel;
import com.gitblit.utils.JGitUtils;
public class GitBlitSuite extends TestSetup {
+
public static final File REPOSITORIES = new File("git");
+
+ static int port = 8280;
+ static int shutdownPort = 8281;
+
+ public static String url = "http://localhost:" + port;
+ public static String account = "admin";
+ public static String password = "admin";
private GitBlitSuite(TestSuite suite) {
super(suite);
@@ -40,9 +50,13 @@
public static Test suite() {
TestSuite suite = new TestSuite();
+ suite.addTestSuite(FileUtilsTest.class);
suite.addTestSuite(TimeUtilsTest.class);
suite.addTestSuite(StringUtilsTest.class);
+ suite.addTestSuite(Base64Test.class);
+ suite.addTestSuite(JsonUtilsTest.class);
suite.addTestSuite(ByteFormatTest.class);
+ suite.addTestSuite(ObjectCacheTest.class);
suite.addTestSuite(MarkdownUtilsTest.class);
suite.addTestSuite(JGitUtilsTest.class);
suite.addTestSuite(SyndicationUtilsTest.class);
@@ -50,6 +64,7 @@
suite.addTestSuite(MetricUtilsTest.class);
suite.addTestSuite(TicgitUtilsTest.class);
suite.addTestSuite(GitBlitTest.class);
+ suite.addTestSuite(RpcTests.class);
return new GitBlitSuite(suite);
}
@@ -69,10 +84,33 @@
return new FileRepository(new File(REPOSITORIES, "test/bluez-gnome.git"));
}
+ public static void startGitblit() throws Exception {
+ // Start a Gitblit instance
+ Executors.newSingleThreadExecutor().execute(new Runnable() {
+ public void run() {
+ GitBlitServer.main("--httpPort", "" + port, "--httpsPort", "0", "--shutdownPort",
+ "" + shutdownPort, "--repositoriesFolder",
+ "\"" + GitBlitSuite.REPOSITORIES.getAbsolutePath() + "\"", "--userService",
+ "distrib/users.properties");
+ }
+ });
+
+ // Wait a few seconds for it to be running
+ Thread.sleep(2500);
+ }
+
+ public static void stopGitblit() throws Exception {
+ // Stop Gitblit
+ GitBlitServer.main("--stop", "--shutdownPort", "" + shutdownPort);
+
+ // Wait a few seconds for it to be running
+ Thread.sleep(2500);
+ }
+
@Override
protected void setUp() throws Exception {
FileSettings settings = new FileSettings("distrib/gitblit.properties");
- GitBlit.self().configureContext(settings);
+ GitBlit.self().configureContext(settings, true);
FileUserService loginService = new FileUserService(new File("distrib/users.properties"));
GitBlit.self().setUserService(loginService);
@@ -89,6 +127,13 @@
showRemoteBranches("ticgit.git");
showRemoteBranches("test/jgit.git");
}
+
+ startGitblit();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ stopGitblit();
}
private void cloneOrFetch(String name, String fromUrl) throws Exception {
--
Gitblit v1.9.1