#64: Fixed some of test compile errors

oporkka · oporkka · commit f93f09d07f40 · 2017-02-01T14:00:48.000+01:00
- Ensured that absolute imports are used for `spray.json` instead of relative
  imports possibly refering to org.zalando.jsonapi packages.
- Updated missing dependency
diff --git a/akka-http/src/main/scala/org/zalando/jsonapi/akka/http/AkkaHttpJsonapiSupport.scala b/akka-http/src/main/scala/org/zalando/jsonapi/akka/http/AkkaHttpJsonapiSupport.scala
@@ -6,7 +6,7 @@ import akka.http.scaladsl.unmarshalling._
 import org.zalando.jsonapi.model._
 import org.zalando.jsonapi.sprayjson.SprayJsonJsonapiProtocol
 import org.zalando.jsonapi.{JsonapiRootObjectReader, JsonapiRootObjectWriter, _}
-import spray.json._
+import _root_.spray.json._
 
 trait AkkaHttpJsonapiSupport extends SprayJsonJsonapiProtocol {
   def akkaHttpJsonapiMarshaller[T: JsonapiRootObjectWriter]: ToEntityMarshaller[T] =
diff --git a/akka-http/src/test/scala/org/zalando/jsonapi/akka/http/AkkaHttpJsonapiSupportSpec.scala b/akka-http/src/test/scala/org/zalando/jsonapi/akka/http/AkkaHttpJsonapiSupportSpec.scala
@@ -5,8 +5,7 @@ import org.scalatest.{EitherValues, WordSpec}
 import org.zalando.jsonapi.JsonapiRootObjectWriter
 import org.zalando.jsonapi.model._
 import org.zalando.jsonapi._
-import org.zalando.jsonapi.akka.http.AkkaHttpJsonapiSupport
-import spray.json._
+import _root_.spray.json._
 
 class AkkaHttpJsonapiSupportSpec extends WordSpec with TypeCheckedTripleEquals with EitherValues with AkkaHttpJsonapiSupport {
   s"AkkaHttpJsonapiSupport" must {
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -31,5 +31,5 @@ object Dependencies {
 
   lazy val sprayJsonDeps = Seq(sprayJson)
 
-  lazy val akkaHttpDeps = Seq(akkaHttpCore, akkaHttpExperimental, sprayJson)
+  lazy val akkaHttpDeps = Seq(akkaHttpCore, akkaHttpExperimental, akkaHttpTestkit, sprayJson)
 }
diff --git a/spray-json/src/test/scala/org/zalando/jsonapi/sprayjson/ExampleSpec.scala b/spray-json/src/test/scala/org/zalando/jsonapi/sprayjson/ExampleSpec.scala
@@ -1,12 +1,12 @@
-package org.zalando.jsonapi.json
+package org.zalando.jsonapi.sprayjson
 
 import org.scalatest.{MustMatchers, WordSpec}
 import org.zalando.jsonapi.model.JsonApiObject.StringValue
 import org.zalando.jsonapi.model.RootObject.ResourceObject
 import org.zalando.jsonapi.model.{Attribute, Links, RootObject}
-import org.zalando.jsonapi.sprayjson.SprayJsonJsonapiProtocol
 import org.zalando.jsonapi.{JsonapiRootObjectWriter, _}
-import spray.json._
+import _root_.spray.json._
+import org.zalando.jsonapi.json.Person
 
 class ExampleSpec extends WordSpec with MustMatchers with SprayJsonJsonapiProtocol {
   "JsonapiRootObject" when {

Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,5 @@ object Dependencies {`
`31`	`31`
`32`	`32`	`lazy val sprayJsonDeps = Seq(sprayJson)`
`33`	`33`
`34`		`- lazy val akkaHttpDeps = Seq(akkaHttpCore, akkaHttpExperimental, sprayJson)`
	`34`	`+ lazy val akkaHttpDeps = Seq(akkaHttpCore, akkaHttpExperimental, akkaHttpTestkit, sprayJson)`
`35`	`35`	`}`