Mercurial > hg > orthanc-tests

comparison Tests/Tests.py @ 95:a807a4699eb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
testing of metadata SopClassUid
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 09 Dec 2016 14:49:23 +0100
parents dbcbffb889da
children 272d1229cb49
comparison
equal deleted inserted replaced
94:09afe3616660 95:a807a4699eb4
921 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) 921 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
922 self.assertEqual(1, len(m)) 922 self.assertEqual(1, len(m))
923 self.assertEqual('LastUpdate', m[0]) 923 self.assertEqual('LastUpdate', m[0])
924 924
925 m = DoGet(_REMOTE, '/instances/%s/metadata' % i) 925 m = DoGet(_REMOTE, '/instances/%s/metadata' % i)
926 self.assertEqual(5, len(m)) 926 self.assertEqual(6, len(m))
927 self.assertTrue('IndexInSeries' in m) 927 self.assertTrue('IndexInSeries' in m)
928 self.assertTrue('ReceptionDate' in m) 928 self.assertTrue('ReceptionDate' in m)
929 self.assertTrue('RemoteAET' in m) 929 self.assertTrue('RemoteAET' in m)
930 self.assertTrue('Origin' in m) 930 self.assertTrue('Origin' in m)
931 self.assertTrue('TransferSyntax' in m) 931 self.assertTrue('TransferSyntax' in m)
932 self.assertTrue('SopClassUid' in m)
932 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/IndexInSeries' % i), 1) 933 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/IndexInSeries' % i), 1)
933 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i), 'RestApi') 934 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i), 'RestApi')
934 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i), '') # None, received by REST API 935 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i), '') # None, received by REST API
935 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i), '1.2.840.10008.1.2.4.91') # JPEG2k 936 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i), '1.2.840.10008.1.2.4.91') # JPEG2k
937 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i), '1.2.840.10008.5.1.4.1.1.4')
936 938
937 # Play with custom metadata 939 # Play with custom metadata
938 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'coucou') 940 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'coucou')
939 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) 941 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
940 self.assertEqual(2, len(m)) 942 self.assertEqual(2, len(m))
1045 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) 1047 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
1046 1048
1047 i = DoGet(_REMOTE, '/instances') 1049 i = DoGet(_REMOTE, '/instances')
1048 self.assertEqual(1, len(i)) 1050 self.assertEqual(1, len(i))
1049 m = DoGet(_REMOTE, '/instances/%s/metadata' % i[0]) 1051 m = DoGet(_REMOTE, '/instances/%s/metadata' % i[0])
1050 self.assertEqual(5, len(m)) 1052 self.assertEqual(6, len(m))
1051 self.assertTrue('IndexInSeries' in m) 1053 self.assertTrue('IndexInSeries' in m)
1052 self.assertTrue('ReceptionDate' in m) 1054 self.assertTrue('ReceptionDate' in m)
1053 self.assertTrue('RemoteAET' in m) 1055 self.assertTrue('RemoteAET' in m)
1054 self.assertTrue('Origin' in m) 1056 self.assertTrue('Origin' in m)
1055 self.assertTrue('TransferSyntax' in m) 1057 self.assertTrue('TransferSyntax' in m)
1058 self.assertTrue('SopClassUid' in m)
1056 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/IndexInSeries' % i[0]), 1) 1059 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/IndexInSeries' % i[0]), 1)
1057 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i[0]), 'DicomProtocol') 1060 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i[0]), 'DicomProtocol')
1058 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i[0]), 'STORESCU') 1061 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i[0]), 'STORESCU')
1059 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i[0]), '1.2.840.10008.1.2.1') 1062 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i[0]), '1.2.840.10008.1.2.1')
1063 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i[0]), '1.2.840.10008.5.1.4.1.1.7')
1060 1064
1061 1065
1062 def test_incoming_findscu(self): 1066 def test_incoming_findscu(self):
1063 UploadInstance(_REMOTE, 'Multiframe.dcm') 1067 UploadInstance(_REMOTE, 'Multiframe.dcm')
1064 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') 1068 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')