diff Tests/Tests.py @ 691:79c06b1ed0a8

check storage access counts
author Alain Mazy <am@orthanc.team>
date Wed, 18 Sep 2024 14:54:47 +0200
parents 870fcd19560f
children 4567c3947f8a
line wrap: on
line diff
--- a/Tests/Tests.py	Wed Sep 18 09:36:52 2024 +0200
+++ b/Tests/Tests.py	Wed Sep 18 14:54:47 2024 +0200
@@ -1303,7 +1303,10 @@
         self.assertTrue('LastUpdate' in m)
 
         m = DoGet(_REMOTE, '/series/%s/metadata' % series)
-        if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
+        if IsOrthancVersionAbove(_REMOTE, 1, 12, 5):
+            self.assertEqual(4, len(m))
+            self.assertTrue('MainDicomSequences' in m)    # since RequestAttributeSequence is now in the MainDicomTags
+        elif IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
             self.assertEqual(3, len(m))
             self.assertTrue('MainDicomTagsSignature' in m)
         else:
@@ -1560,7 +1563,10 @@
 
         series = DoGet(_REMOTE, '/series')[0]
         m = DoGet(_REMOTE, '/series/%s/metadata' % series)
-        if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
+        if IsOrthancVersionAbove(_REMOTE, 1, 12, 5):
+            self.assertEqual(4, len(m))
+            self.assertTrue('MainDicomSequences' in m)    # since RequestAttributeSequence is now in the MainDicomTags
+        elif IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
             self.assertEqual(3, len(m))
             self.assertTrue('MainDicomTagsSignature' in m)
         else:
@@ -10513,6 +10519,9 @@
             self.assertEqual('Instance', instance['Type'])
             self.assertEqual(1, instance['IndexInSeries'])
             self.assertEqual(0, len(instance['Labels']))
+            # if IsOrthancVersionAbove(_REMOTE, 1, 12, 5):
+            #     self.assertEqual(8, len(instance['MainDicomTags']))  # since we have added SOPClassUID
+            # else:
             self.assertEqual(7, len(instance['MainDicomTags']))
             self.assertEqual('1', instance['MainDicomTags']['AcquisitionNumber'])
             self.assertEqual('0.999841\\0.000366209\\0.0178227\\-0.000427244\\0.999995\\0.00326545', instance['MainDicomTags']['ImageOrientationPatient'])