diff options
author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2017-10-05 14:56:21 +0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-05 14:56:21 +0700 |
commit | 1b04669effd79324e52f0dcba0f3714d4a2a957c (patch) | |
tree | f790167557d8e3d17224fda4747b4349092a3107 /src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientCriterionFormatSuite.scala | |
parent | 98dd8b171aee84c88754ea1a8ec20524ad579d7c (diff) | |
parent | c5462a496aeb4d43f023bb427bf12fc87b482b61 (diff) | |
download | rest-query-1b04669effd79324e52f0dcba0f3714d4a2a957c.tar.gz rest-query-1b04669effd79324e52f0dcba0f3714d4a2a957c.tar.bz2 rest-query-1b04669effd79324e52f0dcba0f3714d4a2a957c.zip |
Merge pull request #38 from drivergroup/replace-tuplesv0.6.0
Replace tuples in services replies to rich-classes
Diffstat (limited to 'src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientCriterionFormatSuite.scala')
-rw-r--r-- | src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientCriterionFormatSuite.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientCriterionFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientCriterionFormatSuite.scala index 0f5e4e2..623b3a9 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientCriterionFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/PatientCriterionFormatSuite.scala @@ -6,7 +6,7 @@ import spray.json._ import org.scalatest.{FlatSpec, Matchers} import xyz.driver.pdsuicommon.domain.{FuzzyValue, LongId, StringId} import xyz.driver.pdsuidomain.entities.{PatientCriterion, PatientCriterionArm} -import xyz.driver.pdsuidomain.services.PatientCriterionService.DraftPatientCriterion +import xyz.driver.pdsuidomain.services.PatientCriterionService.{DraftPatientCriterion, RichPatientCriterion} class PatientCriterionFormatSuite extends FlatSpec with Matchers { import patientcriterion._ @@ -31,7 +31,8 @@ class PatientCriterionFormatSuite extends FlatSpec with Matchers { PatientCriterionArm(patientCriterionId = LongId(1), armId = LongId(31), armName = "arm 31"), PatientCriterionArm(patientCriterionId = LongId(1), armId = LongId(32), armName = "arm 32") ) - val writtenJson = patientCriterionWriter.write((orig, LongId(21), arms)) + val richPatientCriterion = RichPatientCriterion(orig, LongId(21), arms) + val writtenJson = patientCriterionWriter.write(richPatientCriterion) writtenJson should be ( """{"id":1,"labelId":21,"nctId":"NCT00001","criterionId":101,"criterionText":"criterion text","criterionValue":"Yes", |