aboutsummaryrefslogtreecommitdiff
path: root/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialHistoryFormatSuite.scala
diff options
context:
space:
mode:
authorAleksandr <ognelisar@gmail.com>2017-10-12 10:44:54 +0700
committerAleksandr <ognelisar@gmail.com>2017-10-12 10:44:54 +0700
commitf525ab2604cc5d1366c852bdbcb4d912bbcea800 (patch)
tree4fe4b35e1f474e2dc85a8885dc4c9002f3ea46c2 /src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialHistoryFormatSuite.scala
parent9198729ebf3d20b650b4467daa0d484a3148f01c (diff)
parente15415d69ec990d5243e58704e232e619b80aa6f (diff)
downloadrest-query-f525ab2604cc5d1366c852bdbcb4d912bbcea800.tar.gz
rest-query-f525ab2604cc5d1366c852bdbcb4d912bbcea800.tar.bz2
rest-query-f525ab2604cc5d1366c852bdbcb4d912bbcea800.zip
All merge conflicts are resolved
Diffstat (limited to 'src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialHistoryFormatSuite.scala')
-rw-r--r--src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialHistoryFormatSuite.scala3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialHistoryFormatSuite.scala b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialHistoryFormatSuite.scala
index dbb143c..d5ad2ec 100644
--- a/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialHistoryFormatSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuidomain/formats/json/sprayformats/TrialHistoryFormatSuite.scala
@@ -21,8 +21,7 @@ class TrialHistoryFormatSuite extends FlatSpec with Matchers {
)
val writtenJson = trialHistoryFormat.write(trialHistory)
- writtenJson should be(
- """{"id":10,"executor":"userId-001","trialId":"NCT000001","state":"Summarize",
+ writtenJson should be("""{"id":10,"executor":"userId-001","trialId":"NCT000001","state":"Summarize",
"action":"Start","created":"2017-08-10T18:00Z"}""".parseJson)
val parsedTrialHistory = trialHistoryFormat.read(writtenJson)