Mercurial > hg > orthanc-tests
changeset 328:8a462f9c5a97
test_store_compressed
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Sun, 23 Aug 2020 12:05:07 +0200 |
parents | 33ba5b1a0dd9 |
children | 194e3cfa200f |
files | GenerateConfigurationForTests.py Tests/Tests.py |
diffstat | 2 files changed, 51 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/GenerateConfigurationForTests.py Tue Aug 18 17:00:10 2020 +0200 +++ b/GenerateConfigurationForTests.py Sun Aug 23 12:05:07 2020 +0200 @@ -124,6 +124,11 @@ 'Url' : 'http://localhost:8042/', 'Username' : 'alice', 'Password' : 'orthanctest' + }, + 'self' : { + 'Url' : 'http://localhost:8042/', + 'Username' : 'alice', + 'Password' : 'orthanctest' } } config['RegisteredUsers'] = { 'alice' : 'orthanctest' }
--- a/Tests/Tests.py Tue Aug 18 17:00:10 2020 +0200 +++ b/Tests/Tests.py Sun Aug 23 12:05:07 2020 +0200 @@ -5863,4 +5863,50 @@ 'StudyInstanceUID=%s\\%s\\%s\\%s\\%s\\%s' % (( study, ) * 6) ]) result = re.findall('\(0020,000d\).*?\[(.*?)\]', i) self.assertEqual(1, len(result)) + + + def test_store_compressed(self): + with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f: + dicom = f.read() + i = DoPost(_REMOTE, '/instances', dicom) ['ID'] + sourceSize = len(dicom) + self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) + self.assertEqual(1, len(DoGet(_REMOTE, '/instances'))) + + # Sending to the local Orthanc 0.8.6 server, without compression: OK + jobId = MonitorJob2(_REMOTE, lambda: DoPost( + _REMOTE, '/peers/peer/store', { + 'Resources' : [ i ], + 'Synchronous' : False, + })) + + job = DoGet(_REMOTE, '/jobs/%s' % jobId) + self.assertFalse(job['Content']['Compress']) + self.assertEqual('', job['Content']['Peer'][2]) # Password must not be reported + self.assertEqual(str(sourceSize), job['Content']['Size']) + + self.assertEqual(1, len(DoGet(_LOCAL, '/instances'))) + DropOrthanc(_LOCAL) + + # Sending to the local Orthanc 0.8.6 server, with compression: + # Not supported by Orthanc 0.8.6 => failure + self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/peers/peer/store', { + 'Resources' : [ i ], + 'Compress' : True, + })) + self.assertEqual(0, len(DoGet(_LOCAL, '/instances'))) + + # Sending to the tested remote server, with compression: OK + jobId = MonitorJob2(_REMOTE, lambda: DoPost( + _REMOTE, '/peers/self/store', { + 'Resources' : [ i ], + 'Compress' : True, + 'Synchronous' : False, + })) + + job = DoGet(_REMOTE, '/jobs/%s' % jobId) + self.assertTrue(job['Content']['Compress']) + + # Compression must have divided the size of the sent data at least twice + self.assertLess(int(job['Content']['Size']), sourceSize / 2)