Mercurial > hg > orthanc-tests
diff Tests/Tests.py @ 486:6144ef431512
new tests for sequences in ExtraMainDicomTags
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Tue, 28 Jun 2022 18:38:21 +0200 |
| parents | 535e651e70a2 |
| children | e904b2282b0e |
line wrap: on
line diff
--- a/Tests/Tests.py Thu Jun 23 14:54:48 2022 +0200 +++ b/Tests/Tests.py Tue Jun 28 18:38:21 2022 +0200 @@ -8603,7 +8603,7 @@ def test_rest_find_requested_tags(self): - if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): + if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): # RequestedTags introduced in 1.11.0 but Sequences allowed since 1.11.1 # Upload instances for i in range(2): @@ -8613,7 +8613,7 @@ a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', 'CaseSensitive' : False, 'Query' : { 'PatientName' : 'BRAINIX' }, - 'RequestedTags' : [ 'PatientName', 'PatientID', 'PatientSex', 'PatientBirthDate' ], + 'RequestedTags' : [ 'PatientName', 'PatientID', 'PatientSex', 'PatientBirthDate'], 'Expand': True }) self.assertEqual(1, len(a)) @@ -8646,24 +8646,26 @@ a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', 'CaseSensitive' : False, 'Query' : { 'PatientName' : 'BRAINIX' }, - 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SeriesInstanceUID'], + 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SeriesInstanceUID', 'RequestAttributesSequence'], 'Expand': True }) self.assertEqual(1, len(a)) self.assertIn('PatientName', a[0]['RequestedTags']) self.assertIn('StudyInstanceUID', a[0]['RequestedTags']) self.assertIn('SeriesInstanceUID', a[0]['RequestedTags']) + self.assertIn('RequestAttributesSequence', a[0]['RequestedTags']) self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) self.assertEqual('1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497', a[0]['RequestedTags']['SeriesInstanceUID']) + self.assertEqual('A10029316690', a[0]['RequestedTags']['RequestAttributesSequence'][0]['RequestedProcedureID']) # Instance level, request patient, study and series tags too, include tags that are not part of the main dicom tags a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', 'CaseSensitive' : False, 'Query' : { 'PatientName' : 'BRAINIX' }, - 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'PhotometricInterpretation'], + 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'PhotometricInterpretation', 'RequestAttributesSequence'], 'Expand': True }) self.assertEqual(1, len(a)) @@ -8671,11 +8673,13 @@ self.assertIn('StudyInstanceUID', a[0]['RequestedTags']) self.assertIn('SeriesInstanceUID', a[0]['RequestedTags']) self.assertIn('PhotometricInterpretation', a[0]['RequestedTags']) + self.assertIn('RequestAttributesSequence', a[0]['RequestedTags']) self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName']) self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID']) self.assertEqual('1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497', a[0]['RequestedTags']['SeriesInstanceUID']) self.assertEqual('MONOCHROME2', a[0]['RequestedTags']['PhotometricInterpretation']) + self.assertEqual('A10029316690', a[0]['RequestedTags']['RequestAttributesSequence'][0]['RequestedProcedureID']) def test_rest_find_requested_tags_computed_tags(self):