comparison Tests/Tests.py @ 119:7ecd26982dd7

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 14 Jul 2017 15:57:24 +0200
parents a954c535fef6
children fce08afe6b2d
comparison
equal deleted inserted replaced
118:a954c535fef6 119:7ecd26982dd7
1632 self.assertEqual(series, a['ID']) 1632 self.assertEqual(series, a['ID'])
1633 1633
1634 1634
1635 def test_shanon(self): 1635 def test_shanon(self):
1636 def Anonymize(instance, replacements = {}): 1636 def Anonymize(instance, replacements = {}):
1637 return DoPost(_REMOTE, '/instances/%s/anonymize' % instance, { 'Replace' : replacements }, 'application/json') 1637 return DoPost(_REMOTE, '/instances/%s/anonymize' % instance, {
1638 'Replace' : replacements,
1639 'Force' : True,
1640 }, 'application/json')
1638 1641
1639 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) 1642 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
1640 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] 1643 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
1641 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) 1644 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
1642 1645
1682 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) 1685 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
1683 1686
1684 1687
1685 def test_shanon_2(self): 1688 def test_shanon_2(self):
1686 def Modify(instance, replacements = {}): 1689 def Modify(instance, replacements = {}):
1687 return DoPost(_REMOTE, '/instances/%s/modify' % instance, { 'Replace' : replacements }, 'application/json') 1690 return DoPost(_REMOTE, '/instances/%s/modify' % instance, {
1691 'Replace' : replacements,
1692 'Force': True,
1693 }, 'application/json')
1688 1694
1689 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) 1695 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
1690 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] 1696 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
1691 self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) 1697 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
1692 1698
3113 "StudyDescription" : "hello", 3119 "StudyDescription" : "hello",
3114 "SeriesDescription" : "world", 3120 "SeriesDescription" : "world",
3115 "SOPClassUID" : "test", 3121 "SOPClassUID" : "test",
3116 "SOPInstanceUID" : "myid", 3122 "SOPInstanceUID" : "myid",
3117 }, 3123 },
3118 "Keep" : [ "StudyInstanceUID", "SeriesInstanceUID" ] 3124 "Keep" : [ "StudyInstanceUID", "SeriesInstanceUID" ],
3125 "Force" : True
3119 }) 3126 })
3120 3127
3121 instances = DoGet(_REMOTE, '/instances/') 3128 instances = DoGet(_REMOTE, '/instances/')
3122 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/'))) 3129 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/')))
3123 self.assertEqual(1, len(DoGet(_REMOTE, '/studies/'))) 3130 self.assertEqual(1, len(DoGet(_REMOTE, '/studies/')))
3190 # https://bitbucket.org/sjodogne/orthanc/issues/42/fails-to-modify-a-dicom-video-file 3197 # https://bitbucket.org/sjodogne/orthanc/issues/42/fails-to-modify-a-dicom-video-file
3191 # This test fails on DCMTK 3.6.0, but succeeds in DCMTK 3.6.1 snapshots 3198 # This test fails on DCMTK 3.6.0, but succeeds in DCMTK 3.6.1 snapshots
3192 UploadInstance(_REMOTE, 'Issue42.dcm')['ID'] 3199 UploadInstance(_REMOTE, 'Issue42.dcm')['ID']
3193 modified = DoPost(_REMOTE, 3200 modified = DoPost(_REMOTE,
3194 '/patients/da128605-e040d0c4-310615d2-3475da63-df2d1ef4/modify', 3201 '/patients/da128605-e040d0c4-310615d2-3475da63-df2d1ef4/modify',
3195 '{"Replace":{"PatientID":"Hello","PatientName":"Sample patient name"}}', 3202 '{"Replace":{"PatientID":"Hello","PatientName":"Sample patient name"},"Force":true}',
3196 'application/json') 3203 'application/json')
3197 self.assertTrue('PatientID' in modified) 3204 self.assertTrue('PatientID' in modified)
3198 3205
3199 3206
3200 def test_rest_find_limit(self): 3207 def test_rest_find_limit(self):