diff options
author | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2018-01-18 22:14:22 +0200 |
---|---|---|
committer | Kseniya Tomskikh <ktomskih@datamonsters.co> | 2018-01-18 22:14:22 +0200 |
commit | e6efab471cb30df21d07883b56af6e94e0507849 (patch) | |
tree | f4e5a107db79fec4a3dca724aa01b2f500f8f320 /src/test/scala/xyz/driver/pdsuidomain | |
parent | af10bb0a3131ebad9050f1766dadfa3954268f2c (diff) | |
parent | 57b1a08669ddb3fb54cf79a2f42cb473e0ced3f5 (diff) | |
download | rest-query-e6efab471cb30df21d07883b56af6e94e0507849.tar.gz rest-query-e6efab471cb30df21d07883b56af6e94e0507849.tar.bz2 rest-query-e6efab471cb30df21d07883b56af6e94e0507849.zip |
Merge branch 'master' into TRIAL-193v0.15.1.1
Diffstat (limited to 'src/test/scala/xyz/driver/pdsuidomain')
3 files changed, 2 insertions, 5 deletions
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientCriterionFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientCriterionFormatSuite.scala index 94d80c9..370173a 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientCriterionFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientCriterionFormatSuite.scala @@ -6,8 +6,7 @@ import spray.json._ import org.scalatest.{FlatSpec, Matchers} import xyz.driver.entities.labels.LabelValue import xyz.driver.pdsuicommon.domain.{LongId, StringId} -import xyz.driver.pdsuidomain.entities.{PatientCriterion, PatientCriterionArm} -import xyz.driver.pdsuidomain.services.PatientCriterionService.{DraftPatientCriterion, RichPatientCriterion} +import xyz.driver.pdsuidomain.entities.{DraftPatientCriterion, PatientCriterion, PatientCriterionArm, RichPatientCriterion} class PatientCriterionFormatSuite extends FlatSpec with Matchers { import xyz.driver.pdsuidomain.formats.json.patientcriterion._ diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientEligibleTrialFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientEligibleTrialFormatSuite.scala index faef0f6..6f3bc19 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientEligibleTrialFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientEligibleTrialFormatSuite.scala @@ -6,8 +6,7 @@ import org.scalatest.{FlatSpec, Matchers} import spray.json._ import xyz.driver.entities.labels.LabelValue import xyz.driver.pdsuicommon.domain.{LongId, StringId, UuidId} -import xyz.driver.pdsuidomain.entities.{PatientCriterionArm, PatientTrialArmGroupView, Trial} -import xyz.driver.pdsuidomain.services.PatientEligibleTrialService.RichPatientEligibleTrial +import xyz.driver.pdsuidomain.entities.{PatientCriterionArm, PatientTrialArmGroupView, RichPatientEligibleTrial, Trial} class PatientEligibleTrialFormatSuite extends FlatSpec with Matchers { import xyz.driver.pdsuidomain.formats.json.patienteligibletrial._ diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientLabelFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientLabelFormatSuite.scala index 289de53..9340d02 100644 --- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientLabelFormatSuite.scala +++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/PatientLabelFormatSuite.scala @@ -7,7 +7,6 @@ import org.scalatest.{FlatSpec, Matchers} import xyz.driver.entities.labels.LabelValue import xyz.driver.pdsuicommon.domain.{LongId, UuidId} import xyz.driver.pdsuidomain.entities._ -import xyz.driver.pdsuidomain.services.PatientLabelService.RichPatientLabel class PatientLabelFormatSuite extends FlatSpec with Matchers { |