From fa0afc0f2d7fa3cc6dc5de5dec006c4ecf4c6272 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 23 Jul 2012 14:04:23 -0400
Subject: [PATCH] Properly decode blobs on reindex (issue 112)
---
tests/com/gitblit/tests/GitServletTest.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/com/gitblit/tests/GitServletTest.java b/tests/com/gitblit/tests/GitServletTest.java
index 38d7fa9..848a1d0 100644
--- a/tests/com/gitblit/tests/GitServletTest.java
+++ b/tests/com/gitblit/tests/GitServletTest.java
@@ -13,6 +13,7 @@
import org.eclipse.jgit.api.CloneCommand;
import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
import org.eclipse.jgit.util.FileUtils;
import org.junit.AfterClass;
@@ -41,7 +42,6 @@
@BeforeClass
public static void startGitblit() throws Exception {
- deleteWorkingFolders();
started.set(GitBlitSuite.startGitblit());
}
@@ -49,11 +49,11 @@
public static void stopGitblit() throws Exception {
if (started.get()) {
GitBlitSuite.stopGitblit();
+ deleteWorkingFolders();
}
- deleteWorkingFolders();
}
- private static void deleteWorkingFolders() throws Exception {
+ public static void deleteWorkingFolders() throws Exception {
if (ticgitFolder.exists()) {
FileUtils.delete(ticgitFolder, FileUtils.RECURSIVE);
}
@@ -113,9 +113,9 @@
public void testAnonymousPush() throws Exception {
Git git = Git.open(ticgitFolder);
File file = new File(ticgitFolder, "TODO");
- OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true));
+ OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true), Constants.CHARSET);
BufferedWriter w = new BufferedWriter(os);
- w.write("// " + new Date().toString() + "\n");
+ w.write("// hellol中文 " + new Date().toString() + "\n");
w.close();
git.add().addFilepattern(file.getName()).call();
git.commit().setMessage("test commit").call();
@@ -136,7 +136,7 @@
Git git = Git.open(jgitFolder);
File file = new File(jgitFolder, "TODO");
- OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true));
+ OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true), Constants.CHARSET);
BufferedWriter w = new BufferedWriter(os);
w.write("// " + new Date().toString() + "\n");
w.close();
@@ -159,7 +159,7 @@
Git git = Git.open(jgit2Folder);
File file = new File(jgit2Folder, "NONBARE");
- OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true));
+ OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true), Constants.CHARSET);
BufferedWriter w = new BufferedWriter(os);
w.write("// " + new Date().toString() + "\n");
w.close();
--
Gitblit v1.9.1