changeset 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 5ba7b2417544
files Tests/Tests.py
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Tests/Tests.py	Thu Jul 12 17:54:05 2018 +0200
+++ b/Tests/Tests.py	Thu Jul 12 17:59:03 2018 +0200
@@ -936,13 +936,15 @@
         self.assertEqual('LastUpdate', m[0])
 
         m = DoGet(_REMOTE, '/instances/%s/metadata' % i)
-        self.assertEqual(6, len(m))
+        self.assertEqual(8, len(m))
         self.assertTrue('IndexInSeries' in m)
         self.assertTrue('ReceptionDate' in m)
         self.assertTrue('RemoteAET' in m)
         self.assertTrue('Origin' in m)
         self.assertTrue('TransferSyntax' in m)
         self.assertTrue('SopClassUid' in m)
+        self.assertTrue('RemoteIP' in m)
+        self.assertTrue('HttpUsername' in m)
         self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/IndexInSeries' % i), 1)
         self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i), 'RestApi')
         self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i), '')  # None, received by REST API
@@ -1062,13 +1064,15 @@
         i = DoGet(_REMOTE, '/instances')
         self.assertEqual(1, len(i))
         m = DoGet(_REMOTE, '/instances/%s/metadata' % i[0])
-        self.assertEqual(6, len(m))
+        self.assertEqual(8, len(m))
         self.assertTrue('IndexInSeries' in m)
         self.assertTrue('ReceptionDate' in m)
         self.assertTrue('RemoteAET' in m)
         self.assertTrue('Origin' in m)
         self.assertTrue('TransferSyntax' in m)
         self.assertTrue('SopClassUid' in m)
+        self.assertTrue('RemoteIP' in m)
+        self.assertTrue('CalledAET' in m)
         self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/IndexInSeries' % i[0]), 1)
         self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i[0]), 'DicomProtocol')
         self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i[0]), 'STORESCU')