# HG changeset patch # User Sebastien Jodogne # Date 1754917663 -7200 # Node ID 1d005fb79faa290c6d8bf022ed545a7bcdc6eef4 # Parent f7bb0bf6fb50c182711068c18d79a8f465201a35 handling PatientRecyclingOrder metadata diff -r f7bb0bf6fb50 -r 1d005fb79faa Tests/Tests.py --- a/Tests/Tests.py Thu Jul 10 09:17:52 2025 +0200 +++ b/Tests/Tests.py Mon Aug 11 15:07:43 2025 +0200 @@ -1352,10 +1352,14 @@ m = DoGet(_REMOTE, '/patients/%s/metadata' % p) if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): - self.assertEqual(2, len(m)) + if 'PatientRecyclingOrder' in m: # New in Orthanc 1.12.9 (used only by DB plugins) + self.assertEqual(3, len(m)) + else: + self.assertEqual(2, len(m)) self.assertTrue('MainDicomTagsSignature' in m) else: self.assertEqual(1, len(m)) + self.assertTrue('LastUpdate' in m) # The lines below failed on Orthanc <= 1.8.2 @@ -1428,7 +1432,10 @@ m = DoGet(_REMOTE, '/patients/%s/metadata' % p) if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): - self.assertEqual(3, len(m)) + if 'PatientRecyclingOrder' in m: # New in Orthanc 1.12.9 (used only by DB plugins) + self.assertEqual(4, len(m)) + else: + self.assertEqual(3, len(m)) self.assertTrue('MainDicomTagsSignature' in m) else: self.assertEqual(2, len(m)) @@ -1456,7 +1463,10 @@ m = DoGet(_REMOTE, '/patients/%s/metadata' % p) if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): - self.assertEqual(2, len(m)) + if 'PatientRecyclingOrder' in m: # New in Orthanc 1.12.9 (used only by DB plugins) + self.assertEqual(3, len(m)) + else: + self.assertEqual(2, len(m)) self.assertTrue('MainDicomTagsSignature' in m) else: self.assertEqual(1, len(m)) @@ -9105,11 +9115,15 @@ self.assertEqual('KNEE', a[0]['MainDicomTags']['PatientName']) self.assertTrue('Metadata' in a[0]) if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): - self.assertEqual(2, len(a[0]['Metadata'])) + if 'PatientRecyclingOrder' in a[0]['Metadata']: # New in Orthanc 1.12.9 (used only by DB plugins) + self.assertEqual(3, len(a[0]['Metadata'])) + else: + self.assertEqual(2, len(a[0]['Metadata'])) self.assertTrue('MainDicomTagsSignature' in a[0]['Metadata']) else: self.assertEqual(1, len(a[0]['Metadata'])) - self.assertTrue('LastUpdate' in a[0]['Metadata']) + + self.assertTrue('LastUpdate' in a[0]['Metadata']) for level in [ 'Instance', 'Series', 'Study', 'Patient' ]: a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, brainix ],