From dfc4ece4083bbbb98f55291d05e7d2b1513464b7 Mon Sep 17 00:00:00 2001
From: Thomas Pummer <dev@nullpointer.at>
Date: Fri, 22 Feb 2013 11:10:11 -0500
Subject: [PATCH] the display-name in web.xml now shows the actual version of Gitblit
---
tests/com/gitblit/tests/GitBlitSuite.java | 167 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 112 insertions(+), 55 deletions(-)
diff --git a/tests/com/gitblit/tests/GitBlitSuite.java b/tests/com/gitblit/tests/GitBlitSuite.java
index a2ab3e8..b0179c3 100644
--- a/tests/com/gitblit/tests/GitBlitSuite.java
+++ b/tests/com/gitblit/tests/GitBlitSuite.java
@@ -16,26 +16,54 @@
package com.gitblit.tests;
import java.io.File;
+import java.lang.reflect.Field;
import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
+import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.RepositoryCache;
+import org.eclipse.jgit.lib.RepositoryCache.FileKey;
import org.eclipse.jgit.storage.file.FileRepository;
+import org.eclipse.jgit.util.FS;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
-import com.gitblit.ConfigUserService;
-import com.gitblit.FileSettings;
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 {
+/**
+ * The GitBlitSuite uses test-gitblit.properties and test-users.conf. The suite
+ * is fairly comprehensive for all lower-level functionality. Wicket pages are
+ * currently not unit-tested.
+ *
+ * This suite starts a Gitblit server instance within the same JVM instance as
+ * the unit tests. This allows the unit tests to access the GitBlit static
+ * singleton while also being able to communicate with the instance via tcp/ip
+ * for testing rpc requests, federation requests, and git servlet operations.
+ *
+ * @author James Moger
+ *
+ */
+@RunWith(Suite.class)
+@SuiteClasses({ ArrayUtilsTest.class, FileUtilsTest.class, TimeUtilsTest.class,
+ StringUtilsTest.class, Base64Test.class, JsonUtilsTest.class, ByteFormatTest.class,
+ ObjectCacheTest.class, PermissionsTest.class, UserServiceTest.class, LdapUserServiceTest.class,
+ MarkdownUtilsTest.class, JGitUtilsTest.class, SyndicationUtilsTest.class,
+ DiffUtilsTest.class, MetricUtilsTest.class, TicgitUtilsTest.class, X509UtilsTest.class,
+ GitBlitTest.class, FederationTests.class, RpcTests.class, GitServletTest.class,
+ GroovyScriptTest.class, LuceneExecutorTest.class, IssuesTest.class, RepositoryModelTest.class,
+ FanoutServiceTest.class })
+public class GitBlitSuite {
- public static final File REPOSITORIES = new File("git");
+ public static final File REPOSITORIES = new File("data/git");
static int port = 8280;
static int shutdownPort = 8281;
@@ -44,30 +72,7 @@
public static String account = "admin";
public static String password = "admin";
- private GitBlitSuite(TestSuite suite) {
- super(suite);
- }
-
- 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(UserServiceTest.class);
- suite.addTestSuite(MarkdownUtilsTest.class);
- suite.addTestSuite(JGitUtilsTest.class);
- suite.addTestSuite(SyndicationUtilsTest.class);
- suite.addTestSuite(DiffUtilsTest.class);
- suite.addTestSuite(MetricUtilsTest.class);
- suite.addTestSuite(TicgitUtilsTest.class);
- suite.addTestSuite(GitBlitTest.class);
- suite.addTestSuite(RpcTests.class);
- return new GitBlitSuite(suite);
- }
+ private static AtomicBoolean started = new AtomicBoolean(false);
public static Repository getHelloworldRepository() throws Exception {
return new FileRepository(new File(REPOSITORIES, "helloworld.git"));
@@ -81,23 +86,47 @@
return new FileRepository(new File(REPOSITORIES, "test/jgit.git"));
}
- public static Repository getBluezGnomeRepository() throws Exception {
- return new FileRepository(new File(REPOSITORIES, "test/bluez-gnome.git"));
+ public static Repository getAmbitionRepository() throws Exception {
+ return new FileRepository(new File(REPOSITORIES, "test/ambition.git"));
}
- public static void startGitblit() throws Exception {
+ public static Repository getTheoreticalPhysicsRepository() throws Exception {
+ return new FileRepository(new File(REPOSITORIES, "test/theoretical-physics.git"));
+ }
+
+ public static Repository getIssuesTestRepository() throws Exception {
+ JGitUtils.createRepository(REPOSITORIES, "gb-issues.git").close();
+ return new FileRepository(new File(REPOSITORIES, "gb-issues.git"));
+ }
+
+ public static Repository getGitectiveRepository() throws Exception {
+ return new FileRepository(new File(REPOSITORIES, "test/gitective.git"));
+ }
+
+ public static boolean startGitblit() throws Exception {
+ if (started.get()) {
+ // already started
+ return false;
+ }
+
+ GitServletTest.deleteWorkingFolders();
+
// 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.conf");
+ "test-users.conf", "--settings", "test-gitblit.properties",
+ "--baseFolder", "data");
}
});
// Wait a few seconds for it to be running
Thread.sleep(2500);
+
+ started.set(true);
+ return true;
}
public static void stopGitblit() throws Exception {
@@ -105,45 +134,41 @@
GitBlitServer.main("--stop", "--shutdownPort", "" + shutdownPort);
// Wait a few seconds for it to be running
- Thread.sleep(2500);
+ Thread.sleep(5000);
}
- @Override
- protected void setUp() throws Exception {
- FileSettings settings = new FileSettings("distrib/gitblit.properties");
- GitBlit.self().configureContext(settings, true);
- ConfigUserService loginService = new ConfigUserService(new File("distrib/users.conf"));
- GitBlit.self().setUserService(loginService);
+ @BeforeClass
+ public static void setUp() throws Exception {
+ startGitblit();
if (REPOSITORIES.exists() || REPOSITORIES.mkdirs()) {
cloneOrFetch("helloworld.git", "https://github.com/git/hello-world.git");
- cloneOrFetch("ticgit.git", "https://github.com/jeffWelling/ticgit.git");
- cloneOrFetch("test/bluez-gnome.git",
- "https://git.kernel.org/pub/scm/bluetooth/bluez-gnome.git");
+ cloneOrFetch("ticgit.git", "https://github.com/schacon/ticgit.git");
cloneOrFetch("test/jgit.git", "https://github.com/eclipse/jgit.git");
cloneOrFetch("test/helloworld.git", "https://github.com/git/hello-world.git");
-
+ cloneOrFetch("test/ambition.git", "https://github.com/defunkt/ambition.git");
+ cloneOrFetch("test/theoretical-physics.git", "https://github.com/certik/theoretical-physics.git");
+ cloneOrFetch("test/gitective.git", "https://github.com/kevinsawicki/gitective.git");
+
enableTickets("ticgit.git");
enableDocs("ticgit.git");
showRemoteBranches("ticgit.git");
showRemoteBranches("test/jgit.git");
}
-
- startGitblit();
}
- @Override
- protected void tearDown() throws Exception {
+ @AfterClass
+ public static void tearDown() throws Exception {
stopGitblit();
}
- private void cloneOrFetch(String name, String fromUrl) throws Exception {
+ private static void cloneOrFetch(String name, String fromUrl) throws Exception {
System.out.print("Fetching " + name + "... ");
JGitUtils.cloneRepository(REPOSITORIES, name, fromUrl);
System.out.println("done.");
}
- private void enableTickets(String repositoryName) {
+ private static void enableTickets(String repositoryName) {
try {
RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
model.useTickets = true;
@@ -153,7 +178,7 @@
}
}
- private void enableDocs(String repositoryName) {
+ private static void enableDocs(String repositoryName) {
try {
RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
model.useDocs = true;
@@ -163,7 +188,7 @@
}
}
- private void showRemoteBranches(String repositoryName) {
+ private static void showRemoteBranches(String repositoryName) {
try {
RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
model.showRemoteBranches = true;
@@ -172,4 +197,36 @@
g.printStackTrace();
}
}
+
+ public static void close(File repository) {
+ try {
+ File gitDir = FileKey.resolve(repository, FS.detect());
+ if (gitDir != null && gitDir.exists()) {
+ close(RepositoryCache.open(FileKey.exact(gitDir, FS.detect())));
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static void close(Git git) {
+ close(git.getRepository());
+ }
+
+ public static void close(Repository r) {
+ RepositoryCache.close(r);
+
+ // assume 2 uses in case reflection fails
+ int uses = 2;
+ try {
+ Field useCnt = Repository.class.getDeclaredField("useCnt");
+ useCnt.setAccessible(true);
+ uses = ((AtomicInteger) useCnt.get(r)).get();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ for (int i = 0; i < uses; i++) {
+ r.close();
+ }
+ }
}
--
Gitblit v1.9.1