Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-09 06:55:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation error in testcase

Browse Source
This commit is contained in:
Naoki Takezoe
2016-01-02 02:48:58 +09:00
parent 739c99edce
commit cbb847704b
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/test/scala/gitbucket/core/util/GitSpecUtil.scala
View File

@@ -1,7 +1,5 @@
package gitbucket.core.util package gitbucket.core.util
import gitbucket.core.model._
import gitbucket.core.util.Directory._
import gitbucket.core.util.ControlUtil._ import gitbucket.core.util.ControlUtil._
import org.apache.commons.io.FileUtils import org.apache.commons.io.FileUtils
@@ -14,14 +12,13 @@ import org.eclipse.jgit.merge._
import org.eclipse.jgit.errors._ import org.eclipse.jgit.errors._
import java.nio.file._ import java.nio.file._
import java.util.Date
import java.io.File import java.io.File
object GitSpecUtil { object GitSpecUtil {
def withTestFolder[U](f: File => U): U = { def withTestFolder[U](f: File => U): U = {
val folder = new File(System.getProperty("java.io.tmpdir"), "test-" + System.nanoTime) val folder = new File(System.getProperty("java.io.tmpdir"), "test-" + System.nanoTime)
if(!folder.mkdirs()){ if(!folder.mkdirs()){
throw new java.io.IOException("can't create folder "+folder.getAbsolutePath) throw new java.io.IOException("can't create folder " + folder.getAbsolutePath)
} }
try { try {
f(folder) f(folder)
@@ -56,7 +53,7 @@ object GitSpecUtil {
JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
branch, autorName, autorEmail, message) branch, autorName, autorEmail, message)
inserter.flush() inserter.flush()
inserter.release() inserter.close()
} }
def getFile(git: Git, branch: String, path: String) = { def getFile(git: Git, branch: String, path: String) = {
val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch)) val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
@@ -99,7 +96,7 @@ object GitSpecUtil {
val inserter = repository.newObjectInserter val inserter = repository.newObjectInserter
val mergeCommitId = inserter.insert(mergeCommit) val mergeCommitId = inserter.insert(mergeCommit)
inserter.flush() inserter.flush()
inserter.release() inserter.close()
// update refs // update refs
val refUpdate = repository.updateRef(into) val refUpdate = repository.updateRef(into)
refUpdate.setNewObjectId(mergeCommitId) refUpdate.setNewObjectId(mergeCommitId)