Mercurial > hg > orthanc-tests

comparison Tests/Tests.py @ 456:0d7c0bbe6c90 more-tags

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Alain Mazy <am@osimis.io>
date Wed, 23 Mar 2022 09:24:07 +0100
parents 6105b7671a58
children ee398adfeb8e
comparison
equal deleted inserted replaced
454:6105b7671a58 456:0d7c0bbe6c90
214 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 8, 6)) 214 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 8, 6))
215 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 8, 7)) 215 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 8, 7))
216 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 7, 6)) 216 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 7, 6))
217 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 9, 6)) 217 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 9, 6))
218 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 1, 8, 6)) 218 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 1, 8, 6))
219
220 system = DoGet(_REMOTE, '/system')
221 self.assertIn("MainDicomTags", system)
222 self.assertIn("Patient", system["MainDicomTags"])
223 self.assertIn("Studies", system["MainDicomTags"])
224 self.assertIn("Series", system["MainDicomTags"])
225 self.assertIn("Instance", system["MainDicomTags"])
226
219 227
220 def test_upload(self): 228 def test_upload(self):
221 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize']) 229 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
222 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']) 230 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
223 231
8562 8570
8563 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) 8571 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
8564 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) 8572 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID'])
8565 self.assertEqual('2', a[0]['RequestedTags']['NumberOfSeriesRelatedInstances']) 8573 self.assertEqual('2', a[0]['RequestedTags']['NumberOfSeriesRelatedInstances'])
8566 8574
8575 # Instance level
8576 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
8577 'CaseSensitive' : False,
8578 'Query' : { 'PatientName' : 'BRAINIX' },
8579 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SOPInstanceUID', 'InstanceAvailability'],
8580 'Expand': True
8581 })
8582 self.assertEqual(2, len(a))
8583
8584 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
8585 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID'])
8586 self.assertEqual('ONLINE', a[0]['RequestedTags']['InstanceAvailability'])
8587
8567 def test_list_resources_requested_tags(self): 8588 def test_list_resources_requested_tags(self):
8568 8589
8569 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] 8590 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
8570 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] 8591 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID']
8571 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] 8592 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
8584 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', a[0]['RequestedTags']['StudyInstanceUID']) 8605 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', a[0]['RequestedTags']['StudyInstanceUID'])
8585 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) 8606 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
8586 8607
8587 8608
8588 # list instances and request patient, studies and series tags including tags that are not in main dicom tags 8609 # list instances and request patient, studies and series tags including tags that are not in main dicom tags
8589 a = DoGet(_REMOTE, '/patients/%s/instances?expand&simplify&requestedTags=PatientName;StudyInstanceUID;SeriesInstanceUID;SOPInstanceUID;Rows;Columns' % patient) 8610 a = DoGet(_REMOTE, '/patients/%s/instances?expand&simplify&requestedTags=PatientName;StudyInstanceUID;SeriesInstanceUID;SOPInstanceUID;Rows;Columns;InstanceAvailability' % patient)
8590 8611
8591 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', a[0]['RequestedTags']['StudyInstanceUID']) 8612 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', a[0]['RequestedTags']['StudyInstanceUID'])
8592 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', a[0]['RequestedTags']['SeriesInstanceUID']) 8613 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', a[0]['RequestedTags']['SeriesInstanceUID'])
8593 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', a[0]['RequestedTags']['SOPInstanceUID']) 8614 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', a[0]['RequestedTags']['SOPInstanceUID'])
8594 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName']) 8615 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
8595 self.assertEqual('512', a[0]['RequestedTags']['Rows']) 8616 self.assertEqual('512', a[0]['RequestedTags']['Rows'])
8596 self.assertEqual('512', a[0]['RequestedTags']['Columns']) 8617 self.assertEqual('512', a[0]['RequestedTags']['Columns'])
8618 self.assertEqual('ONLINE', a[0]['RequestedTags']['Availability'])
8597 8619
8598 8620
8599 def test_list_resources_requested_tags_study_computed_tags(self): 8621 def test_list_resources_requested_tags_study_computed_tags(self):
8600 8622
8601 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID'] 8623 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']