diff options
author | John St John <johnthesaintjohn@gmail.com> | 2017-10-05 15:39:30 -0700 |
---|---|---|
committer | John St John <johnthesaintjohn@gmail.com> | 2017-10-05 15:39:30 -0700 |
commit | 84a67e00581aecb0a7d440a8730834944e4829eb (patch) | |
tree | 05e5b4fa2d0b1d907689e9610fa823c9e636c8bf /src/test/scala/xyz/driver | |
parent | db83f93f8e63211b538d371f83c780fc01239770 (diff) | |
download | driver-core-84a67e00581aecb0a7d440a8730834944e4829eb.tar.gz driver-core-84a67e00581aecb0a7d440a8730834944e4829eb.tar.bz2 driver-core-84a67e00581aecb0a7d440a8730834944e4829eb.zip |
cleanup logging, remove old tracing, use new tracing library
Diffstat (limited to 'src/test/scala/xyz/driver')
-rw-r--r-- | src/test/scala/xyz/driver/core/AuthTest.scala | 3 | ||||
-rw-r--r-- | src/test/scala/xyz/driver/core/MessagesTest.scala | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/test/scala/xyz/driver/core/AuthTest.scala b/src/test/scala/xyz/driver/core/AuthTest.scala index 69dbd9e..437ba3c 100644 --- a/src/test/scala/xyz/driver/core/AuthTest.scala +++ b/src/test/scala/xyz/driver/core/AuthTest.scala @@ -5,7 +5,6 @@ import akka.http.scaladsl.server.AuthenticationFailedRejection.CredentialsReject import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server._ import akka.http.scaladsl.testkit.ScalatestRouteTest -import org.scalatest.mockito.MockitoSugar import org.scalatest.{FlatSpec, Matchers} import pdi.jwt.{Jwt, JwtAlgorithm} import xyz.driver.core.auth._ @@ -16,7 +15,7 @@ import xyz.driver.core.rest._ import scala.concurrent.Future import scalaz.OptionT -class AuthTest extends FlatSpec with Matchers with MockitoSugar with ScalatestRouteTest { +class AuthTest extends FlatSpec with Matchers with ScalatestRouteTest { case object TestRoleAllowedPermission extends Permission case object TestRoleAllowedByTokenPermission extends Permission diff --git a/src/test/scala/xyz/driver/core/MessagesTest.scala b/src/test/scala/xyz/driver/core/MessagesTest.scala index 09558bc..3b891d3 100644 --- a/src/test/scala/xyz/driver/core/MessagesTest.scala +++ b/src/test/scala/xyz/driver/core/MessagesTest.scala @@ -10,7 +10,7 @@ import xyz.driver.core.logging.NoLogger import scala.collection.JavaConverters._ -class MessagesTest extends FlatSpec with Matchers with MockitoSugar { +class MessagesTest extends FlatSpec with Matchers { val englishLocaleMessages = Map("en.greeting" -> "Hello {0}!", "en.greetingFullName" -> "Hello {0} {1} {2}!", "en.hello" -> "Hello world!") |