From 06fa4ba6d194446de377629f058c3b7528478520 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 02 Jul 2013 14:54:25 -0400
Subject: [PATCH] Updated test suite to use relocated test config files
---
src/test/java/com/gitblit/tests/GitBlitSuite.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/GitBlitSuite.java b/src/test/java/com/gitblit/tests/GitBlitSuite.java
index 0b8437a..d5e3707 100644
--- a/src/test/java/com/gitblit/tests/GitBlitSuite.java
+++ b/src/test/java/com/gitblit/tests/GitBlitSuite.java
@@ -25,7 +25,7 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.RepositoryCache;
import org.eclipse.jgit.lib.RepositoryCache.FileKey;
-import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.eclipse.jgit.util.FS;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -64,6 +64,10 @@
public class GitBlitSuite {
public static final File REPOSITORIES = new File("data/git");
+
+ public static final File SETTINGS = new File("src/test/config/test-gitblit.properties");
+
+ public static final File USERSCONF = new File("src/test/config/test-users.conf");
static int port = 8280;
static int gitPort = 8300;
@@ -78,32 +82,38 @@
private static AtomicBoolean started = new AtomicBoolean(false);
public static Repository getHelloworldRepository() throws Exception {
- return new FileRepository(new File(REPOSITORIES, "helloworld.git"));
+ return getRepository("helloworld.git");
}
public static Repository getTicgitRepository() throws Exception {
- return new FileRepository(new File(REPOSITORIES, "ticgit.git"));
+ return getRepository("ticgit.git");
}
public static Repository getJGitRepository() throws Exception {
- return new FileRepository(new File(REPOSITORIES, "test/jgit.git"));
+ return getRepository("test/jgit.git");
}
public static Repository getAmbitionRepository() throws Exception {
- return new FileRepository(new File(REPOSITORIES, "test/ambition.git"));
+ return getRepository("test/ambition.git");
}
public static Repository getTheoreticalPhysicsRepository() throws Exception {
- return new FileRepository(new File(REPOSITORIES, "test/theoretical-physics.git"));
+ return getRepository("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"));
+ return getRepository("gb-issues.git");
}
public static Repository getGitectiveRepository() throws Exception {
- return new FileRepository(new File(REPOSITORIES, "test/gitective.git"));
+ return getRepository("test/gitective.git");
+ }
+
+ private static Repository getRepository(String name) throws Exception {
+ File gitDir = FileKey.resolve(new File(REPOSITORIES, name), FS.DETECTED);
+ Repository repository = new FileRepositoryBuilder().setGitDir(gitDir).build();
+ return repository;
}
public static boolean startGitblit() throws Exception {
@@ -120,7 +130,7 @@
GitBlitServer.main("--httpPort", "" + port, "--httpsPort", "0", "--shutdownPort",
"" + shutdownPort, "--gitPort", "" + gitPort, "--repositoriesFolder",
"\"" + GitBlitSuite.REPOSITORIES.getAbsolutePath() + "\"", "--userService",
- "test-users.conf", "--settings", "test-gitblit.properties",
+ GitBlitSuite.USERSCONF.getAbsolutePath(), "--settings", GitBlitSuite.SETTINGS.getAbsolutePath(),
"--baseFolder", "data");
}
});
--
Gitblit v1.9.1