Mercurial > hg > orthanc-tests
diff Tests/Tests.py @ 281:99acf0c17348
cont
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 11 Mar 2020 11:04:55 +0100 |
parents | 5daa3896981c |
children | 281a32ecc5c1 |
line wrap: on
line diff
--- a/Tests/Tests.py Tue Mar 10 20:54:57 2020 +0100 +++ b/Tests/Tests.py Wed Mar 11 11:04:55 2020 +0100 @@ -5308,14 +5308,14 @@ else: time.sleep(0.1) - UploadInstance(_REMOTE, 'DummyCT.dcm') + instance = UploadInstance(_REMOTE, 'DummyCT.dcm') sopClassUid = '1.2.840.10008.5.1.4.1.1.4' sopInstanceUid = '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' # Against self - transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', [ - [ sopClassUid, sopInstanceUid ], - ]) ['ID'] + transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', { + "DicomInstances" : [ [ sopClassUid, sopInstanceUid ] ], + }) ['ID'] self.assertTrue(transaction.startswith('2.25.')) result = WaitTransaction(transaction) @@ -5326,18 +5326,33 @@ self.assertEqual(sopClassUid, result['Success'][0]['SOPClassUID']) self.assertEqual(sopInstanceUid, result['Success'][0]['SOPInstanceUID']) - tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', [ - { 'SOPClassUID' : sopClassUid, - 'SOPInstanceUID' : sopInstanceUid }, - ]) + tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', { + "DicomInstances" : [ + { 'SOPClassUID' : sopClassUid, + 'SOPInstanceUID' : sopInstanceUid }, + ], + }) + self.assertEqual(tmp['Path'], '/storage-commitment/%s' % tmp['ID']) + self.assertEqual(result, WaitTransaction(transaction)) + + tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', { + "Resources" : [ + instance['ID'], + instance['ParentSeries'], + instance['ParentStudy'], + instance['ParentPatient'], + ] + }) self.assertEqual(tmp['Path'], '/storage-commitment/%s' % tmp['ID']) self.assertEqual(result, WaitTransaction(transaction)) - transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', [ - [ 'nope', 'nope2' ], - [ sopClassUid, sopInstanceUid ], - ]) ['ID'] + transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', { + "DicomInstances" : [ + [ 'nope', 'nope2' ], + [ sopClassUid, sopInstanceUid ], + ], + }) ['ID'] self.assertTrue(transaction.startswith('2.25.')) result = WaitTransaction(transaction) @@ -5358,9 +5373,11 @@ # Against Orthanc 0.8.6, that does not support storage commitment self.assertRaises(Exception, lambda: - DoPost(_REMOTE, '/modalities/orthanctest/storage-commitment', [ - [ sopClassUid, sopInstanceUid ], - ])) + DoPost(_REMOTE, '/modalities/orthanctest/storage-commitment', { + "DicomInstances" : [ + [ sopClassUid, sopInstanceUid ], + ] + }))