Mercurial > hg > orthanc-tests

comparison Tests/Tests.py @ 63:2652d562267a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test Origin metadata of instances
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 25 Nov 2015 10:33:08 +0100
parents f9c4ce95756f
children 369e439cdfd6
comparison
equal deleted inserted replaced
62:f9c4ce95756f 63:2652d562267a
895 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) 895 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
896 self.assertEqual(1, len(m)) 896 self.assertEqual(1, len(m))
897 self.assertEqual('LastUpdate', m[0]) 897 self.assertEqual('LastUpdate', m[0])
898 898
899 m = DoGet(_REMOTE, '/instances/%s/metadata' % i) 899 m = DoGet(_REMOTE, '/instances/%s/metadata' % i)
900 self.assertEqual(3, len(m)) 900 self.assertEqual(4, len(m))
901 self.assertTrue('IndexInSeries' in m) 901 self.assertTrue('IndexInSeries' in m)
902 self.assertTrue('ReceptionDate' in m) 902 self.assertTrue('ReceptionDate' in m)
903 self.assertTrue('RemoteAET' in m) 903 self.assertTrue('RemoteAET' in m)
904 self.assertTrue('Origin' in m)
905 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/IndexInSeries' % i), 1)
906 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i), 'RestApi')
907 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i), '') # None, received by REST API
904 908
905 # Play with custom metadata 909 # Play with custom metadata
906 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'coucou') 910 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'coucou')
907 m = DoGet(_REMOTE, '/patients/%s/metadata' % p) 911 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
908 self.assertEqual(2, len(m)) 912 self.assertEqual(2, len(m))
1009 self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) 1013 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
1010 subprocess.check_call([ FindExecutable('storescu'), 1014 subprocess.check_call([ FindExecutable('storescu'),
1011 _REMOTE['Server'], str(_REMOTE['DicomPort']), 1015 _REMOTE['Server'], str(_REMOTE['DicomPort']),
1012 GetDatabasePath('ColorTestImageJ.dcm') ]) 1016 GetDatabasePath('ColorTestImageJ.dcm') ])
1013 self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) 1017 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
1018
1019 i = DoGet(_REMOTE, '/instances')
1020 self.assertEqual(1, len(i))
1021 m = DoGet(_REMOTE, '/instances/%s/metadata' % i[0])
1022 self.assertEqual(4, len(m))
1023 self.assertTrue('IndexInSeries' in m)
1024 self.assertTrue('ReceptionDate' in m)
1025 self.assertTrue('RemoteAET' in m)
1026 self.assertTrue('Origin' in m)
1027 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/IndexInSeries' % i[0]), 1)
1028 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i[0]), 'DicomProtocol')
1029 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i[0]), 'STORESCU')
1014 1030
1015 1031
1016 def test_incoming_findscu(self): 1032 def test_incoming_findscu(self):
1017 def CallFindScu(args): 1033 def CallFindScu(args):
1018 p = subprocess.Popen([ FindExecutable('findscu'), 1034 p = subprocess.Popen([ FindExecutable('findscu'),