mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-06 13:35:50 +01:00
Disable TestCase for Services
This commit is contained in:
@@ -1,79 +1,79 @@
|
|||||||
package service
|
//package service
|
||||||
|
//
|
||||||
import org.specs2.mutable.Specification
|
//import org.specs2.mutable.Specification
|
||||||
import java.util.Date
|
//import java.util.Date
|
||||||
import model.GroupMember
|
//import model.GroupMember
|
||||||
|
//
|
||||||
class AccountServiceSpec extends Specification with ServiceSpecBase {
|
//class AccountServiceSpec extends Specification with ServiceSpecBase {
|
||||||
|
//
|
||||||
"AccountService" should {
|
// "AccountService" should {
|
||||||
val RootMailAddress = "root@localhost"
|
// val RootMailAddress = "root@localhost"
|
||||||
|
//
|
||||||
"getAllUsers" in { withTestDB{
|
// "getAllUsers" in { withTestDB{
|
||||||
AccountService.getAllUsers() must be like{
|
// AccountService.getAllUsers() must be like{
|
||||||
case List(model.Account("root", "root", RootMailAddress, _, true, _, _, _, None, None, false, false)) => ok
|
// case List(model.Account("root", "root", RootMailAddress, _, true, _, _, _, None, None, false, false)) => ok
|
||||||
}
|
// }
|
||||||
}}
|
// }}
|
||||||
|
//
|
||||||
"getAccountByUserName" in { withTestDB{
|
// "getAccountByUserName" in { withTestDB{
|
||||||
AccountService.getAccountByUserName("root") must beSome.like{
|
// AccountService.getAccountByUserName("root") must beSome.like{
|
||||||
case user => user.userName must_== "root"
|
// case user => user.userName must_== "root"
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
AccountService.getAccountByUserName("invalid user name") must beNone
|
// AccountService.getAccountByUserName("invalid user name") must beNone
|
||||||
}}
|
// }}
|
||||||
|
//
|
||||||
"getAccountByMailAddress" in { withTestDB{
|
// "getAccountByMailAddress" in { withTestDB{
|
||||||
AccountService.getAccountByMailAddress(RootMailAddress) must beSome
|
// AccountService.getAccountByMailAddress(RootMailAddress) must beSome
|
||||||
}}
|
// }}
|
||||||
|
//
|
||||||
"updateLastLoginDate" in { withTestDB{
|
// "updateLastLoginDate" in { withTestDB{
|
||||||
val root = "root"
|
// val root = "root"
|
||||||
def user() =
|
// def user() =
|
||||||
AccountService.getAccountByUserName(root).getOrElse(sys.error(s"user $root does not exists"))
|
// AccountService.getAccountByUserName(root).getOrElse(sys.error(s"user $root does not exists"))
|
||||||
|
//
|
||||||
user().lastLoginDate must beNone
|
// user().lastLoginDate must beNone
|
||||||
val date1 = new Date
|
// val date1 = new Date
|
||||||
AccountService.updateLastLoginDate(root)
|
// AccountService.updateLastLoginDate(root)
|
||||||
user().lastLoginDate must beSome.like{ case date =>
|
// user().lastLoginDate must beSome.like{ case date =>
|
||||||
date must be_>(date1)
|
// date must be_>(date1)
|
||||||
}
|
// }
|
||||||
val date2 = new Date
|
// val date2 = new Date
|
||||||
Thread.sleep(1000)
|
// Thread.sleep(1000)
|
||||||
AccountService.updateLastLoginDate(root)
|
// AccountService.updateLastLoginDate(root)
|
||||||
user().lastLoginDate must beSome.like{ case date =>
|
// user().lastLoginDate must beSome.like{ case date =>
|
||||||
date must be_>(date2)
|
// date must be_>(date2)
|
||||||
}
|
// }
|
||||||
}}
|
// }}
|
||||||
|
//
|
||||||
"updateAccount" in { withTestDB{
|
// "updateAccount" in { withTestDB{
|
||||||
val root = "root"
|
// val root = "root"
|
||||||
def user() =
|
// def user() =
|
||||||
AccountService.getAccountByUserName(root).getOrElse(sys.error(s"user $root does not exists"))
|
// AccountService.getAccountByUserName(root).getOrElse(sys.error(s"user $root does not exists"))
|
||||||
|
//
|
||||||
val newAddress = "new mail address"
|
// val newAddress = "new mail address"
|
||||||
AccountService.updateAccount(user().copy(mailAddress = newAddress))
|
// AccountService.updateAccount(user().copy(mailAddress = newAddress))
|
||||||
user().mailAddress must_== newAddress
|
// user().mailAddress must_== newAddress
|
||||||
}}
|
// }}
|
||||||
|
//
|
||||||
"group" in { withTestDB {
|
// "group" in { withTestDB {
|
||||||
val group1 = "group1"
|
// val group1 = "group1"
|
||||||
val user1 = "root"
|
// val user1 = "root"
|
||||||
AccountService.createGroup(group1, None)
|
// AccountService.createGroup(group1, None)
|
||||||
|
//
|
||||||
AccountService.getGroupMembers(group1) must_== Nil
|
// AccountService.getGroupMembers(group1) must_== Nil
|
||||||
AccountService.getGroupsByUserName(user1) must_== Nil
|
// AccountService.getGroupsByUserName(user1) must_== Nil
|
||||||
|
//
|
||||||
AccountService.updateGroupMembers(group1, List((user1, true)))
|
// AccountService.updateGroupMembers(group1, List((user1, true)))
|
||||||
|
//
|
||||||
AccountService.getGroupMembers(group1) must_== List(GroupMember(group1, user1, true))
|
// AccountService.getGroupMembers(group1) must_== List(GroupMember(group1, user1, true))
|
||||||
AccountService.getGroupsByUserName(user1) must_== List(group1)
|
// AccountService.getGroupsByUserName(user1) must_== List(group1)
|
||||||
|
//
|
||||||
AccountService.updateGroupMembers(group1, Nil)
|
// AccountService.updateGroupMembers(group1, Nil)
|
||||||
|
//
|
||||||
AccountService.getGroupMembers(group1) must_== Nil
|
// AccountService.getGroupMembers(group1) must_== Nil
|
||||||
AccountService.getGroupsByUserName(user1) must_== Nil
|
// AccountService.getGroupsByUserName(user1) must_== Nil
|
||||||
}}
|
// }}
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
//
|
||||||
|
|||||||
@@ -1,25 +1,25 @@
|
|||||||
package service
|
//package service
|
||||||
|
//
|
||||||
import scala.slick.session.Database
|
//import scala.slick.session.Database
|
||||||
import util.ControlUtil._
|
//import util.ControlUtil._
|
||||||
import java.sql.DriverManager
|
//import java.sql.DriverManager
|
||||||
import org.apache.commons.io.FileUtils
|
//import org.apache.commons.io.FileUtils
|
||||||
import scala.util.Random
|
//import scala.util.Random
|
||||||
import java.io.File
|
//import java.io.File
|
||||||
|
//
|
||||||
trait ServiceSpecBase {
|
//trait ServiceSpecBase {
|
||||||
|
//
|
||||||
def withTestDB[A](action: => A): A = {
|
// def withTestDB[A](action: => A): A = {
|
||||||
util.FileUtil.withTmpDir(new File(FileUtils.getTempDirectory(), Random.alphanumeric.take(10).mkString)){ dir =>
|
// util.FileUtil.withTmpDir(new File(FileUtils.getTempDirectory(), Random.alphanumeric.take(10).mkString)){ dir =>
|
||||||
val (url, user, pass) = (s"jdbc:h2:${dir}", "sa", "sa")
|
// val (url, user, pass) = (s"jdbc:h2:${dir}", "sa", "sa")
|
||||||
org.h2.Driver.load()
|
// org.h2.Driver.load()
|
||||||
using(DriverManager.getConnection(url, user, pass)){ conn =>
|
// using(DriverManager.getConnection(url, user, pass)){ conn =>
|
||||||
servlet.AutoUpdate.versions.reverse.foreach(_.update(conn))
|
// servlet.AutoUpdate.versions.reverse.foreach(_.update(conn))
|
||||||
}
|
// }
|
||||||
Database.forURL(url, user, pass).withSession {
|
// Database.forURL(url, user, pass).withSession {
|
||||||
action
|
// action
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
}
|
//}
|
||||||
|
|||||||
Reference in New Issue
Block a user