comparison Tests/Tests.py @ 547:7de5fd295025

testing instance metadata "PixelDataVR"
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 22 Jun 2023 08:49:10 +0200
parents 8722f7f95a38
children 3933237d1958
comparison
equal deleted inserted replaced
546:2f101bb5c808 547:7de5fd295025
1169 # New in Orthanc 1.9.0 1169 # New in Orthanc 1.9.0
1170 self.assertTrue('RemoteAET' in m) 1170 self.assertTrue('RemoteAET' in m)
1171 self.assertEqual(DoGet(_REMOTE, '/series/%s/metadata/RemoteAET' % series), '') # None, received by REST API 1171 self.assertEqual(DoGet(_REMOTE, '/series/%s/metadata/RemoteAET' % series), '') # None, received by REST API
1172 1172
1173 m = DoGet(_REMOTE, '/instances/%s/metadata' % i) 1173 m = DoGet(_REMOTE, '/instances/%s/metadata' % i)
1174 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): 1174 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
1175 self.assertEqual(11, len(m))
1176 elif IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1175 self.assertEqual(10, len(m)) 1177 self.assertEqual(10, len(m))
1176 self.assertTrue('MainDicomTagsSignature' in m)
1177 elif IsOrthancVersionAbove(_REMOTE, 1, 9, 1): 1178 elif IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
1178 self.assertEqual(9, len(m)) 1179 self.assertEqual(9, len(m))
1180 else:
1181 self.assertEqual(8, len(m))
1182
1183 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
1184 # ./Tests/GetPixelDataVR.py ./Database/Knee/T1/IM-0001-0001.dcm
1185 self.assertTrue('PixelDataVR' in m) # New in Orthanc 1.12.1
1186 self.assertEqual('OW', DoGet(_REMOTE, '/instances/%s/metadata/PixelDataVR' % i))
1187
1188 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1189 self.assertTrue('MainDicomTagsSignature' in m)
1190
1191 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
1179 self.assertTrue('PixelDataOffset' in m) # New in Orthanc 1.9.1 1192 self.assertTrue('PixelDataOffset' in m) # New in Orthanc 1.9.1
1180 self.assertEqual(int(DoGet(_REMOTE, '/instances/%s/metadata/PixelDataOffset' % i)), 0x0c78) 1193 self.assertEqual(int(DoGet(_REMOTE, '/instances/%s/metadata/PixelDataOffset' % i)), 0x0c78)
1181 else:
1182 self.assertEqual(8, len(m))
1183 1194
1184 self.assertTrue('IndexInSeries' in m) 1195 self.assertTrue('IndexInSeries' in m)
1185 self.assertTrue('ReceptionDate' in m) 1196 self.assertTrue('ReceptionDate' in m)
1186 self.assertTrue('RemoteAET' in m) 1197 self.assertTrue('RemoteAET' in m)
1187 self.assertTrue('Origin' in m) 1198 self.assertTrue('Origin' in m)
1380 1391
1381 i = DoGet(_REMOTE, '/instances') 1392 i = DoGet(_REMOTE, '/instances')
1382 self.assertEqual(1, len(i)) 1393 self.assertEqual(1, len(i))
1383 m = DoGet(_REMOTE, '/instances/%s/metadata' % i[0]) 1394 m = DoGet(_REMOTE, '/instances/%s/metadata' % i[0])
1384 1395
1385 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0): 1396 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
1397 self.assertEqual(11, len(m))
1398 elif IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1386 self.assertEqual(10, len(m)) 1399 self.assertEqual(10, len(m))
1387 self.assertTrue('MainDicomTagsSignature' in m) # New in Orthanc 1.11.0
1388 elif IsOrthancVersionAbove(_REMOTE, 1, 9, 1): 1400 elif IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
1389 self.assertEqual(9, len(m)) 1401 self.assertEqual(9, len(m))
1390 self.assertTrue('PixelDataOffset' in m) # New in Orthanc 1.9.1
1391 else: 1402 else:
1392 self.assertEqual(8, len(m)) 1403 self.assertEqual(8, len(m))
1393 1404
1405 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
1406 # ./Tests/GetPixelDataVR.py ./Database/ColorTestImageJ.dcm
1407 self.assertTrue('PixelDataVR' in m) # New in Orthanc 1.12.1
1408 self.assertEqual('OB', DoGet(_REMOTE, '/instances/%s/metadata/PixelDataVR' % i[0]))
1409
1410 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1411 self.assertTrue('MainDicomTagsSignature' in m) # New in Orthanc 1.11.0
1412
1413 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
1414 self.assertTrue('PixelDataOffset' in m) # New in Orthanc 1.9.1
1415 self.assertEqual(2242, DoGet(_REMOTE, '/instances/%s/metadata/PixelDataOffset' % i[0]))
1416
1394 self.assertTrue('IndexInSeries' in m) 1417 self.assertTrue('IndexInSeries' in m)
1395 self.assertTrue('ReceptionDate' in m) 1418 self.assertTrue('ReceptionDate' in m)
1396 self.assertTrue('RemoteAET' in m) 1419 self.assertTrue('RemoteAET' in m)
1397 self.assertTrue('Origin' in m) 1420 self.assertTrue('Origin' in m)
1398 self.assertTrue('TransferSyntax' in m) 1421 self.assertTrue('TransferSyntax' in m)