comparison Tests/Tests.py @ 394:e87d54a8a204

compatibility with 1.9.1
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 20 Apr 2021 16:14:21 +0200
parents 3019306499c5
children eb87ec525b53
comparison
equal deleted inserted replaced
393:3019306499c5 394:e87d54a8a204
1127 1127
1128 # Play with custom metadata 1128 # Play with custom metadata
1129 (headers, body) = DoPutRaw(_REMOTE, '/patients/%s/metadata/5555' % p, 'coucou') 1129 (headers, body) = DoPutRaw(_REMOTE, '/patients/%s/metadata/5555' % p, 'coucou')
1130 self.assertEqual('200', headers['status']) 1130 self.assertEqual('200', headers['status'])
1131 self.assertEqual('', body) 1131 self.assertEqual('', body)
1132 self.assertEqual('"0"', headers['etag']) 1132
1133 1133 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
1134 self.assertEqual('"0"', headers['etag'])
1135 else:
1136 self.assertFalse('ETag' in headers)
1137 self.assertFalse('etag' in headers)
1138
1134 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) 1139 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
1135 self.assertEqual(2, len(m)) 1140 self.assertEqual(2, len(m))
1136 self.assertTrue('LastUpdate' in m) 1141 self.assertTrue('LastUpdate' in m)
1137 self.assertTrue('5555' in m) 1142 self.assertTrue('5555' in m)
1138 self.assertEqual('coucou', DoGet(_REMOTE, '/patients/%s/metadata/5555' % p)) 1143 self.assertEqual('coucou', DoGet(_REMOTE, '/patients/%s/metadata/5555' % p))
1139 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'hello', headers = { 1144
1140 'If-Match' : headers['etag'] 1145 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
1141 }) 1146 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'hello', headers = {
1147 'If-Match' : headers['etag']
1148 })
1149 else:
1150 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'hello')
1142 1151
1143 (headers, body) = DoGetRaw(_REMOTE, '/patients/%s/metadata/5555' % p) 1152 (headers, body) = DoGetRaw(_REMOTE, '/patients/%s/metadata/5555' % p)
1144 self.assertEqual('200', headers['status']) 1153 self.assertEqual('200', headers['status'])
1145 self.assertEqual('hello', body) 1154 self.assertEqual('hello', body)
1146 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p, headers = { 1155
1147 'If-Match' : headers['etag'] 1156 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
1148 }) 1157 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p, headers = {
1158 'If-Match' : headers['etag']
1159 })
1160 else:
1161 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p)
1162
1149 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) 1163 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
1150 self.assertEqual(1, len(m)) 1164 self.assertEqual(1, len(m))
1151 self.assertTrue('LastUpdate' in m) 1165 self.assertTrue('LastUpdate' in m)
1152 1166
1153 1167
1232 DoPost(_REMOTE, '/patients/%s/attachments/1026/verify-md5' % patient) 1246 DoPost(_REMOTE, '/patients/%s/attachments/1026/verify-md5' % patient)
1233 DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world2', headers = { 1247 DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world2', headers = {
1234 'If-Match' : '0' 1248 'If-Match' : '0'
1235 }) 1249 })
1236 1250
1237 (header, body) = DoGetRaw(_REMOTE, '/patients/%s/attachments/1026/data' % patient) 1251 (headers, body) = DoGetRaw(_REMOTE, '/patients/%s/attachments/1026/data' % patient)
1238 self.assertEqual('200', header['status']) 1252 self.assertEqual('200', headers['status'])
1239 self.assertEqual('world2', body) 1253 self.assertEqual('world2', body)
1240 1254
1241 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/instances/%s/attachments/dicom' % instance)) 1255 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/instances/%s/attachments/dicom' % instance))
1242 DoDelete(_REMOTE, '/patients/%s/attachments/1025' % patient, headers = { 1256 DoDelete(_REMOTE, '/patients/%s/attachments/1025' % patient, headers = {
1243 'If-Match' : '0' 1257 'If-Match' : '0'
1246 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) 1260 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
1247 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), 1261 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
1248 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient))) 1262 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient)))
1249 1263
1250 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) 1264 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient)))
1251 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient, headers = { 1265
1252 'If-Match' : header['etag'] 1266 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
1253 }) 1267 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient, headers = {
1268 'If-Match' : headers['etag']
1269 })
1270 else:
1271 self.assertFalse('etag' in headers)
1272 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient)
1273
1254 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) 1274 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient)))
1255 1275
1256 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), size) 1276 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), size)
1257 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) 1277 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
1258 1278
4671 self.assertEqual(1, len(c['Changes'])) 4691 self.assertEqual(1, len(c['Changes']))
4672 self.assertTrue(c['Done']) 4692 self.assertTrue(c['Done'])
4673 self.assertEqual(seq + 5, c['Last']) 4693 self.assertEqual(seq + 5, c['Last'])
4674 self.assertEqual('UpdatedMetadata', c['Changes'][0]['ChangeType']) 4694 self.assertEqual('UpdatedMetadata', c['Changes'][0]['ChangeType'])
4675 4695
4676 DoDelete(_REMOTE, '/instances/%s/metadata/4000' % i, headers = { 4696 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
4677 'If-Match' : headers['etag'] 4697 DoDelete(_REMOTE, '/instances/%s/metadata/4000' % i, headers = {
4678 }) 4698 'If-Match' : headers['etag']
4699 })
4700 else:
4701 self.assertFalse('etag' in headers)
4702 DoDelete(_REMOTE, '/instances/%s/metadata/4000' % i)
4703
4679 c = DoGet(_REMOTE, '/changes?last') 4704 c = DoGet(_REMOTE, '/changes?last')
4680 self.assertEqual(1, len(c['Changes'])) 4705 self.assertEqual(1, len(c['Changes']))
4681 self.assertTrue(c['Done']) 4706 self.assertTrue(c['Done'])
4682 self.assertEqual(seq + 6, c['Last']) 4707 self.assertEqual(seq + 6, c['Last'])
4683 self.assertEqual('UpdatedMetadata', c['Changes'][0]['ChangeType']) 4708 self.assertEqual('UpdatedMetadata', c['Changes'][0]['ChangeType'])