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-13 11:47:59 +09:00
parent 5036b1a1aa
commit f5c1c0703d
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/scala/gitbucket/core/service/ServiceSpecBase.scala
View File

@@ -1,10 +1,16 @@
package gitbucket.core.service package gitbucket.core.service
import gitbucket.core.GitBucketCoreModule
import gitbucket.core.util.{ControlUtil, DatabaseConfig, FileUtil} import gitbucket.core.util.{ControlUtil, DatabaseConfig, FileUtil}
import gitbucket.core.util.ControlUtil._ import gitbucket.core.util.ControlUtil._
import gitbucket.core.model._ import gitbucket.core.model._
import gitbucket.core.model.Profile._ import gitbucket.core.model.Profile._
import io.github.gitbucket.solidbase.Solidbase
import liquibase.database.core.H2Database
import liquibase.database.jvm.JdbcConnection
import profile.simple._ import profile.simple._
import scalaz._
import Scalaz._
import org.apache.commons.io.FileUtils import org.apache.commons.io.FileUtils
@@ -21,7 +27,9 @@ trait ServiceSpecBase {
val (url, user, pass) = (DatabaseConfig.url(Some(dir.toString)), DatabaseConfig.user, DatabaseConfig.password) val (url, user, pass) = (DatabaseConfig.url(Some(dir.toString)), DatabaseConfig.user, DatabaseConfig.password)
org.h2.Driver.load() org.h2.Driver.load()
using(DriverManager.getConnection(url, user, pass)){ conn => using(DriverManager.getConnection(url, user, pass)){ conn =>
AutoUpdate.versions.reverse.foreach(_.update(conn, Thread.currentThread.getContextClassLoader)) val solidbase = new Solidbase()
val db = new H2Database() <| { _.setConnection(new JdbcConnection(conn)) } // TODO Remove setConnection in the future
solidbase.migrate(conn, Thread.currentThread.getContextClassLoader, db, GitBucketCoreModule)
} }
Database.forURL(url, user, pass).withSession { session => Database.forURL(url, user, pass).withSession { session =>
action(session) action(session)