comparison Tests/Tests.py @ 314:59e8a50bef00

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 26 May 2020 11:23:14 +0200
parents e12c8434aa1e
children 0124075797cd
comparison
equal deleted inserted replaced
313:857016edb861 314:59e8a50bef00
2370 DoDelete(_REMOTE, '/instances/%s' % f) 2370 DoDelete(_REMOTE, '/instances/%s' % f)
2371 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID'] 2371 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID']
2372 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f) 2372 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f)
2373 self.assertNotEqual(u'Рентгенография', tags['SeriesDescription']) 2373 self.assertNotEqual(u'Рентгенография', tags['SeriesDescription'])
2374 2374
2375 # Back to UTF-8
2376 self.assertEqual('Utf8', DoPut(_REMOTE, '/tools/default-encoding', 'Utf8'))
2377
2375 2378
2376 def test_encodings(self): 2379 def test_encodings(self):
2377 # Latin-1 (ISO_IR 100) 2380 # Latin-1 (ISO_IR 100)
2378 brainix = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'] 2381 brainix = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID']
2379 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % brainix) 2382 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % brainix)
3359 'Query' : { }}) 3362 'Query' : { }})
3360 self.assertEqual(1, len(a)) 3363 self.assertEqual(1, len(a))
3361 3364
3362 tmp = ENCODINGS[name][1] 3365 tmp = ENCODINGS[name][1]
3363 self.assertEqual(TEST.encode(tmp, 'ignore').decode(tmp), a[0]["PatientMainDicomTags"]["PatientName"]) 3366 self.assertEqual(TEST.encode(tmp, 'ignore').decode(tmp), a[0]["PatientMainDicomTags"]["PatientName"])
3367
3368 # Back to UTF-8
3369 self.assertEqual('Utf8', DoPut(_REMOTE, '/tools/default-encoding', 'Utf8'))
3364 3370
3365 3371
3366 def test_reconstruct(self): 3372 def test_reconstruct(self):
3367 def CompareMainDicomTag(expected, instance, level, tag): 3373 def CompareMainDicomTag(expected, instance, level, tag):
3368 self.assertEqual(expected, DoGet(_REMOTE, '/instances/%s/%s' % (instance, level))['MainDicomTags'][tag].strip()) 3374 self.assertEqual(expected, DoGet(_REMOTE, '/instances/%s/%s' % (instance, level))['MainDicomTags'][tag].strip())