Mercurial > hg > orthanc-tests

comparison Tests/Tests.py @ 694:92ec38cc5926 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes for mainline
author Alain Mazy <am@orthanc.team>
date Thu, 19 Sep 2024 11:24:30 +0200
parents 4567c3947f8a
children
comparison
equal deleted inserted replaced
693:4567c3947f8a 694:92ec38cc5926
1301 else: 1301 else:
1302 self.assertEqual(1, len(m)) 1302 self.assertEqual(1, len(m))
1303 self.assertTrue('LastUpdate' in m) 1303 self.assertTrue('LastUpdate' in m)
1304 1304
1305 m = DoGet(_REMOTE, '/series/%s/metadata' % series) 1305 m = DoGet(_REMOTE, '/series/%s/metadata' % series)
1306 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5): 1306 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): # TODO: remove HasExtendedFind once find-refactoring branch has been merged
1307 self.assertEqual(4, len(m)) 1307 self.assertEqual(4, len(m))
1308 self.assertTrue('MainDicomSequences' in m) # since RequestAttributeSequence is now in the MainDicomTags 1308 self.assertTrue('MainDicomSequences' in m) # since RequestAttributeSequence is now in the MainDicomTags
1309 elif IsOrthancVersionAbove(_REMOTE, 1, 11, 0): 1309 elif IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1310 self.assertEqual(3, len(m)) 1310 self.assertEqual(3, len(m))
1311 self.assertTrue('MainDicomTagsSignature' in m) 1311 self.assertTrue('MainDicomTagsSignature' in m)
1561 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i[0]), '1.2.840.10008.1.2.1') 1561 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i[0]), '1.2.840.10008.1.2.1')
1562 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i[0]), '1.2.840.10008.5.1.4.1.1.7') 1562 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i[0]), '1.2.840.10008.5.1.4.1.1.7')
1563 1563
1564 series = DoGet(_REMOTE, '/series')[0] 1564 series = DoGet(_REMOTE, '/series')[0]
1565 m = DoGet(_REMOTE, '/series/%s/metadata' % series) 1565 m = DoGet(_REMOTE, '/series/%s/metadata' % series)
1566 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5): 1566 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): # TODO: remove HasExtendedFind once find-refactoring branch has been merged
1567 self.assertEqual(4, len(m)) 1567 self.assertEqual(4, len(m))
1568 self.assertTrue('MainDicomSequences' in m) # since RequestAttributeSequence is now in the MainDicomTags 1568 self.assertTrue('MainDicomSequences' in m) # since RequestAttributeSequence is now in the MainDicomTags
1569 elif IsOrthancVersionAbove(_REMOTE, 1, 11, 0): 1569 elif IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1570 self.assertEqual(3, len(m)) 1570 self.assertEqual(3, len(m))
1571 self.assertTrue('MainDicomTagsSignature' in m) 1571 self.assertTrue('MainDicomTagsSignature' in m)
3011 self.assertEqual(16, len(DoGet(_REMOTE, '/instances'))) 3011 self.assertEqual(16, len(DoGet(_REMOTE, '/instances')))
3012 3012
3013 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/patients&since=10' % i)) 3013 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/patients&since=10' % i))
3014 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/patients&limit=10' % i)) 3014 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/patients&limit=10' % i))
3015 3015
3016 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and DoGet(_REMOTE, '/system')['ApiVersion'] >= 25: # with ExtendedFind, the limit=0 means no-limit like in /tools/find 3016 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5) and HasExtendedFind(_REMOTE): # TODO: remove HasExtendedFind once find-refactoring branch has been merged: # with ExtendedFind, the limit=0 means no-limit like in /tools/find
3017 self.assertEqual(2, len(DoGet(_REMOTE, '/patients?since=0&limit=0'))) 3017 self.assertEqual(2, len(DoGet(_REMOTE, '/patients?since=0&limit=0')))
3018 self.assertEqual(1, len(DoGet(_REMOTE, '/patients?since=1&limit=0'))) 3018 self.assertEqual(1, len(DoGet(_REMOTE, '/patients?since=1&limit=0')))
3019 self.assertEqual(0, len(DoGet(_REMOTE, '/patients?since=2&limit=0'))) 3019 self.assertEqual(0, len(DoGet(_REMOTE, '/patients?since=2&limit=0')))
3020 self.assertEqual(0, len(DoGet(_REMOTE, '/patients?since=3&limit=0'))) 3020 self.assertEqual(0, len(DoGet(_REMOTE, '/patients?since=3&limit=0')))
3021 else: 3021 else: