comparison Tests/Tests.py @ 334:971ff285302b

test_rest_modalities_in_study_2
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 15 Sep 2020 16:04:48 +0200
parents 695be643b0f4
children 96718de2f29c
comparison
equal deleted inserted replaced
333:695be643b0f4 334:971ff285302b
5983 self.assertEqual(512 * 512 * 2, len(raw)) 5983 self.assertEqual(512 * 512 * 2, len(raw))
5984 5984
5985 raw = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % b) 5985 raw = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % b)
5986 self.assertEqual(512 * 512 * 2, len(raw)) 5986 self.assertEqual(512 * 512 * 2, len(raw))
5987 5987
5988
5989 def test_rest_modalities_in_study_2(self):
5990 # Problem reported by Alain Mazy on 2020-09-15
5991 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm')
5992 UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0001.dcm')
5993
5994 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
5995 'Query' : { 'ModalitiesInStudy' : 'UX' }})
5996 self.assertEqual(0, len(a))
5997
5998 for i in [ '', 'PT', 'CT\\PT', 'UX\\PT', 'CT\\PT' ]:
5999 # The empty string '' corresponds to universal matching
6000 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
6001 'Query' : { 'ModalitiesInStudy' : i }})
6002 self.assertEqual(1, len(a))
6003
6004 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', '0020,000d=', '-k', '0008,0061=%s' % i ])
6005 studyInstanceUid = re.findall('\(0020,000d\).*?\[(.*?)\]', i)
6006 self.assertEqual(1, 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