comparison Tests/Tests.py @ 473:4ee85b016a40

added NewTests framework - only the Housekeeper tests right now
author Alain Mazy <am@osimis.io>
date Sat, 30 Apr 2022 19:38:34 +0200
parents d9ceb0fd5995
children 535e651e70a2
comparison
equal deleted inserted replaced
472:d9ceb0fd5995 473:4ee85b016a40
3777 CompareMainDicomTag('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', a, '', 'SOPInstanceUID') 3777 CompareMainDicomTag('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', a, '', 'SOPInstanceUID')
3778 CompareMainDicomTag('myid', b, '', 'SOPInstanceUID') 3778 CompareMainDicomTag('myid', b, '', 'SOPInstanceUID')
3779 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % a).strip()) 3779 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % a).strip())
3780 self.assertEqual('test', DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % b).strip()) 3780 self.assertEqual('test', DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % b).strip())
3781 3781
3782 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
3783 # metadata before reconstruct
3784 mba = DoGet(_REMOTE, '/instances/%s/metadata?expand' % a)
3785 mbb = DoGet(_REMOTE, '/instances/%s/metadata?expand' % a)
3786
3787 # reconstruct by taking the new instance as the reference -> should repopulate study fields from this instance tags
3782 DoPost(_REMOTE, '/instances/%s/reconstruct' % b, {}) 3788 DoPost(_REMOTE, '/instances/%s/reconstruct' % b, {})
3783 3789
3784 CompareMainDicomTag('hello', a, 'study', 'StudyDescription') 3790 CompareMainDicomTag('hello', a, 'study', 'StudyDescription')
3785 CompareMainDicomTag('world', a, 'series', 'SeriesDescription') 3791 CompareMainDicomTag('world', a, 'series', 'SeriesDescription')
3786 CompareMainDicomTag('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', a, '', 'SOPInstanceUID') 3792 CompareMainDicomTag('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', a, '', 'SOPInstanceUID')
3793
3794 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
3795 # metadata after reconstruct should have been preserved
3796 maa = DoGet(_REMOTE, '/instances/%s/metadata?expand' % a)
3797 mab = DoGet(_REMOTE, '/instances/%s/metadata?expand' % a)
3798
3799 self.assertEqual(mba, maa)
3800 self.assertEqual(mbb, mab)
3801
3787 3802
3788 def test_httpClient_lua(self): 3803 def test_httpClient_lua(self):
3789 retries = 3 3804 retries = 3
3790 result = '' 3805 result = ''
3791 3806