diff options
author | vlad <vlad@driver.xyz> | 2017-06-30 12:29:54 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-06-30 12:29:54 -0700 |
commit | a997aa6539d1f0af4ab4fc395ff2033335da312a (patch) | |
tree | 4f24529cd0beed94368caafdc0bdbb5677184851 /src/test/scala/xyz/driver/pdsuicommon/BaseSuite.scala | |
parent | 5832f63b84d7388441d1200f2442dc1e9de0225c (diff) | |
download | rest-query-a997aa6539d1f0af4ab4fc395ff2033335da312a.tar.gz rest-query-a997aa6539d1f0af4ab4fc395ff2033335da312a.tar.bz2 rest-query-a997aa6539d1f0af4ab4fc395ff2033335da312a.zip |
Latest PDS UI utils
Diffstat (limited to 'src/test/scala/xyz/driver/pdsuicommon/BaseSuite.scala')
-rw-r--r-- | src/test/scala/xyz/driver/pdsuicommon/BaseSuite.scala | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/test/scala/xyz/driver/pdsuicommon/BaseSuite.scala b/src/test/scala/xyz/driver/pdsuicommon/BaseSuite.scala index 656ee24..71f8ebf 100644 --- a/src/test/scala/xyz/driver/pdsuicommon/BaseSuite.scala +++ b/src/test/scala/xyz/driver/pdsuicommon/BaseSuite.scala @@ -5,18 +5,15 @@ import java.time.{LocalDateTime, ZoneId} import org.scalatest.FreeSpecLike import org.scalatest.concurrent.ScalaFutures import org.scalatest.time.{Millis, Span} -import xyz.driver.pdsuicommon.db.{MysqlQueryBuilder, SearchFilterExpr, SqlContext, Transactions} +import xyz.driver.pdsuicommon.db._ import xyz.driver.pdsuicommon.domain.{Email, LongId, PasswordHash, User} import xyz.driver.pdsuicommon.error.UnexpectedFilterException import xyz.driver.pdsuicommon.utils.DiffUtils -import scala.concurrent.ExecutionContext.Implicits._ -import scala.concurrent.Future - trait BaseSuite extends FreeSpecLike with DiffUtils with ScalaFutures { implicit val defaultPatience = PatienceConfig(timeout = Span(1000, Millis), interval = Span(20, Millis)) - implicit val sqlContext = new MockSqlContext(global) + implicit val sqlContext = new MockMySqlContext() def sampleUser(role: User.Role, email: String = "test@example.com", password: String = "123") = User( id = LongId(2001), @@ -30,20 +27,10 @@ trait BaseSuite extends FreeSpecLike with DiffUtils with ScalaFutures { def createMockQueryBuilder[T](isExpectedFilter: SearchFilterExpr => Boolean): MysqlQueryBuilder[T] = { MockQueryBuilder[T] { - case (filter, _, _) if isExpectedFilter(filter) => - Future.successful(Seq.empty) - case (filter, _, _) => - Future.failed(new UnexpectedFilterException(s"Filter is unexpected: $filter")) + case (filter, _, _) if isExpectedFilter(filter) => Seq.empty + case (filter, _, _) => throw new UnexpectedFilterException(s"Filter is unexpected: $filter") } { - case _ => - Future.successful((0, Option.empty[LocalDateTime])) + case _ => (0, Option.empty[LocalDateTime]) } } - - def transactions = new Transactions { - override def run[T](f: (SqlContext) => T): Future[T] = { - Future(f(sqlContext)) - } - } - } |