1 files changed, 8 insertions, 8 deletions
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ExportFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ExportFormatSuite.scala
index a451905..3eaf93f 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ExportFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/ExportFormatSuite.scala
@@ -3,9 +3,10 @@ package xyz.driver.pdsuidomain.formats.json.sprayformats
 import java.time.{LocalDate, LocalDateTime}
 import java.util.UUID
 
-import spray.json._
 import org.scalatest.{FlatSpec, Matchers}
-import xyz.driver.pdsuicommon.domain.{FuzzyValue, LongId, StringId, UuidId}
+import spray.json._
+import xyz.driver.entities.labels.LabelValue
+import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId}
 import xyz.driver.pdsuidomain.entities.{DocumentType, ProviderType, RecordRequestId}
 
 class ExportFormatSuite extends FlatSpec with Matchers {
@@ -27,13 +28,13 @@ class ExportFormatSuite extends FlatSpec with Matchers {
         evidences = List(
           ExportPatientLabelEvidence(
             id = LongId(11),
-            value = FuzzyValue.Yes,
+            value = LabelValue.Yes,
             evidenceText = "evidence text 11",
             document = document
           ),
           ExportPatientLabelEvidence(
             id = LongId(12),
-            value = FuzzyValue.No,
+            value = LabelValue.No,
             evidenceText = "evidence text 12",
             document = document
           )
@@ -44,13 +45,13 @@ class ExportFormatSuite extends FlatSpec with Matchers {
         evidences = List(
           ExportPatientLabelEvidence(
             id = LongId(12),
-            value = FuzzyValue.Yes,
+            value = LabelValue.Yes,
             evidenceText = "evidence text 12",
             document = document
           ),
           ExportPatientLabelEvidence(
             id = LongId(13),
-            value = FuzzyValue.Yes,
+            value = LabelValue.Yes,
             evidenceText = "evidence text 13",
             document = document
           )
@@ -106,7 +107,6 @@ class ExportFormatSuite extends FlatSpec with Matchers {
     val trialWithLabels = ExportTrialWithLabels(
       nctId = StringId("NCT000001"),
       trialId = UuidId("40892a07-c638-49d2-9795-1edfefbbcc7c"),
-      condition = "Breast",
       lastReviewed = LocalDateTime.parse("2017-08-10T18:00:00"),
       labelVersion = 1L,
       arms = arms,
@@ -115,7 +115,7 @@ class ExportFormatSuite extends FlatSpec with Matchers {
 
     val writtenJson = trialWithLabelsFormat.write(trialWithLabels)
     writtenJson should be(
-      """{"nctId":"NCT000001","trialId":"40892a07-c638-49d2-9795-1edfefbbcc7c","disease":"Breast","lastReviewed":"2017-08-10T18:00Z",
+      """{"nctId":"NCT000001","trialId":"40892a07-c638-49d2-9795-1edfefbbcc7c","lastReviewed":"2017-08-10T18:00Z",
         "labelVersion":1,"arms":[{"armId":1,"armName":"arm 1"},{"armId":2,"armName":"arm 2"}],"criteria":[
         {"value":"Yes","labelId":21,"criterionId":10,"criterionText":"criteria 10 text","armIds":[1,2],"isCompound":false,"isDefining":false},
         {"value":"Unknown","labelId":21,"criterionId":11,"criterionText":"criteria 11 text","armIds":[2],"isCompound":true,"isDefining":false}]}""".parseJson)