From 84a67e00581aecb0a7d440a8730834944e4829eb Mon Sep 17 00:00:00 2001 From: John St John Date: Thu, 5 Oct 2017 15:39:30 -0700 Subject: cleanup logging, remove old tracing, use new tracing library --- src/test/scala/xyz/driver/core/AuthTest.scala | 3 +-- src/test/scala/xyz/driver/core/MessagesTest.scala | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/test/scala/xyz/driver/core') 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!") -- cgit v1.2.3 From 78261212035d820efe5728c15dfcd388be0c2a4b Mon Sep 17 00:00:00 2001 From: John St John Date: Thu, 5 Oct 2017 15:45:41 -0700 Subject: use headers already stored in contextheaders and remove unused test import --- src/main/scala/xyz/driver/core/app.scala | 6 +++--- src/test/scala/xyz/driver/core/MessagesTest.scala | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/test/scala/xyz/driver/core') diff --git a/src/main/scala/xyz/driver/core/app.scala b/src/main/scala/xyz/driver/core/app.scala index 82471b2..06f215a 100644 --- a/src/main/scala/xyz/driver/core/app.scala +++ b/src/main/scala/xyz/driver/core/app.scala @@ -23,8 +23,8 @@ import xyz.driver.core.rest._ import xyz.driver.core.stats.SystemStats import xyz.driver.core.time.Time import xyz.driver.core.time.provider.{SystemTimeProvider, TimeProvider} -import xyz.driver.tracing._ import xyz.driver.tracing.TracingDirectives._ +import xyz.driver.tracing._ import scala.compat.Platform.ConcurrentModificationException import scala.concurrent.duration._ @@ -89,8 +89,8 @@ object app { "Access-Control-Allow-Headers", "Server", "Date", - TraceHeaderName, - SpanHeaderName, + ContextHeaders.TraceHeaderName, + ContextHeaders.SpanHeaderName, ContextHeaders.StacktraceHeader, ContextHeaders.AuthenticationTokenHeader, "X-Frame-Options", diff --git a/src/test/scala/xyz/driver/core/MessagesTest.scala b/src/test/scala/xyz/driver/core/MessagesTest.scala index 3b891d3..08b00b4 100644 --- a/src/test/scala/xyz/driver/core/MessagesTest.scala +++ b/src/test/scala/xyz/driver/core/MessagesTest.scala @@ -3,7 +3,6 @@ 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 -- cgit v1.2.3