Mercurial > hg > orthanc-tests

comparison Tests/Tests.py @ 669:36c00333f6ef default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix test
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 12 Jul 2024 14:07:49 +0200
parents f92a2036fb96
children
comparison
equal deleted inserted replaced
668:f92a2036fb96 669:36c00333f6ef
5441 def test_findscu_missing_tags(self): 5441 def test_findscu_missing_tags(self):
5442 # dcmodify -e Rows DummyCTInvalidRows.dcm -gst -gse -gin 5442 # dcmodify -e Rows DummyCTInvalidRows.dcm -gst -gse -gin
5443 UploadInstance(_REMOTE, 'DummyCT.dcm') 5443 UploadInstance(_REMOTE, 'DummyCT.dcm')
5444 UploadInstance(_REMOTE, 'DummyCTInvalidRows.dcm') 5444 UploadInstance(_REMOTE, 'DummyCTInvalidRows.dcm')
5445 5445
5446 i = CallFindScu([ '-k', '0008,0052=IMAGES', '-k', 'Rows', '-k', 'PatientName' ]) 5446 i = CallFindScu([ '-k', '0008,0052=IMAGES', '-k', 'PatientName', '-k', 'Rows', '-k', 'Columns' ])
5447 5447
5448 # We have 2 instances... 5448 # We have 2 instances...
5449 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i) 5449 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i)
5450 self.assertEqual(2, len(patientNames)) 5450 self.assertEqual(2, len(patientNames))
5451 self.assertEqual('KNIX', patientNames[0]) 5451 self.assertEqual('KNIX', patientNames[0])
5452 self.assertEqual('KNIX', patientNames[1]) 5452 self.assertEqual('KNIX', patientNames[1])
5453
5454 columns = re.findall('\(0028,0011\) US ([0-9]+)', i)
5455 self.assertEqual(2, len(columns))
5456 self.assertEqual('512', columns[0])
5457 self.assertEqual('512', columns[1])
5453 5458
5454 # ...but only 1 value for the "Rows" tag 5459 # ...but only 1 value for the "Rows" tag
5455 rows = re.findall('\(0028,0010\) US ([0-9]+)', i) 5460 rows = re.findall('\(0028,0010\) US ([0-9]+)', i)
5456 self.assertEqual(1, len(rows)) 5461 self.assertEqual(1, len(rows))
5457 self.assertEqual('512', rows[0]) 5462 self.assertEqual('512', rows[0])
5855 })) 5860 }))
5856 self.assertEqual(0, CountAnswers({ 5861 self.assertEqual(0, CountAnswers({
5857 # This test fails on Orthanc <= 1.5.8 5862 # This test fails on Orthanc <= 1.5.8
5858 'Level' : 'Study', 5863 'Level' : 'Study',
5859 'Query' : { 5864 'Query' : {
5860 'SeriesDescription' : '*' # Wildcard matching => no match, as the tag is absent 5865 'ImageComments' : '*' # Wildcard matching => no match, as the tag is absent
5866 },
5867 'Normalize' : False
5868 }))
5869 self.assertEqual(1, CountAnswers({
5870 'Level' : 'Study',
5871 'Query' : {
5872 'ImageComments' : ''
5861 }, 5873 },
5862 'Normalize' : False 5874 'Normalize' : False
5863 })) 5875 }))
5864 self.assertEqual(1, CountAnswers({ 5876 self.assertEqual(1, CountAnswers({
5865 'Level' : 'Study', 5877 'Level' : 'Study',
5869 'Normalize' : True 5881 'Normalize' : True
5870 })) 5882 }))
5871 self.assertEqual(1, CountAnswers({ 5883 self.assertEqual(1, CountAnswers({
5872 'Level' : 'Study', 5884 'Level' : 'Study',
5873 'Query' : { 5885 'Query' : {
5874 'SeriesDescription' : '*' # Matches, as wiped out by the normalization 5886 'ImageComments' : '*' # Matches, as wiped out by the normalization
5887 },
5888 'Normalize' : True
5889 }))
5890 self.assertEqual(1, CountAnswers({
5891 'Level' : 'Study',
5892 'Query' : {
5893 'ImageComments' : ''
5875 }, 5894 },
5876 'Normalize' : True 5895 'Normalize' : True
5877 })) 5896 }))
5878 5897
5879 for normalize in [ True, False ]: 5898 for normalize in [ True, False ]: