# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1734369046 -3600
# Node ID f90d3ea138fe913f32acb3cb6c4d462b4eabc6c8
# Parent  2beafb8513efc998bf68bc916dcde0ec75609621# Parent  dc3cc8f6e887230fa21fde9154a8f14a79fa7741
merge

diff -r 2beafb8513ef -r f90d3ea138fe NewTests/PostgresUpgrades/downgrade.sh
--- a/NewTests/PostgresUpgrades/downgrade.sh	Mon Dec 16 18:10:25 2024 +0100
+++ b/NewTests/PostgresUpgrades/downgrade.sh	Mon Dec 16 18:10:46 2024 +0100
@@ -4,7 +4,7 @@
 
 apt-get update && apt-get install -y wget mercurial
 hg clone https://orthanc.uclouvain.be/hg/orthanc-databases
-hg update -r find-refactoring
+hg update -r default
 psql -U postgres -f /scripts/orthanc-databases/PostgreSQL/Plugins/SQL/Downgrades/Rev3bToRev2.sql
 
 # if you want to test a downgrade procedure, you may use this code ...
diff -r 2beafb8513ef -r f90d3ea138fe Tests/Tests.py
--- a/Tests/Tests.py	Mon Dec 16 18:10:25 2024 +0100
+++ b/Tests/Tests.py	Mon Dec 16 18:10:46 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) and HasExtendedFind(_REMOTE):
             # Upload 12 instances
             for i in range(3):
                 r = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
@@ -11093,7 +11092,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) and HasExtendedFind(_REMOTE):
             # Upload 12 instances
             for i in range(3):
                 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1))
@@ -11150,8 +11149,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) and HasExtendedFind(_REMOTE):
             # Upload 12 instances
             for i in range(3):
                 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
@@ -11189,7 +11187,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',
@@ -11313,8 +11311,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) and HasExtendedFind(_REMOTE):
             # Upload 12 instances
             for i in range(3):
                 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
@@ -11414,7 +11411,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):