comparison Tests/Tests.py @ 145:69fecf5a3ff6 Orthanc-1.4.0

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 12 Jul 2018 17:59:03 +0200
parents 7809fdf8056f
children ff788c99f1aa
comparison
equal deleted inserted replaced
144:7809fdf8056f 145:69fecf5a3ff6
934 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) 934 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
935 self.assertEqual(1, len(m)) 935 self.assertEqual(1, len(m))
936 self.assertEqual('LastUpdate', m[0]) 936 self.assertEqual('LastUpdate', m[0])
937 937
938 m = DoGet(_REMOTE, '/instances/%s/metadata' % i) 938 m = DoGet(_REMOTE, '/instances/%s/metadata' % i)
939 self.assertEqual(6, len(m)) 939 self.assertEqual(8, len(m))
940 self.assertTrue('IndexInSeries' in m) 940 self.assertTrue('IndexInSeries' in m)
941 self.assertTrue('ReceptionDate' in m) 941 self.assertTrue('ReceptionDate' in m)
942 self.assertTrue('RemoteAET' in m) 942 self.assertTrue('RemoteAET' in m)
943 self.assertTrue('Origin' in m) 943 self.assertTrue('Origin' in m)
944 self.assertTrue('TransferSyntax' in m) 944 self.assertTrue('TransferSyntax' in m)
945 self.assertTrue('SopClassUid' in m) 945 self.assertTrue('SopClassUid' in m)
946 self.assertTrue('RemoteIP' in m)
947 self.assertTrue('HttpUsername' in m)
946 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/IndexInSeries' % i), 1) 948 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/IndexInSeries' % i), 1)
947 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i), 'RestApi') 949 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i), 'RestApi')
948 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i), '') # None, received by REST API 950 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i), '') # None, received by REST API
949 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i), '1.2.840.10008.1.2.4.91') # JPEG2k 951 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i), '1.2.840.10008.1.2.4.91') # JPEG2k
950 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i), '1.2.840.10008.5.1.4.1.1.4') 952 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i), '1.2.840.10008.5.1.4.1.1.4')
1060 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) 1062 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
1061 1063
1062 i = DoGet(_REMOTE, '/instances') 1064 i = DoGet(_REMOTE, '/instances')
1063 self.assertEqual(1, len(i)) 1065 self.assertEqual(1, len(i))
1064 m = DoGet(_REMOTE, '/instances/%s/metadata' % i[0]) 1066 m = DoGet(_REMOTE, '/instances/%s/metadata' % i[0])
1065 self.assertEqual(6, len(m)) 1067 self.assertEqual(8, len(m))
1066 self.assertTrue('IndexInSeries' in m) 1068 self.assertTrue('IndexInSeries' in m)
1067 self.assertTrue('ReceptionDate' in m) 1069 self.assertTrue('ReceptionDate' in m)
1068 self.assertTrue('RemoteAET' in m) 1070 self.assertTrue('RemoteAET' in m)
1069 self.assertTrue('Origin' in m) 1071 self.assertTrue('Origin' in m)
1070 self.assertTrue('TransferSyntax' in m) 1072 self.assertTrue('TransferSyntax' in m)
1071 self.assertTrue('SopClassUid' in m) 1073 self.assertTrue('SopClassUid' in m)
1074 self.assertTrue('RemoteIP' in m)
1075 self.assertTrue('CalledAET' in m)
1072 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/IndexInSeries' % i[0]), 1) 1076 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/IndexInSeries' % i[0]), 1)
1073 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i[0]), 'DicomProtocol') 1077 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i[0]), 'DicomProtocol')
1074 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i[0]), 'STORESCU') 1078 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i[0]), 'STORESCU')
1075 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i[0]), '1.2.840.10008.1.2.1') 1079 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i[0]), '1.2.840.10008.1.2.1')
1076 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i[0]), '1.2.840.10008.5.1.4.1.1.7') 1080 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i[0]), '1.2.840.10008.5.1.4.1.1.7')