diff options
| author | John St. John <jstjohn@users.noreply.github.com> | 2017-10-05 16:10:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-05 16:10:49 -0700 |
| commit | b00892d723f6dedf50dc1c1fde7d443e9c3f9497 (patch) | |
| tree | 6e71cdeccd66d305d752e8ecb6ef9522f07a04f6 /src/test/scala | |
| parent | db83f93f8e63211b538d371f83c780fc01239770 (diff) | |
| parent | 2c9f274f961ba6b0af662752afc3c0ee99a475de (diff) | |
| download | driver-core-b00892d723f6dedf50dc1c1fde7d443e9c3f9497.tar.gz driver-core-b00892d723f6dedf50dc1c1fde7d443e9c3f9497.tar.bz2 driver-core-b00892d723f6dedf50dc1c1fde7d443e9c3f9497.zip | |
cleanup logging, remove old tracing, use new tracing library
Diffstat (limited to 'src/test/scala')
| -rw-r--r-- | src/test/scala/xyz/driver/core/AuthTest.scala | 3 | ||||
| -rw-r--r-- | src/test/scala/xyz/driver/core/MessagesTest.scala | 3 |
2 files changed, 2 insertions, 4 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..08b00b4 100644 --- a/src/test/scala/xyz/driver/core/MessagesTest.scala +++ b/src/test/scala/xyz/driver/core/MessagesTest.scala @@ -3,14 +3,13 @@ package xyz.driver.core import java.util.Locale import com.typesafe.config.{ConfigException, ConfigFactory} -import org.scalatest.mockito.MockitoSugar import org.scalatest.{FlatSpec, Matchers} import xyz.driver.core.messages.Messages 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!") |