Merge branch 'master' into synch-refactor

1 files changed, 12 insertions, 5 deletions

diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/CriterionFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/CriterionFormatSuite.scala
index d24c4c1..708aed9 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/CriterionFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/CriterionFormatSuite.scala
@@ -15,7 +15,8 @@ class CriterionFormatSuite extends FlatSpec with Matchers {
       trialId = StringId("NCT000001"),
       text = Some("text"),
       isCompound = false,
-      meta = "{}"
+      meta = "{}",
+      inclusion = None
     )
     val labels = List(
       CriterionLabel(
@@ -44,12 +45,12 @@ class CriterionFormatSuite extends FlatSpec with Matchers {
     val writtenJson = richCriterionFormat.write(richCriterion)
 
     writtenJson should be(
-      """{"text":"text","isCompound":false,"trialId":"NCT000001","arms":[20,21,21],"id":10,"meta":"{}",
+      """{"text":"text","isCompound":false,"trialId":"NCT000001","inclusion":null,"arms":[20,21,21],"id":10,"meta":"{}",
         "labels":[{"labelId":101,"categoryId":3,"value":"Yes","isDefining":true},
         {"labelId":102,"categoryId":3,"value":"No","isDefining":true}]}""".parseJson)
 
     val createCriterionJson =
-      """{"text":"text","isCompound":false,"trialId":"NCT000001",
+      """{"text":"text","isCompound":false,"trialId":"NCT000001","inclusion":null,
         "arms":[20,21,21],"meta":"{}","labels":[{"labelId":101,"categoryId":3,"value":"Yes","isDefining":true},
         {"labelId":102,"categoryId":3,"value":"No","isDefining":true}]}""".parseJson
     val parsedRichCriterion = richCriterionFormat.read(createCriterionJson)
@@ -59,8 +60,14 @@ class CriterionFormatSuite extends FlatSpec with Matchers {
     )
     parsedRichCriterion should be(expectedRichCriterion)
 
-    val updateCriterionJson = """{"meta":null,"text":"new text","isCompound":true}""".parseJson
-    val expectedUpdatedCriterion = richCriterion.copy(criterion = criterion.copy(text = Some("new text"), isCompound = true, meta = "{}"))
+    val updateCriterionJson = """{"meta":null,"text":"new text","isCompound":true,"inclusion":true}""".parseJson
+    val expectedUpdatedCriterion = richCriterion.copy(
+      criterion = criterion.copy(
+        text = Some("new text"),
+        isCompound = true,
+        meta = "{}",
+        inclusion = Some(true)
+      ))
     val parsedUpdateCriterion = applyUpdateToCriterion(updateCriterionJson, richCriterion)
     parsedUpdateCriterion should be(expectedUpdatedCriterion)
   }