All merge conflicts are resolved

1 files changed, 8 insertions, 13 deletions

diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponseSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponseSuite.scala
index 1a1e76c..40739f6 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponseSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ListResponseSuite.scala
@@ -10,10 +10,9 @@ import xyz.driver.pdsuidomain.entities.MedicalRecord.Status
 import xyz.driver.pdsuidomain.entities._
 import xyz.driver.pdsuidomain.formats.json.sprayformats.record.recordFormat
 
-
 class ListResponseSuite extends FlatSpec with Matchers {
 
-  private val lastUpdate = LocalDateTime.parse("2017-08-10T18:00:00")
+  private val lastUpdate        = LocalDateTime.parse("2017-08-10T18:00:00")
   private val lastUpdateToLocal = "2017-08-10T18:00Z"
 
   private def metaJsonObjectAsString(meta: ListResponse.Meta) = {
@@ -25,7 +24,6 @@ class ListResponseSuite extends FlatSpec with Matchers {
     s"""{"itemsCount":$itemsCount,"pageNumber":$pageNumber,"pageSize":$pageSize$lastUpdate}"""
   }
 
-
   "Json format for ListResponse.Meta" should "read and write correct JSON" in {
     val meta1 =
       ListResponse.Meta(
@@ -38,15 +36,13 @@ class ListResponseSuite extends FlatSpec with Matchers {
     val writtenJson1 =
       ListResponse.listResponseMetaFormat.write(meta1)
 
-    writtenJson1 should be(
-      metaJsonObjectAsString(meta1).parseJson)
+    writtenJson1 should be(metaJsonObjectAsString(meta1).parseJson)
 
     val parsedItem1: ListResponse.Meta =
       ListResponse.listResponseMetaFormat.read(writtenJson1)
 
     meta1 shouldBe parsedItem1
 
-
     val meta2 =
       ListResponse.Meta(
         itemsCount = 1,
@@ -58,8 +54,7 @@ class ListResponseSuite extends FlatSpec with Matchers {
     val writtenJson2 =
       ListResponse.listResponseMetaFormat.write(meta2)
 
-    writtenJson2 should be(
-      metaJsonObjectAsString(meta2).parseJson)
+    writtenJson2 should be(metaJsonObjectAsString(meta2).parseJson)
 
     val parsedItem2: ListResponse.Meta =
       ListResponse.listResponseMetaFormat.read(writtenJson2)
@@ -67,7 +62,6 @@ class ListResponseSuite extends FlatSpec with Matchers {
     meta2 shouldBe parsedItem2
   }
 
-
   "Json format for ListResponse" should "write correct JSON" in {
 
     val orig = MedicalRecord(
@@ -83,13 +77,14 @@ class ListResponseSuite extends FlatSpec with Matchers {
       disease = "Breast",
       requestId = RecordRequestId(UUID.fromString("7b54a75d-4197-4b27-9045-b9b6cb131be9")),
       caseId = None,
-      patientId = UuidId("748b5884-3528-4cb9-904b-7a8151d6e343")
+      patientId = UuidId("748b5884-3528-4cb9-904b-7a8151d6e343"),
+      totalPages = 10
     )
 
     val recordJsonAsString =
       """{"id":1,"status":"New","assignee":null,"previousStatus":null,"previousAssignee":null,"lastActiveUser":null,
         "lastUpdate":"2017-08-10T18:00Z","meta":[],"patientId":"748b5884-3528-4cb9-904b-7a8151d6e343","caseId":null,
-        "requestId":"7b54a75d-4197-4b27-9045-b9b6cb131be9","disease":"Breast","physician":"physician"}"""
+        "requestId":"7b54a75d-4197-4b27-9045-b9b6cb131be9","disease":"Breast","physician":"physician","totalPages":10}"""
 
     val meta =
       ListResponse.Meta(
@@ -101,11 +96,11 @@ class ListResponseSuite extends FlatSpec with Matchers {
 
     val listResponse = ListResponse(Seq(orig), meta)
 
+
     val writtenJson = ListResponse.listResponseWriter.write(listResponse)
     val expectedJson = s"""{"items":[$recordJsonAsString],"meta":${metaJsonObjectAsString(meta)}}"""
 
-    writtenJson should be(
-      expectedJson.parseJson)
+    writtenJson should be(expectedJson.parseJson)
   }
 
 }