Mercurial > hg > orthanc-tests
comparison Tests/Tests.py @ 530:937bee4a2fe3
fix
author | Alain Mazy <am@osimis.io> |
---|---|
date | Tue, 18 Apr 2023 17:14:01 +0200 |
parents | 53cf0e3ad007 |
children | 8a920ab91cf4 |
comparison
equal
deleted
inserted
replaced
529:53cf0e3ad007 | 530:937bee4a2fe3 |
---|---|
596 countStudies = 0 | 596 countStudies = 0 |
597 countSeries = 0 | 597 countSeries = 0 |
598 countInstances = 0 | 598 countInstances = 0 |
599 completed = 0 | 599 completed = 0 |
600 while True: | 600 while True: |
601 c = DoGet(_REMOTE, '/changes', { 'since' : since, 'limit' : 3 }) | 601 c = DoGet(_REMOTE, '/changes', { 'since' : since, 'limit' : 1000 }) |
602 since = c['Last'] | 602 since = c['Last'] |
603 for i in c['Changes']: | 603 for i in c['Changes']: |
604 if i['ResourceType'] == 'Instance': | 604 # We have set StableAge to 1 -> we might have StabeStudy but this is not sure -> detect only the 'New' events |
605 | |
606 if i['ResourceType'] == 'Instance' and i['ChangeType'] == 'NewInstance': | |
605 countInstances += 1 | 607 countInstances += 1 |
606 if i['ResourceType'] == 'Patient': | 608 if i['ResourceType'] == 'Patient' and i['ChangeType'] == 'NewPatient': |
607 countPatients += 1 | 609 countPatients += 1 |
608 if i['ResourceType'] == 'Study': | 610 if i['ResourceType'] == 'Study' and i['ChangeType'] == 'NewStudy': |
609 countStudies += 1 | 611 countStudies += 1 |
610 if i['ResourceType'] == 'Series': | 612 if i['ResourceType'] == 'Series' and i['ChangeType'] == 'NewSeries': |
611 countSeries += 1 | |
612 if i['ChangeType'] == 'NewInstance': | |
613 countInstances += 1 | |
614 if i['ChangeType'] == 'NewPatient': | |
615 countPatients += 1 | |
616 if i['ChangeType'] == 'NewStudy': | |
617 countStudies += 1 | |
618 if i['ChangeType'] == 'NewSeries': | |
619 countSeries += 1 | 613 countSeries += 1 |
620 if i['ChangeType'] == 'CompletedSeries': | 614 if i['ChangeType'] == 'CompletedSeries': |
621 completed += 1 | 615 completed += 1 |
622 self.assertTrue('ID' in i) | 616 self.assertTrue('ID' in i) |
623 self.assertTrue('Path' in i) | 617 self.assertTrue('Path' in i) |
624 self.assertTrue('Seq' in i) | 618 self.assertTrue('Seq' in i) |
625 if c['Done']: | 619 if c['Done']: |
626 break | 620 break |
627 | 621 # we count only the events since before the upload of 2 Knee series ! |
628 self.assertEqual(2 * 50, countInstances) | 622 self.assertEqual(50, countInstances) |
629 self.assertEqual(2 * 1, countPatients) | 623 self.assertEqual(1, countPatients) |
630 self.assertEqual(2 * 1, countStudies) | 624 self.assertEqual(1, countStudies) |
631 self.assertEqual(2 * 2, countSeries) | 625 self.assertEqual(2, countSeries) |
632 self.assertEqual(0, completed) | 626 self.assertEqual(0, completed) |
633 | 627 |
634 | 628 |
635 def test_archive(self): | 629 def test_archive(self): |
636 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') | 630 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') |