aboutsummaryrefslogtreecommitdiff
path: root/src/test/scala/xyz
diff options
context:
space:
mode:
authorJakob Odersky <jakob@driver.xyz>2017-11-19 23:29:03 -0800
committerJakob Odersky <jakob@driver.xyz>2017-11-20 00:07:42 -0800
commitb872ee2649c7b56df413fbde746ee68312c17abd (patch)
tree34b5fc63cc425a27969c73354fd7a2071ea67ba3 /src/test/scala/xyz
parent871e25f5e5ba23ca9202009d49fb38386558edd9 (diff)
downloaddriver-core-b872ee2649c7b56df413fbde746ee68312c17abd.tar.gz
driver-core-b872ee2649c7b56df413fbde746ee68312c17abd.tar.bz2
driver-core-b872ee2649c7b56df413fbde746ee68312c17abd.zip
Apply new formatting
Diffstat (limited to 'src/test/scala/xyz')
-rw-r--r--src/test/scala/xyz/driver/core/AuthTest.scala20
-rw-r--r--src/test/scala/xyz/driver/core/DateTest.scala18
-rw-r--r--src/test/scala/xyz/driver/core/FileTest.scala9
-rw-r--r--src/test/scala/xyz/driver/core/MessagesTest.scala4
-rw-r--r--src/test/scala/xyz/driver/core/rest/DriverAppTest.scala13
5 files changed, 35 insertions, 29 deletions
diff --git a/src/test/scala/xyz/driver/core/AuthTest.scala b/src/test/scala/xyz/driver/core/AuthTest.scala
index e0d54c8..1a483b9 100644
--- a/src/test/scala/xyz/driver/core/AuthTest.scala
+++ b/src/test/scala/xyz/driver/core/AuthTest.scala
@@ -37,7 +37,7 @@ class AuthTest extends FlatSpec with Matchers with ScalatestRouteTest {
val basicAuthorization: Authorization[User] = new Authorization[User] {
override def userHasPermissions(user: User, permissions: Seq[Permission])(
- implicit ctx: ServiceRequestContext): Future[AuthorizationResult] = {
+ implicit ctx: ServiceRequestContext): Future[AuthorizationResult] = {
val authorized = permissions.map(p => p -> (p === TestRoleAllowedPermission)).toMap
Future.successful(AuthorizationResult(authorized, ctx.permissionsToken))
}
@@ -52,14 +52,16 @@ class AuthTest extends FlatSpec with Matchers with ScalatestRouteTest {
override def authenticatedUser(implicit ctx: ServiceRequestContext): OptionT[Future, User] =
OptionT.optionT[Future] {
if (ctx.contextHeaders.keySet.contains(AuthProvider.AuthenticationTokenHeader)) {
- Future.successful(Some(AuthTokenUserInfo(
- Id[User]("1"),
- authUserId = Id[AuthUser]("2"),
- Email("foo", "bar"),
- emailVerified = true,
- audience = "driver",
- roles = Set(TestRole)
- )))
+ Future.successful(
+ Some(
+ AuthTokenUserInfo(
+ Id[User]("1"),
+ authUserId = Id[AuthUser]("2"),
+ Email("foo", "bar"),
+ emailVerified = true,
+ audience = "driver",
+ roles = Set(TestRole)
+ )))
} else {
Future.successful(Option.empty[User])
}
diff --git a/src/test/scala/xyz/driver/core/DateTest.scala b/src/test/scala/xyz/driver/core/DateTest.scala
index 0cf8a9e..0432040 100644
--- a/src/test/scala/xyz/driver/core/DateTest.scala
+++ b/src/test/scala/xyz/driver/core/DateTest.scala
@@ -24,14 +24,16 @@ class DateTest extends FlatSpec with Matchers with Checkers {
}
it should "have ordering defined correctly" in {
- Seq(Date.fromString("2013-05-10"),
- Date.fromString("2020-02-15"),
- Date.fromString("2017-03-05"),
- Date.fromString("2013-05-12")).sorted should
- contain theSameElementsInOrderAs Seq(Date.fromString("2013-05-10"),
- Date.fromString("2013-05-12"),
- Date.fromString("2017-03-05"),
- Date.fromString("2020-02-15"))
+ Seq(
+ Date.fromString("2013-05-10"),
+ Date.fromString("2020-02-15"),
+ Date.fromString("2017-03-05"),
+ Date.fromString("2013-05-12")).sorted should
+ contain theSameElementsInOrderAs Seq(
+ Date.fromString("2013-05-10"),
+ Date.fromString("2013-05-12"),
+ Date.fromString("2017-03-05"),
+ Date.fromString("2020-02-15"))
check { dates: List[Date] =>
dates.sorted.sliding(2).filter(_.size == 2).forall {
diff --git a/src/test/scala/xyz/driver/core/FileTest.scala b/src/test/scala/xyz/driver/core/FileTest.scala
index ace0b07..8728089 100644
--- a/src/test/scala/xyz/driver/core/FileTest.scala
+++ b/src/test/scala/xyz/driver/core/FileTest.scala
@@ -39,10 +39,11 @@ class FileTest extends FlatSpec with Matchers with MockitoSugar {
val s3ResultsMock = mock[ListObjectsV2Result]
when(s3ResultsMock.getNextContinuationToken).thenReturn("continuationToken")
- when(s3ResultsMock.isTruncated).thenReturn(false, // before file created it is empty (zero pages)
- true,
- false, // after file is uploaded it contains this one file (one page)
- false) // after file is deleted it is empty (zero pages) again
+ when(s3ResultsMock.isTruncated).thenReturn(
+ false, // before file created it is empty (zero pages)
+ true,
+ false, // after file is uploaded it contains this one file (one page)
+ false) // after file is deleted it is empty (zero pages) again
when(s3ResultsMock.getObjectSummaries).thenReturn(
// before file created it is empty, `getObjectSummaries` is never called
List[S3ObjectSummary](s3ObjectSummaryMock).asJava, // after file is uploaded it contains this one file
diff --git a/src/test/scala/xyz/driver/core/MessagesTest.scala b/src/test/scala/xyz/driver/core/MessagesTest.scala
index 08b00b4..07b0158 100644
--- a/src/test/scala/xyz/driver/core/MessagesTest.scala
+++ b/src/test/scala/xyz/driver/core/MessagesTest.scala
@@ -27,8 +27,8 @@ class MessagesTest extends FlatSpec with Matchers {
it should "be able to read messages for different locales" in {
- val messagesConfig = ConfigFactory.parseMap((
- englishLocaleMessages ++ Map(
+ val messagesConfig = ConfigFactory.parseMap(
+ (englishLocaleMessages ++ Map(
"zh.hello" -> "你好,世界!",
"zh.greeting" -> "你好,{0}!",
"zh.greetingFullName" -> "你好,{0} {1} {2}!"
diff --git a/src/test/scala/xyz/driver/core/rest/DriverAppTest.scala b/src/test/scala/xyz/driver/core/rest/DriverAppTest.scala
index 82cc8cd..f5602be 100644
--- a/src/test/scala/xyz/driver/core/rest/DriverAppTest.scala
+++ b/src/test/scala/xyz/driver/core/rest/DriverAppTest.scala
@@ -15,15 +15,15 @@ import scala.reflect.runtime.universe._
class DriverAppTest extends FlatSpec with ScalatestRouteTest with Matchers {
class TestRoute extends DriverRoute {
- override def log: Logger = xyz.driver.core.logging.NoLogger
+ override def log: Logger = xyz.driver.core.logging.NoLogger
override def route: Route = path("api" / "v1" / "test")(post(complete("OK")))
}
val module: Module = new Module {
- val testRoute = new TestRoute
- override def route: Route = testRoute.routeWithDefaults
+ val testRoute = new TestRoute
+ override def route: Route = testRoute.routeWithDefaults
override def routeTypes: Seq[Type] = Seq(typeOf[TestRoute])
- override val name: String = "test-module"
+ override val name: String = "test-module"
}
val app: DriverApp = new DriverApp(
@@ -33,9 +33,10 @@ class DriverAppTest extends FlatSpec with ScalatestRouteTest with Matchers {
modules = Seq(module)
)
- val config: Config = xyz.driver.core.config.loadDefaultConfig
+ val config: Config = xyz.driver.core.config.loadDefaultConfig
val routingSettings: RoutingSettings = RoutingSettings(config)
- val appRoute: Route = Route.seal(app.appRoute)(routingSettings = routingSettings, rejectionHandler = DriverApp.rejectionHandler)
+ val appRoute: Route =
+ Route.seal(app.appRoute)(routingSettings = routingSettings, rejectionHandler = DriverApp.rejectionHandler)
"DriverApp" should "respond with the correct CORS headers for the swagger OPTIONS route" in {
Options(s"/api-docs/swagger.json") ~> appRoute ~> check {