diff options
| author | Aleksandr <ognelisar@gmail.com> | 2017-10-19 18:16:10 +0700 |
|---|---|---|
| committer | Aleksandr <ognelisar@gmail.com> | 2017-10-19 18:16:10 +0700 |
| commit | 0eb0f1b877237fe20069e66ca460549e5e96377c (patch) | |
| tree | 806dbe37cbbfe732a334963335d61863de6f0765 /src/test/scala/xyz | |
| parent | e916240b94c4bf30b8d23f547b9931adb004e1e7 (diff) | |
| parent | c04b779341e9d54e5b519db085420c9a1ea66610 (diff) | |
| download | rest-query-0eb0f1b877237fe20069e66ca460549e5e96377c.tar.gz rest-query-0eb0f1b877237fe20069e66ca460549e5e96377c.tar.bz2 rest-query-0eb0f1b877237fe20069e66ca460549e5e96377c.zip | |
Merge branch 'master' into TRIAL-55
Diffstat (limited to 'src/test/scala/xyz')
2 files changed, 3 insertions, 7 deletions
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/InterventionFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/InterventionFormatSuite.scala index 5891e1c..4532da4 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/InterventionFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/InterventionFormatSuite.scala @@ -59,7 +59,7 @@ class InterventionFormatSuite extends FlatSpec with Matchers { } "Json format for InterventionType" should "read and write correct JSON" in { - val interventionType = InterventionType.typeFromString("Surgery/Procedure") + val interventionType = InterventionType.SurgeryProcedure val writtenJson = interventionTypeFormat.write(interventionType) writtenJson should be( diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/StudyDesignFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/StudyDesignFormatSuite.scala index 9cf9b5f..e847445 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/StudyDesignFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/StudyDesignFormatSuite.scala @@ -2,20 +2,16 @@ package xyz.driver.pdsuidomain.formats.json.sprayformats import spray.json._ import org.scalatest.{FlatSpec, Matchers} -import xyz.driver.pdsuicommon.domain.LongId import xyz.driver.pdsuidomain.entities.StudyDesign class StudyDesignFormatSuite extends FlatSpec with Matchers { import studydesign._ "Json format for StudyDesign" should "read and write correct JSON" in { - val studyDesign = StudyDesign( - id = LongId(10), - name = "study design name" - ) + val studyDesign = StudyDesign.Randomized val writtenJson = studyDesignFormat.write(studyDesign) - writtenJson should be("""{"id":10,"name":"study design name"}""".parseJson) + writtenJson should be("""{"id":1,"name":"Randomized"}""".parseJson) val parsedStudyDesign = studyDesignFormat.read(writtenJson) parsedStudyDesign should be(studyDesign) |