Merge remote-tracking branch 'origin/master' into master5v0.14.13

1 files changed, 23 insertions, 3 deletions

diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordHistoryFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordHistoryFormatSuite.scala
index 88240cd..c34f8c0 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordHistoryFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/MedicalRecordHistoryFormatSuite.scala
@@ -2,15 +2,35 @@ package xyz.driver.pdsuidomain.formats.json
 
 import java.time.LocalDateTime
 
-import org.scalatest.{FlatSpec, Matchers}
+import org.scalatest.{FreeSpecLike, Matchers}
 import spray.json._
 import xyz.driver.pdsuicommon.domain.LongId
 import xyz.driver.pdsuidomain.entities.MedicalRecordHistory
 
-class MedicalRecordHistoryFormatSuite extends FlatSpec with Matchers {
+class MedicalRecordHistoryFormatSuite extends FreeSpecLike with Matchers {
   import xyz.driver.pdsuidomain.formats.json.recordhistory._
 
-  "Json format for MedicalRecordHistory" should "read and write correct JSON" in {
+
+  "Can read and write MedicalRecordHistory states" - {
+    val states = MedicalRecordHistory.State.All
+    states.foreach { state =>s"$state" in test(state)}
+  }
+
+  "Can read and write MedicalRecordHistory actions" - {
+    val actions = MedicalRecordHistory.Action.All
+    actions.foreach { action =>s"$action" in test(action)}
+  }
+
+  private def test(state: MedicalRecordHistory.State) = {
+    recordStateFormat.read(recordStateFormat.write(state)) shouldBe state
+  }
+
+  private def test(action: MedicalRecordHistory.Action) = {
+    recordActionFormat.read(recordActionFormat.write(action)) shouldBe action
+  }
+
+
+  "Json format for MedicalRecordHistory should read and write correct JSON" - {
     val recordHistory = MedicalRecordHistory(
       id = LongId(10),
       recordId = LongId(1),