comparison Tests/Tests.py @ 369:24d93b42873a

test "RemoteAET" metadata at series level
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 20 Jan 2021 19:04:52 +0100
parents 2cc40121c3a8
children e9b03d8f3b78
comparison
equal deleted inserted replaced
368:2cc40121c3a8 369:24d93b42873a
1017 1017
1018 def test_metadata(self): 1018 def test_metadata(self):
1019 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') 1019 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
1020 p = DoGet(_REMOTE, '/patients')[0] 1020 p = DoGet(_REMOTE, '/patients')[0]
1021 i = DoGet(_REMOTE, '/instances')[0] 1021 i = DoGet(_REMOTE, '/instances')[0]
1022 series = DoGet(_REMOTE, '/series')[0]
1022 1023
1023 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) 1024 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
1024 self.assertEqual(1, len(m)) 1025 self.assertEqual(1, len(m))
1025 self.assertEqual('LastUpdate', m[0]) 1026 self.assertEqual('LastUpdate', m[0])
1027
1028 # The lines below failed on Orthanc <= 1.8.2
1029 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/studies/%s/metadata' % p))
1030 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/series/%s/metadata' % p))
1031 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/metadata' % p))
1032
1033 m = DoGet(_REMOTE, '/studies/%s/metadata' % DoGet(_REMOTE, '/studies')[0])
1034 self.assertEqual(1, len(m))
1035 self.assertEqual('LastUpdate', m[0])
1036
1037 m = DoGet(_REMOTE, '/series/%s/metadata' % series)
1038 self.assertEqual(2, len(m))
1039 self.assertTrue('LastUpdate' in m)
1040
1041 # New in Orthanc 1.9.0
1042 self.assertTrue('RemoteAET' in m)
1043 self.assertEqual(DoGet(_REMOTE, '/series/%s/metadata/RemoteAET' % series), '') # None, received by REST API
1026 1044
1027 m = DoGet(_REMOTE, '/instances/%s/metadata' % i) 1045 m = DoGet(_REMOTE, '/instances/%s/metadata' % i)
1028 self.assertEqual(8, len(m)) 1046 self.assertEqual(8, len(m))
1029 self.assertTrue('IndexInSeries' in m) 1047 self.assertTrue('IndexInSeries' in m)
1030 self.assertTrue('ReceptionDate' in m) 1048 self.assertTrue('ReceptionDate' in m)
1165 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/IndexInSeries' % i[0]), 1) 1183 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/IndexInSeries' % i[0]), 1)
1166 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i[0]), 'DicomProtocol') 1184 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i[0]), 'DicomProtocol')
1167 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i[0]), 'STORESCU') 1185 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i[0]), 'STORESCU')
1168 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i[0]), '1.2.840.10008.1.2.1') 1186 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i[0]), '1.2.840.10008.1.2.1')
1169 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i[0]), '1.2.840.10008.5.1.4.1.1.7') 1187 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i[0]), '1.2.840.10008.5.1.4.1.1.7')
1188
1189 series = DoGet(_REMOTE, '/series')[0]
1190 m = DoGet(_REMOTE, '/series/%s/metadata' % series)
1191 self.assertEqual(2, len(m))
1192 self.assertTrue('LastUpdate' in m)
1193 self.assertTrue('RemoteAET' in m)
1194 self.assertEqual(DoGet(_REMOTE, '/series/%s/metadata/RemoteAET' % series), 'STORESCU')
1195 self.assertEqual(DoGet(_REMOTE, '/series/%s/metadata/LastUpdate' % series),
1196 DoGet(_REMOTE, '/instances/%s/metadata/ReceptionDate' % i[0]))
1170 1197
1171 1198
1172 def test_incoming_findscu(self): 1199 def test_incoming_findscu(self):
1173 UploadInstance(_REMOTE, 'Multiframe.dcm') 1200 UploadInstance(_REMOTE, 'Multiframe.dcm')
1174 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') 1201 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')