# HG changeset patch # User Sebastien Jodogne # Date 1545395642 -3600 # Node ID 9f7ae64c0fdaa88f805142eb930f7d9b2d804194 # Parent ef2c66f81249a281f0c62ee2b01f68cef9e9ea58 more tests about find diff -r ef2c66f81249 -r 9f7ae64c0fda Tests/Tests.py --- a/Tests/Tests.py Thu Dec 20 12:23:58 2018 +0100 +++ b/Tests/Tests.py Fri Dec 21 13:34:02 2018 +0100 @@ -1611,6 +1611,16 @@ a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', 'CaseSensitive' : False, + 'Query' : { 'PatientName' : 'BRAINIX' }}) + self.assertEqual(1, len(a)) + + a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', + 'CaseSensitive' : False, + 'Query' : { 'PatientName' : 'BRAINIX\\KNEE\\NOPE' }}) + self.assertEqual(2, len(a)) + + a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', + 'CaseSensitive' : False, 'Query' : { 'PatientName' : '*n*' }}) self.assertEqual(2, len(a)) @@ -1658,6 +1668,59 @@ a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', 'Query' : { }}) self.assertEqual(8, len(a)) + a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', + 'Expand' : True, + 'Query' : { 'StudyDate' : '20061201-20061201' }}) + self.assertEqual(1, len(a)) + self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName']) + + a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', + 'Expand' : True, + 'Query' : { 'StudyDate' : '20061201-20091201' }}) + self.assertEqual(2, len(a)) + for i in range(2): + self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE']) + + a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', + 'Query' : { 'StudyDate' : '20061202-20061202' }}) + self.assertEqual(0, len(a)) + + a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', + 'Expand' : True, + 'Query' : { 'StudyDate' : '-20061201' }}) + self.assertEqual(1, len(a)) + self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName']) + + a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', + 'Expand' : True, + 'Query' : { 'StudyDate' : '-20051201' }}) + self.assertEqual(0, len(a)) + + a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', + 'Expand' : True, + 'Query' : { 'StudyDate' : '20061201-' }}) + self.assertEqual(2, len(a)) + for i in range(2): + self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE']) + + a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', + 'Expand' : True, + 'Query' : { 'StudyDate' : '20061202-' }}) + self.assertEqual(1, len(a)) + self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName']) + + a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', + 'Expand' : True, + 'Query' : { 'StudyDate' : '20080819-' }}) + self.assertEqual(1, len(a)) + self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName']) + + a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', + 'Expand' : True, + 'Query' : { 'StudyDate' : '20080820-' }}) + self.assertEqual(0, len(a)) + + def test_rest_query_retrieve(self): self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))