From f7ae2a8425edfa56dd2927b8eb1fdc8ead94e79f Mon Sep 17 00:00:00 2001
From: Stardrad Yin <yin8086@gmail.com>
Date: Wed, 05 Mar 2014 10:16:53 -0500
Subject: [PATCH] Fix Chinese translate strings
---
src/test/java/com/gitblit/tests/GitBlitSuite.java | 62 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/GitBlitSuite.java b/src/test/java/com/gitblit/tests/GitBlitSuite.java
index ab75408..c015c84 100644
--- a/src/test/java/com/gitblit/tests/GitBlitSuite.java
+++ b/src/test/java/com/gitblit/tests/GitBlitSuite.java
@@ -33,10 +33,11 @@
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
-import com.gitblit.GitBlit;
import com.gitblit.GitBlitException;
import com.gitblit.GitBlitServer;
+import com.gitblit.manager.IRepositoryManager;
import com.gitblit.models.RepositoryModel;
+import com.gitblit.servlet.GitblitContext;
import com.gitblit.utils.JGitUtils;
/**
@@ -55,14 +56,18 @@
@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,
+ UserModelTest.class, UserChoiceTest.class,
+ ObjectCacheTest.class, PermissionsTest.class, UserServiceTest.class, LdapAuthenticationTest.class,
MarkdownUtilsTest.class, JGitUtilsTest.class, SyndicationUtilsTest.class,
DiffUtilsTest.class, MetricUtilsTest.class, X509UtilsTest.class,
GitBlitTest.class, FederationTests.class, RpcTests.class, GitServletTest.class, GitDaemonTest.class,
GroovyScriptTest.class, LuceneExecutorTest.class, RepositoryModelTest.class,
- FanoutServiceTest.class, Issue0259Test.class, Issue0271Test.class, HtpasswdUserServiceTest.class,
- ModelUtilsTest.class, JnaUtilsTest.class })
+ FanoutServiceTest.class, Issue0259Test.class, Issue0271Test.class, HtpasswdAuthenticationTest.class,
+ ModelUtilsTest.class, JnaUtilsTest.class, LdapSyncServiceTest.class, FileTicketServiceTest.class,
+ BranchTicketServiceTest.class, RedisTicketServiceTest.class, AuthenticationManagerTest.class })
public class GitBlitSuite {
+
+ public static final File BASEFOLDER = new File("data");
public static final File REPOSITORIES = new File("data/git");
@@ -82,30 +87,40 @@
private static AtomicBoolean started = new AtomicBoolean(false);
- public static Repository getHelloworldRepository() throws Exception {
+ public static Repository getHelloworldRepository() {
return getRepository("helloworld.git");
}
- public static Repository getTicgitRepository() throws Exception {
+ public static Repository getTicgitRepository() {
return getRepository("ticgit.git");
}
- public static Repository getJGitRepository() throws Exception {
+ public static Repository getJGitRepository() {
return getRepository("test/jgit.git");
}
- public static Repository getAmbitionRepository() throws Exception {
+ public static Repository getAmbitionRepository() {
return getRepository("test/ambition.git");
}
- public static Repository getGitectiveRepository() throws Exception {
+ public static Repository getGitectiveRepository() {
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 Repository getTicketsTestRepository() {
+ JGitUtils.createRepository(REPOSITORIES, "gb-tickets.git").close();
+ return getRepository("gb-tickets.git");
+ }
+
+ private static Repository getRepository(String name) {
+ try {
+ File gitDir = FileKey.resolve(new File(REPOSITORIES, name), FS.DETECTED);
+ Repository repository = new FileRepositoryBuilder().setGitDir(gitDir).build();
+ return repository;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
}
public static boolean startGitblit() throws Exception {
@@ -155,7 +170,6 @@
cloneOrFetch("test/ambition.git", "https://github.com/defunkt/ambition.git");
cloneOrFetch("test/gitective.git", "https://github.com/kevinsawicki/gitective.git");
- enableDocs("ticgit.git");
showRemoteBranches("ticgit.git");
automaticallyTagBranchTips("ticgit.git");
showRemoteBranches("test/jgit.git");
@@ -178,21 +192,12 @@
System.out.println("done.");
}
- private static void enableDocs(String repositoryName) {
- try {
- RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
- model.useDocs = true;
- GitBlit.self().updateRepositoryModel(model.name, model, false);
- } catch (GitBlitException g) {
- g.printStackTrace();
- }
- }
-
private static void showRemoteBranches(String repositoryName) {
try {
- RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
+ IRepositoryManager repositoryManager = GitblitContext.getManager(IRepositoryManager.class);
+ RepositoryModel model = repositoryManager.getRepositoryModel(repositoryName);
model.showRemoteBranches = true;
- GitBlit.self().updateRepositoryModel(model.name, model, false);
+ repositoryManager.updateRepositoryModel(model.name, model, false);
} catch (GitBlitException g) {
g.printStackTrace();
}
@@ -200,9 +205,10 @@
private static void automaticallyTagBranchTips(String repositoryName) {
try {
- RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName);
+ IRepositoryManager repositoryManager = GitblitContext.getManager(IRepositoryManager.class);
+ RepositoryModel model = repositoryManager.getRepositoryModel(repositoryName);
model.useIncrementalPushTags = true;
- GitBlit.self().updateRepositoryModel(model.name, model, false);
+ repositoryManager.updateRepositoryModel(model.name, model, false);
} catch (GitBlitException g) {
g.printStackTrace();
}
--
Gitblit v1.9.1