From 16e4747d3cb2c2a53a6bef554bca306d8594a080 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 14 Sep 2012 17:51:04 -0400
Subject: [PATCH] Mostly complete blob view line links feature, DOM offset bug remains (issue 130)
---
tests/com/gitblit/tests/GitBlitSuite.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/tests/com/gitblit/tests/GitBlitSuite.java b/tests/com/gitblit/tests/GitBlitSuite.java
index 747ce1f..07c5e08 100644
--- a/tests/com/gitblit/tests/GitBlitSuite.java
+++ b/tests/com/gitblit/tests/GitBlitSuite.java
@@ -49,10 +49,11 @@
@RunWith(Suite.class)
@SuiteClasses({ ArrayUtilsTest.class, FileUtilsTest.class, TimeUtilsTest.class,
StringUtilsTest.class, Base64Test.class, JsonUtilsTest.class, ByteFormatTest.class,
- ObjectCacheTest.class, UserServiceTest.class, MarkdownUtilsTest.class, JGitUtilsTest.class,
- SyndicationUtilsTest.class, DiffUtilsTest.class, MetricUtilsTest.class,
- TicgitUtilsTest.class, GitBlitTest.class, FederationTests.class, RpcTests.class,
- GitServletTest.class, GroovyScriptTest.class })
+ ObjectCacheTest.class, UserServiceTest.class, LdapUserServiceTest.class,
+ MarkdownUtilsTest.class, JGitUtilsTest.class, SyndicationUtilsTest.class,
+ DiffUtilsTest.class, MetricUtilsTest.class, TicgitUtilsTest.class,
+ GitBlitTest.class, FederationTests.class, RpcTests.class, GitServletTest.class,
+ GroovyScriptTest.class, LuceneExecutorTest.class, IssuesTest.class, RepositoryModelTest.class })
public class GitBlitSuite {
public static final File REPOSITORIES = new File("git");
@@ -78,10 +79,6 @@
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"));
}
@@ -91,7 +88,12 @@
}
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 {
@@ -99,6 +101,9 @@
// already started
return false;
}
+
+ GitServletTest.deleteWorkingFolders();
+
// Start a Gitblit instance
Executors.newSingleThreadExecutor().execute(new Runnable() {
public void run() {
@@ -121,7 +126,7 @@
GitBlitServer.main("--stop", "--shutdownPort", "" + shutdownPort);
// Wait a few seconds for it to be running
- Thread.sleep(2500);
+ Thread.sleep(5000);
}
@BeforeClass
@@ -130,16 +135,13 @@
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");
- JGitUtils.createRepository(REPOSITORIES, "gb-issues.git").close();
-
enableTickets("ticgit.git");
enableDocs("ticgit.git");
showRemoteBranches("ticgit.git");
--
Gitblit v1.9.1