Mercurial > hg > orthanc-tests

comparison Tests/Tests.py @ 335:96718de2f29c Orthanc-1.7.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplification and fix of test_incoming_findscu
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 16 Sep 2020 13:21:12 +0200
parents 971ff285302b
children ec13ace43bde
comparison
equal deleted inserted replaced
334:971ff285302b 335:96718de2f29c
1183 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i) 1183 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i)
1184 self.assertEqual(2, len(series)) 1184 self.assertEqual(2, len(series))
1185 self.assertTrue('20070208' in series) 1185 self.assertTrue('20070208' in series)
1186 self.assertTrue('19980312' in series) 1186 self.assertTrue('19980312' in series)
1187 1187
1188 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0008,0021', '-k', 'ModalitiesInStudy=MR\\XA' ]) 1188 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0008,0021', '-k', 'Modality=MR\\XA' ])
1189 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i) 1189 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i)
1190 self.assertEqual(1, len(series)) 1190 self.assertEqual(1, len(series))
1191 self.assertTrue('19980312' in series) 1191 self.assertTrue('19980312' in series)
1192 1192
1193 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=Anonymized' ]) 1193 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=Anonymized' ])
5989 def test_rest_modalities_in_study_2(self): 5989 def test_rest_modalities_in_study_2(self):
5990 # Problem reported by Alain Mazy on 2020-09-15 5990 # Problem reported by Alain Mazy on 2020-09-15
5991 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm') 5991 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm')
5992 UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0001.dcm') 5992 UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0001.dcm')
5993 5993
5994 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', 5994 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', '0020,000d=', '-k', '0008,0061=' ])
5995 'Query' : { 'ModalitiesInStudy' : 'UX' }}) 5995 modalitiesInStudy = re.findall('\(0008,0061\).*?\[(.*?)\]', i)
5996 self.assertEqual(0, len(a)) 5996 self.assertEqual(1, len(modalitiesInStudy))
5997 5997 self.assertEqual('CT\\PT ', modalitiesInStudy[0])
5998 for i in [ '', 'PT', 'CT\\PT', 'UX\\PT', 'CT\\PT' ]: 5998
5999 # The empty string '' corresponds to universal matching 5999 for i in [ '', 'CT', 'PT', 'UX', 'UX\\MR', 'CT\\PT', 'UX\\PT', 'CT\\PT', 'UX\\CT\\PT' ]:
6000 # The empty string '' corresponds to universal matching.
6001 # The case where "i == 'CT'" failed in Orthanc <= 1.7.3.
6002
6003 if i in [ 'UX', 'UX\\MR' ]:
6004 expected = 0
6005 else:
6006 expected = 1
6007
6000 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', 6008 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
6001 'Query' : { 'ModalitiesInStudy' : i }}) 6009 'Query' : { 'ModalitiesInStudy' : i }})
6002 self.assertEqual(1, len(a)) 6010 self.assertEqual(expected, len(a))
6003 6011
6004 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', '0020,000d=', '-k', '0008,0061=%s' % i ]) 6012 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', '0020,000d=', '-k', '0008,0061=%s' % i ])
6005 studyInstanceUid = re.findall('\(0020,000d\).*?\[(.*?)\]', i) 6013 studyInstanceUid = re.findall('\(0020,000d\).*?\[(.*?)\]', i)
6006 self.assertEqual(1, len(studyInstanceUid)) 6014 self.assertEqual(expected, len(studyInstanceUid))
6007
6008 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
6009 'Query' : { 'ModalitiesInStudy' : 'CT' }})
6010 self.assertEqual(1, len(a)) # Fails in Orthanc <= 1.7.3
6011
6012 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', '0020,000d=', '-k', '0008,0061=CT' ])
6013 studyInstanceUid = re.findall('\(0020,000d\).*?\[(.*?)\]', i)
6014 self.assertEqual(1, len(studyInstanceUid)) # Fails in Orthanc <= 1.7.3