Mercurial > hg > orthanc-tests

changeset 756:dcdd10b8bae9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed some TODO
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 16 Dec 2024 16:54:20 +0100
parents 6db94927eddb
children 0705e560ff7b
files Tests/Tests.py
diffstat 1 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Tests/Tests.py	Mon Dec 16 16:30:39 2024 +0100
+++ b/Tests/Tests.py	Mon Dec 16 16:54:20 2024 +0100
@@ -10794,8 +10794,7 @@
 
 
     def test_extended_find_order_by(self):
-        if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): # TODO: remove HasExtendedFind once find-refactoring branch has been merged
-
+        if IsOrthancVersionAbove(_REMOTE, 1, 12, 5):
             # Upload 12 instances
             for i in range(3):
                 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
@@ -11060,7 +11059,7 @@
 
 
     def test_extended_find_parent(self):
-        if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): # TODO: remove HasExtendedFind once find-refactoring branch has been merged
+        if IsOrthancVersionAbove(_REMOTE, 1, 12, 5):
             # Upload 12 instances
             for i in range(3):
                 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1))
@@ -11117,8 +11116,7 @@
 
 
     def test_extended_find_filter_metadata(self):
-        if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): # TODO: remove HasExtendedFind once find-refactoring branch has been merged
-
+        if IsOrthancVersionAbove(_REMOTE, 1, 12, 5):
             # Upload 12 instances
             for i in range(3):
                 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
@@ -11156,7 +11154,7 @@
 
 
     def test_extended_find_expand(self):
-        if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): # TODO: remove HasExtendedFind once find-refactoring branch has been merged
+        if IsOrthancVersionAbove(_REMOTE, 1, 12, 5):
             UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
 
             a = DoPost(_REMOTE, '/tools/find', {    'Level' : 'Series',
@@ -11280,8 +11278,7 @@
 
 
     def test_extended_find_full(self):
-        if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): # TODO: remove HasExtendedFind once find-refactoring branch has been merged
-
+        if IsOrthancVersionAbove(_REMOTE, 1, 12, 5):
             # Upload 12 instances
             for i in range(3):
                 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
@@ -11381,7 +11378,7 @@
                                                 })
         # pprint.pprint(knixInstancesSince5Limit20)
         
-        if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): # TODO: remove HasExtendedFind once find-refactoring branch has been merged
+        if IsOrthancVersionAbove(_REMOTE, 1, 12, 5):
             self.assertEqual(20, len(knixInstancesSince5Limit20))  # Orthanc actually returns LimitFindInstances + 1 resources
             # the first 5 from previous call shall not be in this answer
             for i in range(0, 5):