orthanc-tests: Tests/Tests.py annotate

annotate Tests/Tests.py @ 675:c8c4bebf18b8

fix limit=0 test

author	Alain Mazy <am@orthanc.team>
date	Tue, 03 Sep 2024 16:37:53 +0200
parents	36c00333f6ef
children	72f186c739d0

rev	line source
22 8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	1 #!/usr/bin/env python
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2 # -- coding: utf-8 --
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	3
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	4
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	5 # Orthanc - A Lightweight, RESTful DICOM Store
73 97acfdf0dbce 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	6 # Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 # Department, University Hospital of Liege, Belgium
649 5d7b6e43ab7d updated copyright, as Orthanc Team now replaces Osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 647 diff changeset	8 # Copyright (C) 2017-2023 Osimis S.A., Belgium
5d7b6e43ab7d updated copyright, as Orthanc Team now replaces Osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 647 diff changeset	9 # Copyright (C) 2024-2024 Orthanc Team SRL, Belgium
640 9f8276ac1cdd update year to 2024 Sebastien Jodogne <s.jodogne@gmail.com> parents: 626 diff changeset	10 # Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 #
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 # This program is free software: you can redistribute it and/or
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 # modify it under the terms of the GNU General Public License as
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 # published by the Free Software Foundation, either version 3 of the
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 # License, or (at your option) any later version.
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 #
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 # This program is distributed in the hope that it will be useful, but
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 # WITHOUT ANY WARRANTY; without even the implied warranty of
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 # General Public License for more details.
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 #
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 # You should have received a copy of the GNU General Public License
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 # along with this program. If not, see <http://www.gnu.org/licenses/>.
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25
202 f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	26 import base64
290 b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	27 import bz2
202 f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	28 import copy
440 3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	29 import io
439 2ca9e31d582f numpy and getscu are now included in jodogne/orthanc-tests Docker image Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	30 import numpy
202 f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	31 import pprint
439 2ca9e31d582f numpy and getscu are now included in jodogne/orthanc-tests Docker image Sebastien Jodogne <s.jodogne@gmail.com> parents: 437 diff changeset	32 import shutil
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	33 import tempfile
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 import unittest
515 5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	35 import time
529 53cf0e3ad007 get DCMDICPATH from env Alain Mazy <am@osimis.io> parents: 527 diff changeset	36 import os
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37
11 c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	38 from PIL import ImageChops
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39 from Toolbox import *
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	40 from xml.dom import minidom
312 e12c8434aa1e print date Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	41 from datetime import datetime
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43 _LOCAL = None
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 _REMOTE = None
306 da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	45 _DOCKER = False
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	46
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	47
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	48 def SetOrthancParameters(local, remote, withinDocker):
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	49 global _LOCAL, _REMOTE, _DOCKER
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 _LOCAL = local
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51 _REMOTE = remote
306 da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	52 _DOCKER = withinDocker
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	53
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	54
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	55 def ExtractDicomTags(rawDicom, tags):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	56 with tempfile.NamedTemporaryFile(delete = True) as f:
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	57 f.write(rawDicom)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	58 f.flush()
45 a8cc12e9b268 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 44 diff changeset	59 data = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ])
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	60
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	61 result = []
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	62 for tag in tags:
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	63 match = re.search('<element[^>]+name="%s">([^>]*)</element>' % tag, data)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	64 if match == None:
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	65 result.append('')
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	66 else:
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	67 result.append(match.group(1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	68
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	69 return result
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	70
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	71
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	72 def CompareLists(a, b):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	73 if len(a) != len(b):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	74 return False
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	75
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	76 for i in range(len(a)):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	77 d = a[i] - b[i]
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	78 if abs(d) >= 0.51: # Add some tolerance for rounding errors
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	79 return False
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	80
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	81 return True
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	82
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	83
80 8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	84 def CompareTags(a, b, tagsToIgnore):
8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	85 for i in tagsToIgnore:
8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	86 if i in a:
8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	87 del a[i]
8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	88 if i in b:
8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	89 del b[i]
8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	90
123 ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	91 if a.keys() == b.keys():
ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	92 return True
ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	93 else:
ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	94 print('Mismatch in tags: %s' % str(set(a.keys()) ^ set(b.keys())))
ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	95 return False
80 8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	96
8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	97
71 48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	98 def CallFindScu(args):
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	99 p = subprocess.Popen([ FindExecutable('findscu'),
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	100 '-P', '-aec', _REMOTE['DicomAet'], '-aet', _LOCAL['DicomAet'],
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	101 _REMOTE['Server'], str(_REMOTE['DicomPort']) ] + args,
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	102 stderr=subprocess.PIPE)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	103 return p.communicate()[1]
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	104
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	105
142 6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	106 def GetMoveScuCommand():
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	107 return [
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	108 FindExecutable('movescu'),
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	109 '--move', _LOCAL['DicomAet'], # Target AET (i.e. storescp)
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	110 '--call', _REMOTE['DicomAet'], # Called AET (i.e. Orthanc)
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	111 '--aetitle', _LOCAL['DicomAet'], # Calling AET (i.e. storescp)
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	112 _REMOTE['Server'],
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	113 str(_REMOTE['DicomPort'])
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	114 ]
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	115
231 4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	116
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	117 def IsDicomUntilPixelDataStored(orthanc):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	118 # This function detects whether the "StorageCompression" option is
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	119 # "true", OR the storage area does not support read-range
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	120
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	121 if IsOrthancVersionAbove(orthanc, 1, 9, 1):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	122 i = UploadInstance(orthanc, 'ColorTestMalaterre.dcm') ['ID']
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	123 a = DoGet(orthanc, '/instances/%s/metadata/PixelDataOffset' % i)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	124 if a != 0x03a0:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	125 raise Exception('Internal error')
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	126
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	127 a = DoGet(orthanc, '/instances/%s/attachments' % i)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	128 if len(a) != 1 and len(a) != 2 or not 'dicom' in a:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	129 raise Exception('Internal error')
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	130
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	131 DoDelete(orthanc, '/instances/%s' % i)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	132
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	133 if len(a) == 1:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	134 return False
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	135 elif 'dicom-until-pixel-data' in a:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	136 return True
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	137 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	138 raise Exception('Internal error')
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	139
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	140 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	141 return False
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	142
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	143
54 c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	144 def CallMoveScu(args):
231 4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	145 try:
4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	146 subprocess.check_call(GetMoveScuCommand() + args,
318 bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	147 stderr = subprocess.PIPE)
231 4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	148 except subprocess.CalledProcessError as e:
4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	149 # The error code "69" corresponds to "EXITCODE_CMOVE_ERROR",
4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	150 # that has been introduced in DCMTK 3.6.2. This error code is
4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	151 # expected by some tests that try and C-MOVE non-existing
4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	152 # DICOM instances.
4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	153 # https://groups.google.com/d/msg/orthanc-users/DCRc5NeSCbM/DG-pSWj-BwAJ
4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	154 if e.returncode != 69:
4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	155 raise e
54 c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	156
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	157
51 264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	158 def GenerateTestSequence():
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	159 return [
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	160 {
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	161 'StudyDescription': 'Hello^',
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	162 'ReferencedStudySequence' : [
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	163 {
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	164 'StudyDescription': 'Toto',
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	165 },
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	166 {
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	167 'StudyDescription': 'Tata',
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	168 },
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	169 ]
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	170 },
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	171 {
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	172 'StudyDescription': 'Sébastien^',
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	173 'StudyDate' : '19700202',
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	174 }
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	175 ]
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	176
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	177
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	178 class Orthanc(unittest.TestCase):
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	179 def setUp(self):
83 3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 81 diff changeset	180 if (sys.version_info >= (3, 0)):
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 81 diff changeset	181 # Remove annoying warnings about unclosed socket in Python 3
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 81 diff changeset	182 import warnings
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 81 diff changeset	183 warnings.simplefilter("ignore", ResourceWarning)
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 81 diff changeset	184
508 ae493446336a fix tests for missing archives Alain Mazy <am@osimis.io> parents: 507 diff changeset	185 print('running : %s' % self.id())
ae493446336a fix tests for missing archives Alain Mazy <am@osimis.io> parents: 507 diff changeset	186
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	187 DropOrthanc(_LOCAL)
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	188 DropOrthanc(_REMOTE)
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	189 UninstallLuaCallbacks(_REMOTE)
423 cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	190
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	191 # Reset stuff possibly set by some integration tests
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	192 DoPut(_REMOTE, '/tools/default-encoding', 'Latin1')
515 5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	193 if IsOrthancVersionAbove(_REMOTE, 1, 9, 0):
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	194 DoPut(_REMOTE, '/tools/accepted-transfer-syntaxes', [ '1.2.840.10008.1.*' ])
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	195 DoPut(_REMOTE, '/tools/unknown-sop-class-accepted', '0')
423 cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	196
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	197 for i in [ 'toto', 'tata' ]:
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	198 if i in DoGet(_REMOTE, '/modalities'):
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	199 DoDelete(_REMOTE, '/modalities/%s' % i)
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	200 if i in DoGet(_REMOTE, '/peers'):
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	201 DoDelete(_REMOTE, '/peers/%s' % i)
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	202
312 e12c8434aa1e print date Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	203 #print("%s: In test %s" % (datetime.now(), self._testMethodName))
44 ffa542cce638 Toolbox.FindExecutable() Sebastien Jodogne <s.jodogne@gmail.com> parents: 43 diff changeset	204
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	205 def AssertSameImages(self, truth, url):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	206 im = GetImage(_REMOTE, url)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	207 self.assertTrue(CompareLists(truth, im.getdata()))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	208
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210 def test_system(self):
177 ef6b791c6d62 fix version checks am@osimis.io parents: 176 diff changeset	211 self.assertTrue('Version' in DoGet(_REMOTE, '/system'))
ef6b791c6d62 fix version checks am@osimis.io parents: 176 diff changeset	212 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
ef6b791c6d62 fix version checks am@osimis.io parents: 176 diff changeset	213 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
ef6b791c6d62 fix version checks am@osimis.io parents: 176 diff changeset	214
512 e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	215 systemInfo = DoGet(_REMOTE, '/system')
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	216
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	217 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
512 e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	218 self.assertIn("MainDicomTags", systemInfo)
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	219 self.assertIn("Patient", systemInfo["MainDicomTags"])
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	220 self.assertIn("Study", systemInfo["MainDicomTags"])
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	221 self.assertIn("Series", systemInfo["MainDicomTags"])
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	222 self.assertIn("Instance", systemInfo["MainDicomTags"])
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	223
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	224 if IsOrthancVersionAbove(_REMOTE, 1, 12, 0):
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	225 self.assertIn("UserMetadata", systemInfo)
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	226 self.assertEqual(1098, systemInfo['UserMetadata']['my-metadata'] )
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	227
177 ef6b791c6d62 fix version checks am@osimis.io parents: 176 diff changeset	228 if systemInfo["Version"] == "mainline":
463 29aaa3df718f added verbosity and retries for test sometimes failing on CI Alain Mazy <am@osimis.io> parents: 457 diff changeset	229 print("Skipping version checks since you're currently in mainline")
177 ef6b791c6d62 fix version checks am@osimis.io parents: 176 diff changeset	230 return
ef6b791c6d62 fix version checks am@osimis.io parents: 176 diff changeset	231
509 17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	232 if not IsOrthancVersionAbove(_LOCAL, 0, 8, 7):
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	233 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 8, 6))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	234 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 8, 7))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	235 self.assertTrue(IsOrthancVersionAbove(_LOCAL, 0, 7, 6))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	236 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 0, 9, 6))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	237 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 1, 8, 6))
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238
456 0d7c0bbe6c90 fix Alain Mazy <am@osimis.io> parents: 454 diff changeset	239
512 e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	240
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241 def test_upload(self):
173 ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	242 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	243 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	244
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	245 sizeDummyCT = 2472
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	246 sizeOverwrite = 2476
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	247 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d'
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	248
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	249 # This file has no pixel data => "dicom-until-pixel-data" is not created
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250 u = UploadInstance(_REMOTE, 'DummyCT.dcm')
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	251 isCompressed = (DoGet(_REMOTE, '/instances/%s/attachments/dicom/is-compressed' % u['ID']) != 0)
183 76747a374aff test Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	252 self.assertEqual(instance, u['ID'])
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 self.assertEqual('Success', u['Status'])
173 ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	254
183 76747a374aff test Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	255 if True:
76747a374aff test Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	256 # New test for Orthanc 1.4.3
76747a374aff test Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	257 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', u['ParentSeries'])
76747a374aff test Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	258 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', u['ParentStudy'])
76747a374aff test Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	259 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', u['ParentPatient'])
76747a374aff test Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	260
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	261 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	262 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json' % instance))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	263 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/attachments/dicom-until-pixel-data' % instance))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	264 j = 0
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	265 else:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	266 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/attachments/dicom-until-pixel-data' % instance))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	267 j = int(DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % instance))
445 09ebdee8eda2 added test for /attachments/../info Alain Mazy <am@osimis.io> parents: 443 diff changeset	268
09ebdee8eda2 added test for /attachments/../info Alain Mazy <am@osimis.io> parents: 443 diff changeset	269 if IsOrthancVersionAbove(_REMOTE, 1, 10, 0):
09ebdee8eda2 added test for /attachments/../info Alain Mazy <am@osimis.io> parents: 443 diff changeset	270 attachmentInfo = DoGet(_REMOTE, '/instances/%s/attachments/dicom/info' % instance)
447 72be948dfe5c fix test_upload Sebastien Jodogne <s.jodogne@gmail.com> parents: 446 diff changeset	271
72be948dfe5c fix test_upload Sebastien Jodogne <s.jodogne@gmail.com> parents: 446 diff changeset	272 if isCompressed:
72be948dfe5c fix test_upload Sebastien Jodogne <s.jodogne@gmail.com> parents: 446 diff changeset	273 self.assertGreater(sizeDummyCT, attachmentInfo['CompressedSize'])
72be948dfe5c fix test_upload Sebastien Jodogne <s.jodogne@gmail.com> parents: 446 diff changeset	274 else:
72be948dfe5c fix test_upload Sebastien Jodogne <s.jodogne@gmail.com> parents: 446 diff changeset	275 self.assertEqual(sizeDummyCT, attachmentInfo['CompressedSize'])
72be948dfe5c fix test_upload Sebastien Jodogne <s.jodogne@gmail.com> parents: 446 diff changeset	276
445 09ebdee8eda2 added test for /attachments/../info Alain Mazy <am@osimis.io> parents: 443 diff changeset	277 self.assertEqual(sizeDummyCT, attachmentInfo['UncompressedSize'])
09ebdee8eda2 added test for /attachments/../info Alain Mazy <am@osimis.io> parents: 443 diff changeset	278 self.assertIn('Uuid', attachmentInfo)
09ebdee8eda2 added test for /attachments/../info Alain Mazy <am@osimis.io> parents: 443 diff changeset	279 self.assertEqual(1, attachmentInfo['ContentType'])
09ebdee8eda2 added test for /attachments/../info Alain Mazy <am@osimis.io> parents: 443 diff changeset	280
173 ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	281 s = sizeDummyCT + j
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	282
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	283 if isCompressed:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	284 self.assertGreater(s, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	285 else:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	286 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	287
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	288 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']))
173 ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	289
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	290 u = UploadInstance(_REMOTE, 'DummyCT.dcm')
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	291 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	292 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	293 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	294 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	295
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	296 if isCompressed:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	297 self.assertGreater(s, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	298 else:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	299 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	300
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	301 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']))
173 ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	302
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	303 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % instance)
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304 self.assertEqual('20070101', i['StudyDate'])
173 ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	305 self.assertEqual('KNIX', i['PatientName'])
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	306
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	307 if IsOrthancVersionAbove(_REMOTE, 1, 4, 2):
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	308 # Overwriting
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	309 self.assertEqual('Success', u['Status'])
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	310 else:
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	311 self.assertEqual('AlreadyStored', u['Status'])
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	312
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	313 u = UploadInstance(_REMOTE, 'DummyCT-overwrite.dcm')
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	314 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	315 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	316 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	317 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	318
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	319 if IsOrthancVersionAbove(_REMOTE, 1, 4, 2):
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	320 # Overwriting
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	321 self.assertEqual('Success', u['Status'])
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	322 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	323 j2 = 0
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	324 else:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	325 j2 = int(DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/size' % instance))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	326 self.assertNotEqual(j, j2)
173 ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	327 s2 = sizeOverwrite + j2
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	328 self.assertNotEqual(s, s2)
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	329 if isCompressed:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	330 self.assertGreater(s2, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	331 else:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	332 self.assertEqual(s2, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	333
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	334 self.assertEqual(s2, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']))
173 ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	335 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % instance)
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	336 self.assertEqual('ANOTHER', i['PatientName'])
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	337 else:
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	338 self.assertEqual('AlreadyStored', u['Status'])
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	339 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	340 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']))
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	341
5 19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	342 def test_upload_2(self):
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344 instance = DoGet(_REMOTE, '/instances/%s' % i)
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	345 self.assertEqual(i, instance['ID'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109',
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347 instance['MainDicomTags']['SOPInstanceUID'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349 series = DoGet(_REMOTE, '/series/%s' % instance['ParentSeries'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394',
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 series['MainDicomTags']['SeriesInstanceUID'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 study = DoGet(_REMOTE, '/studies/%s' % series['ParentStudy'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390',
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 study['MainDicomTags']['StudyInstanceUID'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357 patient = DoGet(_REMOTE, '/patients/%s' % study['ParentPatient'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 self.assertEqual('ozp00SjY2xG',
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359 patient['MainDicomTags']['PatientID'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361 dicom = DoGet(_REMOTE, '/instances/%s/file' % instance['ID'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 self.assertEqual(2472, len(dicom))
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363 self.assertEqual('3e29b869978b6db4886355a2b1132124', ComputeMD5(dicom))
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i)))
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/simplified-tags' % i)['StationName'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	366 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/tags' % i)['0008,1010']['Value'])
136 5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	367 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)['StationName'])
5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	368 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/tags?short' % i)['0008,1010'])
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	369
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	370
5 19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	371 def test_images(self):
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	372 i = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID']
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	373 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i)))
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	374
5 19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	375 im = GetImage(_REMOTE, '/instances/%s/preview' % i)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	376 self.assertEqual("L", im.mode)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	377 self.assertEqual(512, im.size[0])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	378 self.assertEqual(358, im.size[1])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	379
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	380 im = GetImage(_REMOTE, '/instances/%s/image-uint8' % i)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	381 self.assertEqual("L", im.mode)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	382 self.assertEqual(512, im.size[0])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	383 self.assertEqual(358, im.size[1])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	384
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	385 im = GetImage(_REMOTE, '/instances/%s/image-uint16' % i)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	386 self.assertEqual(512, im.size[0])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	387 self.assertEqual(358, im.size[1])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	388
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	389 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % i)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	390 self.assertEqual("L", im.mode)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	391 self.assertEqual(512, im.size[0])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	392 self.assertEqual(358, im.size[1])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	393
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	394 im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint8' % i)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	395 self.assertEqual("L", im.mode)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	396 self.assertEqual(512, im.size[0])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	397 self.assertEqual(358, im.size[1])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	398
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	399 im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint16' % i)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	400 self.assertEqual(512, im.size[0])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	401 self.assertEqual(358, im.size[1])
64 369e439cdfd6 test access header Sebastien Jodogne <s.jodogne@gmail.com> parents: 63 diff changeset	402
369e439cdfd6 test access header Sebastien Jodogne <s.jodogne@gmail.com> parents: 63 diff changeset	403 # This is Little Endian Explicit
369e439cdfd6 test access header Sebastien Jodogne <s.jodogne@gmail.com> parents: 63 diff changeset	404 self.assertEqual('1.2.840.10008.1.2.1', DoGet(_REMOTE, '/instances/%s/header?simplify' % i)['TransferSyntaxUID'])
369e439cdfd6 test access header Sebastien Jodogne <s.jodogne@gmail.com> parents: 63 diff changeset	405
464 216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	406 def test_images_implicit_vr(self):
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	407 if IsOrthancVersionAbove(_REMOTE, 1, 10, 2):
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	408 i = UploadInstance(_REMOTE, 'Implicit-vr-us-palette.dcm')['ID']
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	409
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	410 im = GetImage(_REMOTE, '/instances/%s/preview' % i)
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	411 self.assertEqual("RGB", im.mode)
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	412 self.assertEqual(800, im.size[0])
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	413 self.assertEqual(600, im.size[1])
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	414
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	415
6 6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	416 def test_hierarchy(self):
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	417 UploadFolder(_REMOTE, 'Brainix/Epi')
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	418 UploadFolder(_REMOTE, 'Brainix/Flair')
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	419 UploadFolder(_REMOTE, 'Knee/T1')
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	420 UploadFolder(_REMOTE, 'Knee/T2')
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	421
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	422 p = DoGet(_REMOTE, '/patients')
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	423 s = DoGet(_REMOTE, '/studies')
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	424 t = DoGet(_REMOTE, '/series')
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	425 self.assertEqual(2, len(p))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	426 self.assertEqual(2, len(s))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	427 self.assertEqual(4, len(t))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	428 self.assertEqual(94, len(DoGet(_REMOTE, '/instances')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	429
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	430 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0'
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	431 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988'
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	432 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8'
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	433 brainixFlair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0'
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	434
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	435 kneePatient = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17'
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	436 kneeStudy = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	437 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	438 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59'
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	439
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	440 self.assertTrue(brainixPatient in p)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	441 self.assertTrue(kneePatient in p)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	442 self.assertTrue(brainixStudy in s)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	443 self.assertTrue(kneeStudy in s)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	444 self.assertTrue(brainixEpi in t)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	445 self.assertTrue(brainixFlair in t)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	446 self.assertTrue(kneeT1 in t)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	447 self.assertTrue(kneeT2 in t)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	448
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	449 self.assertEqual(44, len(DoGet(_REMOTE, '/patients/%s/instances' % brainixPatient)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	450 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/series' % brainixPatient)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	451 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/studies' % brainixPatient)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	452
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	453 self.assertEqual(50, len(DoGet(_REMOTE, '/patients/%s/instances' % kneePatient)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	454 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/series' % kneePatient)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	455 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/studies' % kneePatient)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	456
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	457 self.assertEqual(2, len(DoGet(_REMOTE, '/studies/%s/series' % brainixStudy)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	458 self.assertEqual(44, len(DoGet(_REMOTE, '/studies/%s/instances' % brainixStudy)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	459
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	460 self.assertEqual(2, len(DoGet(_REMOTE, '/studies/%s/series' % kneeStudy)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	461 self.assertEqual(50, len(DoGet(_REMOTE, '/studies/%s/instances' % kneeStudy)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	462
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	463 self.assertEqual(22, len(DoGet(_REMOTE, '/series/%s/instances' % brainixEpi)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	464 self.assertEqual(22, len(DoGet(_REMOTE, '/series/%s/instances' % brainixFlair)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	465 self.assertEqual(24, len(DoGet(_REMOTE, '/series/%s/instances' % kneeT1)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	466 self.assertEqual(26, len(DoGet(_REMOTE, '/series/%s/instances' % kneeT2)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	467
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	468 for patient in p:
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	469 for study in DoGet(_REMOTE, '/patients/%s/studies' % patient):
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	470 self.assertEqual(patient, study['ParentPatient'])
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	471 for series in DoGet(_REMOTE, '/studies/%s/series' % study['ID']):
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	472 self.assertEqual(study['ID'], series['ParentStudy'])
211 a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	473 self.assertEqual('Unknown', series['Status'])
6 6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	474 for instance in DoGet(_REMOTE, '/series/%s/instances' % series['ID']):
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	475 self.assertEqual(series['ID'], instance['ParentSeries'])
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	476
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	477 if not IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	478 # The "dicom-as-json" attachment was removed in Orthanc 1.9.1
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	479 self.assertEqual(json.dumps(DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/data' % instance['ID'])),
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	480 json.dumps(DoGet(_REMOTE, '/instances/%s/tags' % instance['ID'])))
6 6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	481
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	482
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	483 r = DoDelete(_REMOTE, "/studies/%s" % brainixStudy)['RemainingAncestor']
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	484 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	485 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	486 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	487 self.assertEqual(50, len(DoGet(_REMOTE, '/instances')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	488 self.assertEqual(None, r)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	489
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	490 r = DoDelete(_REMOTE, "/series/%s" % kneeT2)['RemainingAncestor']
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	491 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	492 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	493 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	494 self.assertEqual(24, len(DoGet(_REMOTE, '/instances')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	495 self.assertEqual('Study', r['Type'])
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	496 self.assertEqual(kneeStudy, r['ID'])
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	497
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	498 r = DoDelete(_REMOTE, "/instances/%s" % DoGet(_REMOTE, '/instances')[0])['RemainingAncestor']
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	499 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	500 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	501 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	502 self.assertEqual(23, len(DoGet(_REMOTE, '/instances')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	503 self.assertEqual('Series', r['Type'])
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	504 self.assertEqual(kneeT1, r['ID'])
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	505
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	506 r = DoDelete(_REMOTE, "/patients/%s" % kneePatient)['RemainingAncestor']
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	507 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	508 self.assertEqual(0, len(DoGet(_REMOTE, '/studies')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	509 self.assertEqual(0, len(DoGet(_REMOTE, '/series')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	510 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	511 self.assertEqual(None, r)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	512
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	513 DropOrthanc(_REMOTE)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	514 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	515 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
7 302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	516
213 eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	517 def test_delete_cascade(self):
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	518 # make sure deleting the last instance of a study deletes the series, study and patient
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	519
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	520 self.assertEqual(0, len(DoGet(_REMOTE, '/instances'))) # make sure orthanc is empty when starting the test
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	521 a = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	522 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	523 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	524 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	525 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	526
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	527 DoDelete(_REMOTE, '/instances/%s' % a)
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	528
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	529 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	530 self.assertEqual(0, len(DoGet(_REMOTE, '/series')))
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	531 self.assertEqual(0, len(DoGet(_REMOTE, '/studies')))
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	532 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	533
7 302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	534
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	535 def test_multiframe(self):
7 302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	536 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID']
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	537 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % i)))
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	538
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	539 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % i)
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	540 self.assertEqual("L", im.mode)
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	541 self.assertEqual(512, im.size[0])
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	542 self.assertEqual(512, im.size[1])
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	543
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	544 DoGet(_REMOTE, '/instances/%s/frames/0/image-uint8' % i)
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	545 DoGet(_REMOTE, '/instances/%s/frames/0/image-uint16' % i)
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	546 DoGet(_REMOTE, '/instances/%s/frames/75/preview' % i)
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	547 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/aaa/preview' % i))
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	548 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/76/preview' % i))
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	549
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	550
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	551 def test_changes(self):
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	552 # Check emptiness
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	553 c = DoGet(_REMOTE, '/changes')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	554 self.assertEqual(0, len(c['Changes']))
202 f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	555 #self.assertEqual(0, c['Last']) # Not true anymore for Orthanc >= 1.5.2
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	556 self.assertTrue(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	557 c = DoGet(_REMOTE, '/changes?last')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	558 self.assertEqual(0, len(c['Changes']))
202 f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	559 #self.assertEqual(0, c['Last']) # Not true anymore for Orthanc >= 1.5.2
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	560 self.assertTrue(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	561
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	562 # Add 1 instance
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	563 i = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	564 c = DoGet(_REMOTE, '/changes')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	565 begin = c['Last']
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	566 self.assertEqual(4, len(c['Changes']))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	567 self.assertTrue(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	568 self.assertEqual(c['Changes'][-1]['Seq'], c['Last'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	569
390 5c2472f008eb Check the order in which the creation events are reported Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	570 # Check the order in which the creation events are reported
5c2472f008eb Check the order in which the creation events are reported Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	571 self.assertEqual(c['Changes'][0]['ChangeType'], 'NewInstance')
5c2472f008eb Check the order in which the creation events are reported Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	572 self.assertEqual(c['Changes'][1]['ChangeType'], 'NewSeries')
5c2472f008eb Check the order in which the creation events are reported Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	573 self.assertEqual(c['Changes'][2]['ChangeType'], 'NewStudy')
5c2472f008eb Check the order in which the creation events are reported Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	574 self.assertEqual(c['Changes'][3]['ChangeType'], 'NewPatient')
5c2472f008eb Check the order in which the creation events are reported Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	575
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	576 c = DoGet(_REMOTE, '/changes?last')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	577 self.assertEqual(1, len(c['Changes']))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	578 self.assertEqual(begin, c['Last'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	579 self.assertTrue(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	580 c = DoGet(_REMOTE, '/changes?limit=1&since=' + str(begin - 1))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	581 self.assertEqual(1, len(c['Changes']))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	582 self.assertEqual(begin, c['Last'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	583 self.assertTrue(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	584 c = DoGet(_REMOTE, '/changes?limit=1&since=' + str(begin - 2))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	585 self.assertEqual(1, len(c['Changes']))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	586 self.assertEqual(begin - 1, c['Last'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	587 self.assertFalse(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	588 c = DoGet(_REMOTE, '/changes?limit=1&since=' + str(begin - 3))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	589 self.assertEqual(1, len(c['Changes']))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	590 self.assertEqual(begin - 2, c['Last'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	591 self.assertFalse(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	592
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	593 UploadFolder(_REMOTE, 'Knee/T1')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	594 UploadFolder(_REMOTE, 'Knee/T2')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	595 since = begin
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	596 countPatients = 0
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	597 countStudies = 0
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	598 countSeries = 0
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	599 countInstances = 0
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	600 completed = 0
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	601 while True:
530 937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	602 c = DoGet(_REMOTE, '/changes', { 'since' : since, 'limit' : 1000 })
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	603 since = c['Last']
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	604 for i in c['Changes']:
530 937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	605 # We have set StableAge to 1 -> we might have StabeStudy but this is not sure -> detect only the 'New' events
937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	606
937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	607 if i['ResourceType'] == 'Instance' and i['ChangeType'] == 'NewInstance':
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	608 countInstances += 1
530 937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	609 if i['ResourceType'] == 'Patient' and i['ChangeType'] == 'NewPatient':
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	610 countPatients += 1
530 937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	611 if i['ResourceType'] == 'Study' and i['ChangeType'] == 'NewStudy':
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	612 countStudies += 1
530 937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	613 if i['ResourceType'] == 'Series' and i['ChangeType'] == 'NewSeries':
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	614 countSeries += 1
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	615 if i['ChangeType'] == 'CompletedSeries':
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	616 completed += 1
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	617 self.assertTrue('ID' in i)
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	618 self.assertTrue('Path' in i)
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	619 self.assertTrue('Seq' in i)
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	620 if c['Done']:
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	621 break
530 937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	622 # we count only the events since before the upload of 2 Knee series !
937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	623 self.assertEqual(50, countInstances)
937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	624 self.assertEqual(1, countPatients)
937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	625 self.assertEqual(1, countStudies)
937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	626 self.assertEqual(2, countSeries)
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	627 self.assertEqual(0, completed)
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	628
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	629
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	630 def test_archive(self):
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	631 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	632 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
582 615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	633 kneePatient = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17'
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	634 kneeStudy = DoGet(_REMOTE, '/studies')[0]
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	635 kneeSeries = DoGet(_REMOTE, '/series')[0]
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	636
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	637 z = GetArchive(_REMOTE, '/patients/%s/archive' % kneePatient)
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	638 self.assertEqual(2, len(z.namelist()))
582 615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	639 self.assertIn('887 KNEE/A10003245599 IRM DU GENOU/MR T1W_aTSE/MR000000.dcm', z.namelist())
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	640
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	641 z = GetArchive(_REMOTE, '/studies/%s/archive' % kneeStudy)
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	642 self.assertEqual(2, len(z.namelist()))
582 615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	643 self.assertIn('887 KNEE/A10003245599 IRM DU GENOU/MR T1W_aTSE/MR000000.dcm', z.namelist())
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	644
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	645 z = GetArchive(_REMOTE, '/series/%s/archive' % kneeSeries)
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	646 self.assertEqual(1, len(z.namelist()))
583 b9dffa48f74a fix to keep backward behaviour when exporting a series archive Alain Mazy <am@osimis.io> parents: 582 diff changeset	647 self.assertIn('887 KNEE/A10003245599 IRM DU GENOU/MR T1W_aTSE/MR000000.dcm', z.namelist())
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	648
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	649 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
582 615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	650 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0'
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	651 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988'
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	652
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	653 z = GetArchive(_REMOTE, '/patients/%s/archive' % kneePatient)
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	654 self.assertEqual(2, len(z.namelist()))
192 6ff9d035b26b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	655
582 615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	656 # archive with 2 patients
192 6ff9d035b26b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	657 z = PostArchive(_REMOTE, '/tools/create-archive', {
582 615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	658 'Resources' : [ brainixPatient, kneePatient ]
192 6ff9d035b26b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	659 })
6ff9d035b26b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	660 self.assertEqual(3, len(z.namelist()))
582 615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	661 self.assertIn('5Yp0E BRAINIX/0 IRM crbrale neurocrne/MR sT2WFLAIR/MR000000.dcm', z.namelist())
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	662 self.assertIn('887 KNEE/A10003245599 IRM DU GENOU/MR T1W_aTSE/MR000000.dcm', z.namelist())
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	663
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	664 z = PostArchive(_REMOTE, '/patients/%s/archive' % kneePatient, {
403 e08e15befa0c test sync POST to /archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	665 'Synchronous' : True
e08e15befa0c test sync POST to /archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	666 })
e08e15befa0c test sync POST to /archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	667 self.assertEqual(2, len(z.namelist()))
582 615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	668
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	669 # archive with 2 studies
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	670 z = PostArchive(_REMOTE, '/tools/create-archive', {
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	671 'Resources' : [ brainixStudy, kneeStudy ]
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	672 })
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	673 self.assertEqual(3, len(z.namelist()))
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	674 self.assertIn('5Yp0E BRAINIX/0 IRM crbrale neurocrne/MR sT2WFLAIR/MR000000.dcm', z.namelist())
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	675 self.assertIn('887 KNEE/A10003245599 IRM DU GENOU/MR T1W_aTSE/MR000000.dcm', z.namelist())
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	676
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	677 # archive with 1 patient & 1 study
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	678 z = PostArchive(_REMOTE, '/tools/create-archive', {
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	679 'Resources' : [ brainixPatient, kneeStudy ]
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	680 })
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	681 self.assertEqual(3, len(z.namelist()))
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	682 self.assertIn('5Yp0E BRAINIX/0 IRM crbrale neurocrne/MR sT2WFLAIR/MR000000.dcm', z.namelist())
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	683 self.assertIn('887 KNEE/A10003245599 IRM DU GENOU/MR T1W_aTSE/MR000000.dcm', z.namelist())
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	684
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	685
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	686 def test_archive_with_patient_ids_collision(self):
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	687 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2):
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	688 # one PatientID: COMMON
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	689 # 2 PatientName: HELLO & WORLD
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	690
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	691 hello = UploadInstance(_REMOTE, 'PatientIdsCollision/Image1.dcm')
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	692 world = UploadInstance(_REMOTE, 'PatientIdsCollision/Image2.dcm')
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	693 helloStudy = hello['ParentStudy']
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	694 worldStudy = world['ParentStudy']
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	695 helloPatient = hello['ParentPatient']
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	696 worldPatient = world['ParentPatient']
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	697
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	698 self.assertEqual(helloPatient, worldPatient)
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	699
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	700 # when downloading the Patient, we do not really know what PatientName we will get in the zip
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	701 z = GetArchive(_REMOTE, '/patients/%s/archive' % helloPatient)
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	702 self.assertEqual(2, len(z.namelist()))
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	703
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	704 # when downloading studies individually, we want to have the PatientName that appears in the study
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	705 z = GetArchive(_REMOTE, '/studies/%s/archive' % helloStudy)
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	706 self.assertEqual(1, len(z.namelist()))
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	707 self.assertIn('COMMON HELLO/HELLO SERIES/Unknown Series/00000000.dcm', z.namelist())
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	708
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	709 z = GetArchive(_REMOTE, '/studies/%s/archive' % worldStudy)
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	710 self.assertEqual(1, len(z.namelist()))
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	711 self.assertIn('COMMON WORLD/WORLD SERIES/Unknown Series/00000000.dcm', z.namelist())
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	712
615201c822d8 new test for PatientName used when exporting an archive Alain Mazy <am@osimis.io> parents: 573 diff changeset	713
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	714
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	715 def test_media_archive(self):
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	716 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	717 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	718
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	719 z = GetArchive(_REMOTE, '/patients/%s/media' % DoGet(_REMOTE, '/patients')[0])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	720 self.assertEqual(3, len(z.namelist()))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	721 self.assertTrue('IMAGES/IM0' in z.namelist())
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	722 self.assertTrue('IMAGES/IM1' in z.namelist())
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	723 self.assertTrue('DICOMDIR' in z.namelist())
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	724
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	725 try:
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	726 os.remove('/tmp/DICOMDIR')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	727 except:
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	728 # The file does not exist
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	729 pass
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	730
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	731 z.extract('DICOMDIR', '/tmp')
45 a8cc12e9b268 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 44 diff changeset	732 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ],
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	733 stderr = subprocess.STDOUT).split('\n')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	734 self.assertEqual(3, len(a))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	735 self.assertTrue(a[0].startswith('Warning'))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	736 self.assertEqual('BasicDirectory', a[1])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	737 self.assertEqual('', a[2])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	738
45 a8cc12e9b268 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 44 diff changeset	739 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ],
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	740 stderr = subprocess.STDOUT).split('\n')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	741 self.assertEqual(1, len(a))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	742 self.assertEqual('', a[0])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	743
45 a8cc12e9b268 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 44 diff changeset	744 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ])
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	745 self.assertTrue(re.search('1.3.46.670589.11.17521.5.0.3124.2008081908590448738', a) != None)
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	746 self.assertTrue(re.search('1.3.46.670589.11.17521.5.0.3124.2008081909113806560', a) != None)
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	747
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	748 os.remove('/tmp/DICOMDIR')
10 5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	749
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	750
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	751 def test_protection(self):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	752 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	753 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	754 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	755 a = DoGet(_REMOTE, '/patients')[0]
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	756 b = DoGet(_REMOTE, '/patients')[1]
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	757 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	758 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	759 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	760 DoPut(_REMOTE, '/patients/%s/protected' % a, '1', 'text/plain')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	761 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	762 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	763 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	764
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	765
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	766 def test_raw_tags(self):
10 5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	767 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	768
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	769 dicom = DoGet(_REMOTE, '/instances/%s/file' % i)
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	770 self.assertEqual('1a7c56cb02d6e742cc9c856a8ac182e3', ComputeMD5(dicom))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	771
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	772 s = '/instances/%s/content/' % i
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	773
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	774 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, s + '0008-1010').strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	775 self.assertRaises(Exception, lambda: DoGet(_REMOTE, s + '0008-1011'))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	776
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	777 self.assertEqual('Abdomen', DoGet(_REMOTE, s + '7fe1-1001/0/7fe1-1008/0/7fe1-1057').strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	778 self.assertEqual('cla_3c', DoGet(_REMOTE, s + '7fe1-1001/0/7fe1-1008/8/7fe1-1057').strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	779
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	780 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	781 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	782 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	783 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	784
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	785 for i in DoGet(_REMOTE, '/instances'):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	786 aid = DoGet(_REMOTE, '/instances/%s' % i)['MainDicomTags']['SOPInstanceUID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	787 self.assertEqual(aid, DoGet(_REMOTE, '/instances/%s/content/0008-0018' % i).replace(chr(0), ''))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	788
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	789
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	790 def test_raw_tags_mdn(self):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	791 # Bug reported by Cyril Paulus
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	792 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	793 self.assertAlmostEqual(0.000027, DoGet(_REMOTE, '/instances/%s/content/7053-1000' % i))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	794
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	795
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	796 def test_modify_instance(self):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	797 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	798 modified = DoPost(_REMOTE, '/instances/%s/modify' % i,
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	799 json.dumps({
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	800 "Replace" : {
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	801 "PatientName" : "hello",
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	802 #"PatientID" : "world"
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	803 },
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	804 "Remove" : [ "StationName" ],
118 a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	805 "RemovePrivateTags" : True
10 5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	806 }),
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	807 'application/json')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	808 j = DoPost(_REMOTE, '/instances', modified, 'application/dicom')['ID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	809
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	810 self.assertNotEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	811 #self.assertNotEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % i).strip())
83 3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 81 diff changeset	812 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i).strip())
10 5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	813 DoGet(_REMOTE, '/instances/%s/content/6003-1010' % i) # Some private tag
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	814
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	815 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	816 #self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % j).strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	817 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	818 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/6003-1010' % j))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	819
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	820
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	821 def test_modify_series(self):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	822 # Upload 4 images from the same series
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	823 for i in range(4):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	824 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	825
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	826 origSeries = DoGet(_REMOTE, '/series')[0]
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	827 newSeries = DoPost(_REMOTE, '/series/%s/modify' % origSeries,
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	828 '{"Replace":{"PatientName":"Jodogne"}}',
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	829 'application/json')['ID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	830
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	831 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['ModifiedFrom'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	832 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	833 self.assertEqual(4, len(instances))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	834 for i in instances:
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	835 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	836 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	837 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	838
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	839 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	840 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	841
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	842
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	843 def test_modify_study(self):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	844 # Upload 4 images from the 2 series of the same study
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	845 for i in range(4):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	846 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	847 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	848
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	849 origStudy = DoGet(_REMOTE, '/studies')[0]
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	850 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy,
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	851 '{"Replace":{"PatientName":"Jodogne"}}',
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	852 'application/json')['ID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	853
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	854 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['ModifiedFrom'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	855 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	856 self.assertEqual(2, len(series))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	857 for s in series:
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	858 ss = DoGet(_REMOTE, '/series/%s' % s)['ModifiedFrom']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	859 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	860 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	861
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	862 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	863 for i in instances:
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	864 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	865 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	866 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	867
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	868 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	869 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	870
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	871
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	872 def test_anonymize_series(self):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	873 # Upload 4 images from the same series
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	874 for i in range(4):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	875 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	876
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	877 origSeries = DoGet(_REMOTE, '/series')[0]
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	878 newSeries = DoPost(_REMOTE, '/series/%s/anonymize' % origSeries,
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	879 '{}',
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	880 'application/json')['ID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	881
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	882 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['AnonymizedFrom'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	883 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	884 self.assertEqual(4, len(instances))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	885 for i in instances:
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	886 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	887 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	888 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	889
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	890 DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j)
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	891 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	892
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	893
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	894 def test_anonymize_study(self):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	895 # Upload 4 images from the 2 series of the same study
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	896 for i in range(4):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	897 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	898 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	899
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	900 origStudy = DoGet(_REMOTE, '/studies')[0]
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	901 newStudy = DoPost(_REMOTE,'/studies/%s/anonymize' % origStudy,
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	902 '{"Replace":{"PatientName":"Jodogne"}}',
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	903 'application/json')['ID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	904
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	905 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['AnonymizedFrom'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	906 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	907 self.assertEqual(2, len(series))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	908 for s in series:
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	909 ss = DoGet(_REMOTE, '/series/%s' % s)['AnonymizedFrom']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	910 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	911 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	912
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	913 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	914 for i in instances:
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	915 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	916 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	917 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	918
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	919 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	920 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip())
11 c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	921
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	922
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	923
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	924 def test_storescu(self):
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	925 # Check emptiness
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	926 e = DoGet(_REMOTE, '/exports')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	927 self.assertEqual(0, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	928 self.assertEqual(0, e['Last'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	929 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	930 e = DoGet(_REMOTE, '/exports?last')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	931 self.assertEqual(0, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	932 self.assertEqual(0, e['Last'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	933 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	934
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	935 # Add 1 instance
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	936 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	937 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	938
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	939 # Export the instance
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	940 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') # instance
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	941 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	942 self.assertEqual(1, len(DoGet(_LOCAL, '/studies')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	943 self.assertEqual(1, len(DoGet(_LOCAL, '/series')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	944 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	945
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	946 e = DoGet(_REMOTE, '/exports')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	947 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	948 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	949 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	950 e = DoGet(_REMOTE, '/exports?limit=1')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	951 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	952 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	953 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	954 e = DoGet(_REMOTE, '/exports?last')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	955 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	956 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	957 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	958 seqInstance = e['Last']
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	959
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	960 # Export the series
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	961 j = DoPost(_REMOTE, '/modalities/orthanctest/store', 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', 'text/plain')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	962
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	963 e = DoGet(_REMOTE, '/exports')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	964 self.assertEqual(2, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	965 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	966 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	967 seqSeries = e['Last']
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	968 self.assertNotEqual(seqInstance, seqSeries)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	969 e = DoGet(_REMOTE, '/exports?limit=1&since=0')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	970 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	971 self.assertFalse(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	972 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	973 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	974 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	975 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	976 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	977 e = DoGet(_REMOTE, '/exports?last')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	978 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	979 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	980 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	981
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	982 # Export the study
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	983 j = DoPost(_REMOTE, '/modalities/orthanctest/store', 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', 'text/plain')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	984 seqStudy = DoGet(_REMOTE, '/exports')['Last']
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	985
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	986 # Export the patient
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	987 j = DoPost(_REMOTE, '/modalities/orthanctest/store', '6816cb19-844d5aee-85245eba-28e841e6-2414fae2', 'text/plain')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	988 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	989 self.assertEqual(1, len(DoGet(_LOCAL, '/studies')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	990 self.assertEqual(1, len(DoGet(_LOCAL, '/series')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	991 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	992
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	993 e = DoGet(_REMOTE, '/exports')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	994 self.assertEqual(4, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	995 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	996 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	997 seqPatient = e['Last']
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	998 self.assertNotEqual(seqInstance, seqSeries)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	999 self.assertNotEqual(seqSeries, seqStudy)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1000 self.assertNotEqual(seqStudy, seqPatient)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1001 self.assertTrue(seqInstance < seqSeries)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1002 self.assertTrue(seqSeries < seqStudy)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1003 self.assertTrue(seqStudy < seqPatient)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1004 e = DoGet(_REMOTE, '/exports?limit=1&since=0')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1005 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1006 self.assertFalse(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1007 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1008 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1009 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1010 self.assertFalse(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1011 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1012 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqSeries))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1013 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1014 self.assertFalse(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1015 self.assertEqual(e['Exports'][-1]['Seq'], seqStudy)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1016 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqStudy))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1017 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1018 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1019 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1020 e = DoGet(_REMOTE, '/exports?last')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1021 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1022 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1023 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1024
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1025
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1026 # Check the content of the logged information
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1027 e = DoGet(_REMOTE, '/exports')['Exports']
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1028
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1029 if 'PatientID' in e[0]:
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1030 # Since Orthanc 0.8.6
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1031 patient = 'PatientID'
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1032 study = 'StudyInstanceUID'
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1033 series = 'SeriesInstanceUID'
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1034 instance = 'SOPInstanceUID'
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1035 else:
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1036 # Up to Orthanc 0.8.5
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1037 patient = 'PatientId'
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1038 study = 'StudyInstanceUid'
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1039 series = 'SeriesInstanceUid'
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1040 instance = 'SopInstanceUid'
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1041
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1042 for k in range(4):
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1043 self.assertTrue('Date' in e[k])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1044 self.assertTrue('Seq' in e[k])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1045 self.assertEqual('orthanctest', e[k]['RemoteModality'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1046
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1047 self.assertEqual(10, len(e[0]))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1048 self.assertEqual('Instance', e[0]['ResourceType'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1049 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['ID'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1050 self.assertEqual('/instances/66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['Path'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1051 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', e[0][instance])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1052 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', e[0][series])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1053 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[0][study])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1054 self.assertEqual('ozp00SjY2xG', e[0][patient])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1055
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1056 self.assertEqual(9, len(e[1]))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1057 self.assertEqual('Series', e[1]['ResourceType'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1058 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['ID'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1059 self.assertEqual('/series/f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['Path'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1060 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', e[1][series])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1061 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[1][study])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1062 self.assertEqual('ozp00SjY2xG', e[1][patient])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1063
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1064 self.assertEqual(8, len(e[2]))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1065 self.assertEqual('Study', e[2]['ResourceType'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1066 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['ID'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1067 self.assertEqual('/studies/b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['Path'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1068 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', e[2][study])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1069 self.assertEqual('ozp00SjY2xG', e[2][patient])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1070
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1071 self.assertEqual(7, len(e[3]))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1072 self.assertEqual('Patient', e[3]['ResourceType'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1073 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['ID'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1074 self.assertEqual('/patients/6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['Path'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1075 self.assertEqual('ozp00SjY2xG', e[3][patient])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1076
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1077 DropOrthanc(_REMOTE)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1078 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1079
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1080
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1081 def test_store_peer(self):
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1082 self.assertEqual(0, len(DoGet(_LOCAL, '/exports')['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1083 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1084
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1085 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1086 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1087 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1088
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1089 j = DoPost(_REMOTE, '/peers/peer/store', str(i), 'text/plain')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1090 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1091 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1092
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1093 self.assertEqual(1, len(DoGet(_REMOTE, '/exports')['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1094
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1095 DropOrthanc(_REMOTE)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1096 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1097
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1098
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1099 def test_bulk_storescu(self):
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1100 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1101
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1102 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1103 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1104
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1105 j = DoPost(_REMOTE, '/modalities/orthanctest/store', [ a['ID'], b['ID'] ], 'application/json')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1106 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1107
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1108 DropOrthanc(_LOCAL)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1109
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1110 # Send using patient's UUID
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1111 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1112 j = DoPost(_REMOTE, '/modalities/orthanctest/store',
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1113 [ 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' ], 'application/json')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1114 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1115
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1116
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1117 def test_color(self):
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1118 i = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID']
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1119 im = GetImage(_REMOTE, '/instances/%s/preview' % i)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1120 self.assertEqual("RGB", im.mode)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1121 self.assertEqual(41, im.size[0])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1122 self.assertEqual(41, im.size[1])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1123
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1124 # http://effbot.org/zone/pil-comparing-images.htm
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1125 truth = Image.open(GetDatabasePath('ColorTestMalaterre.png'))
11 c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1126 self.assertTrue(ImageChops.difference(im, truth).getbbox() is None)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1127
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1128
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1129 def test_faking_ruby_put(self):
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1130 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1131 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1132 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1133 a = DoGet(_REMOTE, '/patients')[0]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1134 b = DoGet(_REMOTE, '/patients')[1]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1135 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1136 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1137 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1138 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '1')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1139 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1140 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1141 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1142
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1143
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1144 def test_faking_ruby_delete(self):
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1145 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1146 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1147 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1148 a = DoGet(_REMOTE, '/patients')[0]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1149 b = DoGet(_REMOTE, '/patients')[1]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1150 DoGet(_REMOTE, '/patients/%s' % a, data = { '_method' : 'DELETE' })
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1151 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1152 DoGet(_REMOTE, '/patients/%s' % b, data = { '_method' : 'DELETE' })
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1153 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1154
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1155
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1156 def test_faking_google_put(self):
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1157 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1158 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1159 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1160 a = DoGet(_REMOTE, '/patients')[0]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1161 b = DoGet(_REMOTE, '/patients')[1]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1162 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1163 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '0')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1164 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1165 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '1')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1166 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1167 DoPost(_REMOTE, '/patients/%s/protected' % a, headers = { 'X-HTTP-Method-Override' : 'PUT' }, data = '0')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1168 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1169
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1170
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1171 def test_faking_google_delete(self):
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1172 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1173 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1174 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1175 a = DoGet(_REMOTE, '/patients')[0]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1176 b = DoGet(_REMOTE, '/patients')[1]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1177 DoPost(_REMOTE, '/patients/%s' % a, headers = { 'X-HTTP-Method-Override' : 'DELETE' })
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1178 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1179 DoPost(_REMOTE, '/patients/%s' % b, headers = { 'X-HTTP-Method-Override' : 'DELETE' })
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1180 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1181
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1182
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1183 def test_lua(self):
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1184 self.assertEqual(42, DoPost(_REMOTE, '/tools/execute-script', 'print(42)'))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1185 self.assertTrue(IsDefinedInLua(_REMOTE, 'PrintRecursive'))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1186 self.assertFalse(IsDefinedInLua(_REMOTE, 'HelloWorld'))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1187
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1188
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1189 def test_metadata(self):
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1190 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1191 p = DoGet(_REMOTE, '/patients')[0]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1192 i = DoGet(_REMOTE, '/instances')[0]
369 24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1193 series = DoGet(_REMOTE, '/series')[0]
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1194
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1195 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1196 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1197 self.assertEqual(2, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1198 self.assertTrue('MainDicomTagsSignature' in m)
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1199 else:
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1200 self.assertEqual(1, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1201 self.assertTrue('LastUpdate' in m)
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1202
369 24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1203 # The lines below failed on Orthanc <= 1.8.2
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1204 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/studies/%s/metadata' % p))
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1205 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/series/%s/metadata' % p))
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1206 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/metadata' % p))
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1207
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1208 m = DoGet(_REMOTE, '/studies/%s/metadata' % DoGet(_REMOTE, '/studies')[0])
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1209 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1210 self.assertEqual(2, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1211 self.assertTrue('MainDicomTagsSignature' in m)
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1212 else:
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1213 self.assertEqual(1, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1214 self.assertTrue('LastUpdate' in m)
369 24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1215
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1216 m = DoGet(_REMOTE, '/series/%s/metadata' % series)
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1217 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1218 self.assertEqual(3, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1219 self.assertTrue('MainDicomTagsSignature' in m)
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1220 else:
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1221 self.assertEqual(2, len(m))
369 24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1222 self.assertTrue('LastUpdate' in m)
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1223
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1224 # New in Orthanc 1.9.0
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1225 self.assertTrue('RemoteAET' in m)
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1226 self.assertEqual(DoGet(_REMOTE, '/series/%s/metadata/RemoteAET' % series), '') # None, received by REST API
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1227
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1228 m = DoGet(_REMOTE, '/instances/%s/metadata' % i)
554 ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	1229 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1230 self.assertEqual(10, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1231 elif IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	1232 self.assertEqual(9, len(m))
547 7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1233 else:
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1234 self.assertEqual(8, len(m))
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1235
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1236 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1237 self.assertTrue('MainDicomTagsSignature' in m)
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1238
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1239 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	1240 self.assertTrue('PixelDataOffset' in m) # New in Orthanc 1.9.1
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	1241 self.assertEqual(int(DoGet(_REMOTE, '/instances/%s/metadata/PixelDataOffset' % i)), 0x0c78)
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	1242
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1243 self.assertTrue('IndexInSeries' in m)
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1244 self.assertTrue('ReceptionDate' in m)
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1245 self.assertTrue('RemoteAET' in m)
63 2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1246 self.assertTrue('Origin' in m)
89 74b7b9aed5f8 test TransferSyntax metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	1247 self.assertTrue('TransferSyntax' in m)
95 a807a4699eb4 testing of metadata SopClassUid Sebastien Jodogne <s.jodogne@gmail.com> parents: 92 diff changeset	1248 self.assertTrue('SopClassUid' in m)
145 69fecf5a3ff6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 144 diff changeset	1249 self.assertTrue('RemoteIP' in m)
69fecf5a3ff6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 144 diff changeset	1250 self.assertTrue('HttpUsername' in m)
63 2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1251 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/IndexInSeries' % i), 1)
2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1252 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i), 'RestApi')
2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1253 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i), '') # None, received by REST API
89 74b7b9aed5f8 test TransferSyntax metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	1254 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i), '1.2.840.10008.1.2.4.91') # JPEG2k
95 a807a4699eb4 testing of metadata SopClassUid Sebastien Jodogne <s.jodogne@gmail.com> parents: 92 diff changeset	1255 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i), '1.2.840.10008.5.1.4.1.1.4')
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1256
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1257 # Play with custom metadata
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	1258 (headers, body) = DoPutRaw(_REMOTE, '/patients/%s/metadata/5555' % p, 'coucou')
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	1259 self.assertEqual('200', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	1260 self.assertEqual('', body)
394 e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1261
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1262 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	1263 self.assertEqual('"0-%s"' % ComputeMD5('coucou'), headers['etag'])
394 e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1264 else:
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1265 self.assertFalse('ETag' in headers)
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1266 self.assertFalse('etag' in headers)
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1267
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1268 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1269 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1270 self.assertEqual(3, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1271 self.assertTrue('MainDicomTagsSignature' in m)
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1272 else:
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1273 self.assertEqual(2, len(m))
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1274 self.assertTrue('LastUpdate' in m)
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1275 self.assertTrue('5555' in m)
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1276 self.assertEqual('coucou', DoGet(_REMOTE, '/patients/%s/metadata/5555' % p))
394 e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1277
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1278 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1279 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'hello', headers = {
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1280 'If-Match' : headers['etag']
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1281 })
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1282 else:
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1283 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'hello')
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	1284
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	1285 (headers, body) = DoGetRaw(_REMOTE, '/patients/%s/metadata/5555' % p)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	1286 self.assertEqual('200', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	1287 self.assertEqual('hello', body)
394 e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1288
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1289 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1290 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p, headers = {
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1291 'If-Match' : headers['etag']
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1292 })
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1293 else:
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1294 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p)
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1295
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1296 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1297 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1298 self.assertEqual(2, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1299 self.assertTrue('MainDicomTagsSignature' in m)
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1300 else:
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1301 self.assertEqual(1, len(m))
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1302 self.assertTrue('LastUpdate' in m)
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1303
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1304
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1305 def test_statistics(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1306 # Upload 16 instances
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1307 for i in range(4):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1308 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1309 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1310 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1311 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1312
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1313 s = DoGet(_REMOTE, '/statistics')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1314 self.assertEqual(16, s['CountInstances'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1315 self.assertEqual(2, s['CountPatients'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1316 self.assertEqual(2, s['CountStudies'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1317 self.assertEqual(4, s['CountSeries'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1318 d = int(s['TotalUncompressedSize'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1319
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1320 e = 0
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1321 for patient in DoGet(_REMOTE, '/patients'):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1322 s = DoGet(_REMOTE, '/patients/%s/statistics' % patient)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1323 self.assertEqual(8, s['CountInstances'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1324 self.assertEqual(1, s['CountStudies'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1325 self.assertEqual(2, s['CountSeries'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1326 e += int(s['UncompressedSize'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1327
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1328 for study in DoGet(_REMOTE, '/studies'):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1329 s = DoGet(_REMOTE, '/studies/%s/statistics' % study)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1330 self.assertEqual(8, s['CountInstances'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1331 self.assertEqual(2, s['CountSeries'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1332 e += int(s['UncompressedSize'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1333
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1334 for series in DoGet(_REMOTE, '/series'):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1335 s = DoGet(_REMOTE, '/series/%s/statistics' % series)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1336 self.assertEqual(4, s['CountInstances'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1337 e += int(s['UncompressedSize'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1338
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1339 self.assertEqual(3 * d, e)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1340
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1341
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1342 def test_custom_attachment(self):
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1343 u = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID']
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1344
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1345 patient = DoGet(_REMOTE, '/patients')[0]
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1346 instance = DoGet(_REMOTE, '/instances')[0]
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1347 size = int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1348 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1349
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1350 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient)))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1351 self.assertTrue('dicom' in DoGet(_REMOTE, '/instances/%s/attachments' % instance))
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1352
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1353 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1354 if IsDicomUntilPixelDataStored(_REMOTE):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1355 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1356 self.assertTrue('dicom-until-pixel-data' in DoGet(_REMOTE, '/instances/%s/attachments' % instance))
443 97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1357
448 63f475995400 Orthanc 1.9.8 is now known as Orthanc 1.10.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 447 diff changeset	1358 # New in Orthanc 1.10.0
443 97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1359 a = DoGet(_REMOTE, '/instances/%s/attachments?full' % instance)
97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1360 self.assertEqual(2, len(a))
97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1361 self.assertEqual(1, a['dicom'])
97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1362 self.assertEqual(3, a['dicom-until-pixel-data'])
97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1363
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1364 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1365 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance)))
443 97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1366
448 63f475995400 Orthanc 1.9.8 is now known as Orthanc 1.10.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 447 diff changeset	1367 # New in Orthanc 1.10.0
443 97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1368 a = DoGet(_REMOTE, '/instances/%s/attachments?full' % instance)
97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1369 self.assertEqual(1, len(a))
97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1370 self.assertEqual(1, a['dicom'])
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1371 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1372 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1373 self.assertTrue('dicom-as-json' in DoGet(_REMOTE, '/instances/%s/attachments' % instance))
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1374
448 63f475995400 Orthanc 1.9.8 is now known as Orthanc 1.10.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 447 diff changeset	1375 # New in Orthanc 1.10.0
443 97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1376 self.assertRaises(Exception, lambda: DoGet(
97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1377 _REMOTE, '/instances/%s/attachments?full' % instance))
97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1378
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1379 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/patients/%s/attachments/22' % patient, 'hello'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1380 hello = 'hellohellohellohellohellohellohellohellohello'
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1381 DoPut(_REMOTE, '/patients/%s/attachments/1025' % patient, hello)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1382 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1383 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1384 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1385 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient)))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1386
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1387 DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1388 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1389 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1390 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1391 size +
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1392 int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient)) +
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1393 int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient)))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1394
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1395 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient)))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1396 self.assertEqual(hello, DoGet(_REMOTE, '/patients/%s/attachments/1025/data' % patient))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1397 self.assertEqual('world', DoGet(_REMOTE, '/patients/%s/attachments/1026/data' % patient))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1398 DoPost(_REMOTE, '/patients/%s/attachments/1025/verify-md5' % patient)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1399 DoPost(_REMOTE, '/patients/%s/attachments/1026/verify-md5' % patient)
392 5cbcb4a83b41 fix for revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 391 diff changeset	1400 DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world2', headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	1401 'If-Match' : '0-%s' % ComputeMD5('world'),
392 5cbcb4a83b41 fix for revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 391 diff changeset	1402 })
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	1403
394 e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1404 (headers, body) = DoGetRaw(_REMOTE, '/patients/%s/attachments/1026/data' % patient)
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1405 self.assertEqual('200', headers['status'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	1406 self.assertEqual('world2', body)
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1407
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1408 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/instances/%s/attachments/dicom' % instance))
392 5cbcb4a83b41 fix for revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 391 diff changeset	1409 DoDelete(_REMOTE, '/patients/%s/attachments/1025' % patient, headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	1410 'If-Match' : '0-%s' % ComputeMD5(hello),
392 5cbcb4a83b41 fix for revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 391 diff changeset	1411 })
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1412 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1413 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1414 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1415 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient)))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1416
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1417 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient)))
394 e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1418
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1419 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1420 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient, headers = {
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1421 'If-Match' : headers['etag']
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1422 })
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1423 else:
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1424 self.assertFalse('etag' in headers)
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1425 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient)
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1426
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1427 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient)))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1428
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1429 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), size)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1430 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1431
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1432
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1433 def test_incoming_storescu(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1434 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
45 a8cc12e9b268 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 44 diff changeset	1435 subprocess.check_call([ FindExecutable('storescu'),
44 ffa542cce638 Toolbox.FindExecutable() Sebastien Jodogne <s.jodogne@gmail.com> parents: 43 diff changeset	1436 _REMOTE['Server'], str(_REMOTE['DicomPort']),
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1437 GetDatabasePath('ColorTestImageJ.dcm') ])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1438 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1439
63 2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1440 i = DoGet(_REMOTE, '/instances')
2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1441 self.assertEqual(1, len(i))
2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1442 m = DoGet(_REMOTE, '/instances/%s/metadata' % i[0])
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	1443
554 ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	1444 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1445 self.assertEqual(10, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1446 elif IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	1447 self.assertEqual(9, len(m))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	1448 else:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	1449 self.assertEqual(8, len(m))
547 7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1450
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1451 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1452 self.assertTrue('MainDicomTagsSignature' in m) # New in Orthanc 1.11.0
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1453
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1454 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1455 self.assertTrue('PixelDataOffset' in m) # New in Orthanc 1.9.1
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1456 self.assertEqual(2242, DoGet(_REMOTE, '/instances/%s/metadata/PixelDataOffset' % i[0]))
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1457
63 2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1458 self.assertTrue('IndexInSeries' in m)
2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1459 self.assertTrue('ReceptionDate' in m)
2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1460 self.assertTrue('RemoteAET' in m)
2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1461 self.assertTrue('Origin' in m)
89 74b7b9aed5f8 test TransferSyntax metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	1462 self.assertTrue('TransferSyntax' in m)
95 a807a4699eb4 testing of metadata SopClassUid Sebastien Jodogne <s.jodogne@gmail.com> parents: 92 diff changeset	1463 self.assertTrue('SopClassUid' in m)
145 69fecf5a3ff6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 144 diff changeset	1464 self.assertTrue('RemoteIP' in m)
69fecf5a3ff6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 144 diff changeset	1465 self.assertTrue('CalledAET' in m)
63 2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1466 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/IndexInSeries' % i[0]), 1)
2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1467 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i[0]), 'DicomProtocol')
2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1468 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i[0]), 'STORESCU')
89 74b7b9aed5f8 test TransferSyntax metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	1469 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i[0]), '1.2.840.10008.1.2.1')
95 a807a4699eb4 testing of metadata SopClassUid Sebastien Jodogne <s.jodogne@gmail.com> parents: 92 diff changeset	1470 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i[0]), '1.2.840.10008.5.1.4.1.1.7')
63 2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1471
369 24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1472 series = DoGet(_REMOTE, '/series')[0]
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1473 m = DoGet(_REMOTE, '/series/%s/metadata' % series)
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1474 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1475 self.assertEqual(3, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1476 self.assertTrue('MainDicomTagsSignature' in m)
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1477 else:
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1478 self.assertEqual(2, len(m))
369 24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1479 self.assertTrue('LastUpdate' in m)
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1480 self.assertTrue('RemoteAET' in m)
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1481 self.assertEqual(DoGet(_REMOTE, '/series/%s/metadata/RemoteAET' % series), 'STORESCU')
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1482 self.assertEqual(DoGet(_REMOTE, '/series/%s/metadata/LastUpdate' % series),
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1483 DoGet(_REMOTE, '/instances/%s/metadata/ReceptionDate' % i[0]))
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1484
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1485
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1486 def test_incoming_findscu(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1487 UploadInstance(_REMOTE, 'Multiframe.dcm')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1488 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1489
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1490 i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', '0010,0010' ])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1491 patientNames = re.findall('$0010,0010$.?\[(.?)\]', i)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1492 self.assertEqual(2, len(patientNames))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1493 self.assertTrue('Test Patient BG ' in patientNames)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1494 self.assertTrue('Anonymized' in patientNames)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1495
668 f92a2036fb96 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	1496 i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', '0010,0010=*' ])
f92a2036fb96 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	1497 patientNames = re.findall('$0010,0010$.?\[(.?)\]', i)
f92a2036fb96 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	1498 self.assertEqual(2, len(patientNames))
f92a2036fb96 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	1499 self.assertTrue('Test Patient BG ' in patientNames)
f92a2036fb96 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	1500 self.assertTrue('Anonymized' in patientNames)
f92a2036fb96 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 667 diff changeset	1501
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1502 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0008,0021' ])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1503 series = re.findall('$0008,0021$.?\[\s(.?)\s\]', i)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1504 self.assertEqual(2, len(series))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1505 self.assertTrue('20070208' in series)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1506 self.assertTrue('19980312' in series)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1507
335 96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	1508 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0008,0021', '-k', 'Modality=MR\\XA' ])
56 1059b8de42de ModalitiesInStudy subtest Sebastien Jodogne <s.jodogne@gmail.com> parents: 55 diff changeset	1509 series = re.findall('$0008,0021$.?\[\s(.?)\s\]', i)
1059b8de42de ModalitiesInStudy subtest Sebastien Jodogne <s.jodogne@gmail.com> parents: 55 diff changeset	1510 self.assertEqual(1, len(series))
1059b8de42de ModalitiesInStudy subtest Sebastien Jodogne <s.jodogne@gmail.com> parents: 55 diff changeset	1511 self.assertTrue('19980312' in series)
1059b8de42de ModalitiesInStudy subtest Sebastien Jodogne <s.jodogne@gmail.com> parents: 55 diff changeset	1512
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1513 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=Anonymized' ])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1514 series = re.findall('$0010,0010$.?\[\s(.?)\s\]', i)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1515 self.assertEqual(1, len(series))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1516
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1517 # Test the "CaseSentitivePN" flag (false by default)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1518 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=anonymized' ])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1519 series = re.findall('$0010,0010$.?\[\s(.?)\s\]', i)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1520 self.assertEqual(1, len(series))
66 821d9eb73c45 Test returning sequence values Sebastien Jodogne <s.jodogne@gmail.com> parents: 64 diff changeset	1521
70 9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1522 # Test range search (buggy if Orthanc <= 0.9.6)
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1523 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-' ])
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1524 studies = re.findall('$0008,0020$.?\[\s(.?)\s\]', i)
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1525 self.assertEqual(2, len(studies))
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1526 self.assertTrue('20070208' in studies)
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1527 self.assertTrue('19980312' in studies)
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1528 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-19980312' ])
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1529 studies = re.findall('$0008,0020$.?\[\s(.?)\s\]', i)
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1530 self.assertEqual(1, len(studies))
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1531 self.assertTrue('19980312' in studies)
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1532 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=-19980312' ])
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1533 studies = re.findall('$0008,0020$.?\[\s(.?)\s\]', i)
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1534 self.assertEqual(1, len(studies))
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1535 self.assertTrue('19980312' in studies)
326 05f48c19c60d Test "Retrieve AE Title" is returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	1536
05f48c19c60d Test "Retrieve AE Title" is returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	1537 # Test that "Retrieve AE Title (0008,0054)" is present, which
05f48c19c60d Test "Retrieve AE Title" is returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	1538 # was not the case in Orthanc <= 1.7.2
05f48c19c60d Test "Retrieve AE Title" is returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	1539 i = CallFindScu([ '-k', '0008,0052=INSTANCE' ])
05f48c19c60d Test "Retrieve AE Title" is returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	1540 instances = re.findall('$0008,0054$.?\[\s(.?)\s\]', i)
05f48c19c60d Test "Retrieve AE Title" is returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	1541 self.assertEqual(2, len(instances))
05f48c19c60d Test "Retrieve AE Title" is returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	1542 self.assertEqual('ORTHANC', instances[0].strip())
05f48c19c60d Test "Retrieve AE Title" is returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	1543 self.assertEqual('ORTHANC', instances[1].strip())
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1544
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1545
191 bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1546 def test_incoming_findscu_2(self):
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1547 # This test fails if "LookupMode_DatabaseOnly" is used
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1548 # (sequences are not available in this mode, and only main
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1549 # DICOM tags are returned)
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1550 UploadInstance(_REMOTE, 'Multiframe.dcm')
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1551 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1552
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1553 # Test returning sequence values (only since Orthanc 0.9.5)
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1554 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0008,2112' ]) # "ColorTestImageJ" has this sequence tag
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1555 sequences = re.findall('$0008,2112$', i)
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1556 self.assertEqual(1, len(sequences))
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1557
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1558 # Test returning a non-main DICOM tag,
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1559 # "SecondaryCaptureDeviceID" (0018,1010), whose value is
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1560 # "MEDPC" in "ColorTestImageJ.dcm"
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1561 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0018,1010' ])
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1562 tags = re.findall('$0018,1010$.*MEDPC', i)
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1563 self.assertEqual(1, len(tags))
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1564
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1565
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1566 def test_incoming_findscu_3(self):
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1567 # This test fails if "LookupMode_DatabaseOnly" or
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1568 # "LookupMode_DiskOnAnswer" is used, as
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1569 # "SecondaryCaptureDeviceID" (0018,1010) is not a main DICOM
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1570 # tag, as thus a constraint cannot be applied to it
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1571 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1572
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1573 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0018,1010=MEDPC' ])
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1574 sequences = re.findall('$0018,1010$', i)
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1575 self.assertEqual(1, len(sequences))
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1576
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1577
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1578 def test_incoming_movescu(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1579 UploadInstance(_REMOTE, 'Multiframe.dcm')
137 412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1580
412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1581 # No matching patient, so no job is created
412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1582 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1583 CallMoveScu([ '--patient', '-k', '0008,0052=PATIENT', '-k', 'PatientID=none' ])
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1584 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
137 412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1585
412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1586 # 1 Matching patient, track the job
138 0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	1587 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	1588 '--patient',
0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	1589 '-k', '0008,0052=PATIENT',
0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	1590 '-k', 'PatientID=12345678'
0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	1591 ])))
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1592 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1593
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1594
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1595 def test_findscu(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1596 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1597 j = UploadInstance(_REMOTE, 'Issue22.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1598 k = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1599 DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1600
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1601 # Test the "find-patient" level
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1602 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1603 self.assertEqual(1, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1604 self.assertEqual('ozp00SjY2xG', p[0]['PatientID'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1605
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1606 # Test wildcards constraints. The "LO" value representation
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1607 # for PatientID is always case-sensitive, but the "PN" for
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1608 # PatientName might depend on the implementation:
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1609 # "GenerateConfigurationForTests.py" will force it to be case
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1610 # insensitive (which was the default until Orthanc 0.8.6).
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1611 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'K*' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1612 self.assertEqual(1, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1613
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1614 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'k*' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1615 self.assertEqual(1, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1616
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1617 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'ozp*' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1618 self.assertEqual(1, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1619
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1620 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'o?p*' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1621 self.assertEqual(1, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1622
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1623 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : '0?q*' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1624 self.assertEqual(0, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1625
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1626 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'B*' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1627 self.assertEqual(0, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1628
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1629 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'b*' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1630 self.assertEqual(0, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1631
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1632 DoPost(_REMOTE, '/modalities/orthanctest/store', str(j), 'text/plain')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1633 DoPost(_REMOTE, '/modalities/orthanctest/store', str(k), 'text/plain')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1634 DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1635 self.assertEqual(3, len(DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { })))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1636
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1637 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'A*' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1638 self.assertEqual(2, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1639
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1640 # Test the "find-study" level. This is the instance "ColorTestImageJ.dcm"
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1641 s = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1642 self.assertEqual(1, len(s))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1643 self.assertEqual('20070208', s[0]['StudyDate'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1644
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1645 # Test range searches
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1646 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1647 'StudyDate' : '-20070101' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1648 self.assertEqual(0, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1649
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1650 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1651 'StudyDate' : '20090101-' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1652 self.assertEqual(0, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1653
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1654 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1655 'StudyDate' : '20070101-' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1656 self.assertEqual(1, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1657
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1658 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1659 'StudyDate' : '-20090101' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1660 self.assertEqual(1, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1661
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1662 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1663 'StudyDate' : '20070207-20070207' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1664 self.assertEqual(0, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1665
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1666 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1667 'StudyDate' : '20070208-20070208' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1668 self.assertEqual(1, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1669
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1670 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1671 'StudyDate' : '20070209-20070209' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1672 self.assertEqual(0, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1673
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1674 # Test the ModalitiesInStudy tag
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1675 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', {
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1676 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1677 'ModalitiesInStudy' : 'US' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1678 self.assertEqual(0, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1679
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1680 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', {
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1681 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1682 'ModalitiesInStudy' : 'CT' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1683 self.assertEqual(1, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1684
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1685 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', {
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1686 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1687 'ModalitiesInStudy' : 'US\\CT' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1688 self.assertEqual(1, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1689
466 28a2c9452ec9 extra test with empty filter ModalitiesInStudy Alain Mazy <am@osimis.io> parents: 462 diff changeset	1690 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', {
28a2c9452ec9 extra test with empty filter ModalitiesInStudy Alain Mazy <am@osimis.io> parents: 462 diff changeset	1691 'PatientID' : 'B9uTHKOZ',
28a2c9452ec9 extra test with empty filter ModalitiesInStudy Alain Mazy <am@osimis.io> parents: 462 diff changeset	1692 'ModalitiesInStudy' : '' })
28a2c9452ec9 extra test with empty filter ModalitiesInStudy Alain Mazy <am@osimis.io> parents: 462 diff changeset	1693 self.assertEqual(1, len(t))
28a2c9452ec9 extra test with empty filter ModalitiesInStudy Alain Mazy <am@osimis.io> parents: 462 diff changeset	1694
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1695 # Test the "find-series" level
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1696 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', {
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1697 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1698 'StudyInstanceUID' : s[0]['StudyInstanceUID'] })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1699 self.assertEqual(1, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1700
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1701 # Test "\" separator
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1702 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', {
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1703 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1704 'StudyInstanceUID' : s[0]['StudyInstanceUID'],
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1705 'Modality' : 'MR\\CT\\US' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1706 self.assertEqual(1, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1707
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1708 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', {
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1709 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1710 'StudyInstanceUID' : s[0]['StudyInstanceUID'],
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1711 'Modality' : 'MR\\US' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1712 self.assertEqual(0, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1713
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1714
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1715 def test_update_modalities(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1716 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/toto'))
348 bed0ab3a1391 test deleting inexistent modality/peer Sebastien Jodogne <s.jodogne@gmail.com> parents: 342 diff changeset	1717 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/modalities/toto'))
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1718 DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000 ])
116 4a196ebc7a4f updated tests for issue #31 amazy parents: 112 diff changeset	1719 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'MedInria' ]) # check backward compatiblity with obsolete manufacturer
4a196ebc7a4f updated tests for issue #31 amazy parents: 112 diff changeset	1720 DoDelete(_REMOTE, '/modalities/tata')
124 b110dc52ab38 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 123 diff changeset	1721 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoUniversalWildcard' ])
121 1a19f953f53c also test GenericNoWildcardInDates Sebastien Jodogne <s.jodogne@gmail.com> parents: 120 diff changeset	1722 DoDelete(_REMOTE, '/modalities/tata')
1a19f953f53c also test GenericNoWildcardInDates Sebastien Jodogne <s.jodogne@gmail.com> parents: 120 diff changeset	1723 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoWildcardInDates' ])
128 a9fdfcb696e6 added tests for ?expand in /peers and /modalities amazy parents: 127 diff changeset	1724 modalitiesReadback = DoGet(_REMOTE, '/modalities?expand')
182 7a6b532853ab modalities are now described as JSON objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	1725 self.assertEqual('STORESCP', modalitiesReadback['tata']['AET'])
7a6b532853ab modalities are now described as JSON objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	1726 self.assertEqual('localhost', modalitiesReadback['tata']['Host'])
7a6b532853ab modalities are now described as JSON objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	1727 self.assertEqual(2000, modalitiesReadback['tata']['Port'])
7a6b532853ab modalities are now described as JSON objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	1728 self.assertEqual('GenericNoWildcardInDates', modalitiesReadback['tata']['Manufacturer'])
116 4a196ebc7a4f updated tests for issue #31 amazy parents: 112 diff changeset	1729 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000, 'InvalidManufacturerName' ]))
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1730 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/toto'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1731 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/tata'))
351 429cc9d03610 test access to the configuration of one single peer or modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1732
429cc9d03610 test access to the configuration of one single peer or modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1733 # New in Orthanc 1.8.1
429cc9d03610 test access to the configuration of one single peer or modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1734 self.assertTrue('configuration' in DoGet(_REMOTE, '/modalities/tata'))
429cc9d03610 test access to the configuration of one single peer or modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1735 self.assertEqual(modalitiesReadback['tata'], DoGet(_REMOTE, '/modalities/tata/configuration'))
429cc9d03610 test access to the configuration of one single peer or modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1736
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1737 DoDelete(_REMOTE, '/modalities/toto')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1738 DoDelete(_REMOTE, '/modalities/tata')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1739 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/toto'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1740 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/tata'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1741
584 c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	1742 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2):
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	1743 self.assertEqual(DoGet(_REMOTE, '/modalities?expand'), DoGet(_REMOTE, '/modalities?expand=true'))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	1744 self.assertEqual(DoGet(_REMOTE, '/modalities'), DoGet(_REMOTE, '/modalities?expand=false'))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	1745
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	1746
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1747
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1748 def test_update_peers(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1749 # curl -X PUT http://localhost:8042/peers/toto -d '["http://localhost:8042/"]' -v
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1750 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto'))
348 bed0ab3a1391 test deleting inexistent modality/peer Sebastien Jodogne <s.jodogne@gmail.com> parents: 342 diff changeset	1751 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/peers/toto'))
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1752 DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/' ])
214 13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1753 DoPut(_REMOTE, '/peers/tata', { 'Url': 'http://localhost:8042/',
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1754 'Username': 'user',
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1755 'Password' : 'pass',
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1756 'RemoteSelf' : 'self' })
128 a9fdfcb696e6 added tests for ?expand in /peers and /modalities amazy parents: 127 diff changeset	1757 self.assertTrue('tata' in DoGet(_REMOTE, '/peers'))
a9fdfcb696e6 added tests for ?expand in /peers and /modalities amazy parents: 127 diff changeset	1758 peersReadback = DoGet(_REMOTE, '/peers?expand')
a9fdfcb696e6 added tests for ?expand in /peers and /modalities amazy parents: 127 diff changeset	1759 self.assertEqual('http://localhost:8042/', peersReadback['tata']['Url'])
a9fdfcb696e6 added tests for ?expand in /peers and /modalities amazy parents: 127 diff changeset	1760 self.assertEqual('user', peersReadback['tata']['Username'])
214 13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1761
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1762 if IsOrthancVersionAbove(_REMOTE, 1, 5, 4):
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1763 self.assertEqual(None, peersReadback['tata']['Password']) # make sure no sensitive data is included
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1764 self.assertFalse(peersReadback['tata']['Pkcs11']) # make sure no sensitive data is included
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1765 self.assertEqual('self', peersReadback['tata']['RemoteSelf'])
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1766 else:
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1767 self.assertFalse('Password' in peersReadback['tata']) # make sure no sensitive data is included
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1768 self.assertFalse('Pkcs11' in peersReadback['tata']) # make sure no sensitive data is included
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1769 self.assertFalse('RemoteSelf' in peersReadback['tata'])
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1770
128 a9fdfcb696e6 added tests for ?expand in /peers and /modalities amazy parents: 127 diff changeset	1771 self.assertFalse('CertificateFile' in peersReadback['tata']) # make sure no sensitive data is included
a9fdfcb696e6 added tests for ?expand in /peers and /modalities amazy parents: 127 diff changeset	1772 self.assertFalse('CertificateKeyFile' in peersReadback['tata']) # make sure no sensitive data is included
a9fdfcb696e6 added tests for ?expand in /peers and /modalities amazy parents: 127 diff changeset	1773 self.assertFalse('CertificateKeyPassword' in peersReadback['tata']) # make sure no sensitive data is included
214 13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1774
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1775 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a' ]))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1776 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a', 'b', 'c' ]))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1777 self.assertTrue('store' in DoGet(_REMOTE, '/peers/toto'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1778 self.assertTrue('store' in DoGet(_REMOTE, '/peers/tata'))
351 429cc9d03610 test access to the configuration of one single peer or modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1779
429cc9d03610 test access to the configuration of one single peer or modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1780 # New in Orthanc 1.8.1
429cc9d03610 test access to the configuration of one single peer or modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1781 self.assertTrue('configuration' in DoGet(_REMOTE, '/peers/tata'))
429cc9d03610 test access to the configuration of one single peer or modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1782 self.assertEqual(peersReadback['tata'], DoGet(_REMOTE, '/peers/tata/configuration'))
429cc9d03610 test access to the configuration of one single peer or modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1783
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1784 DoDelete(_REMOTE, '/peers/toto')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1785 DoDelete(_REMOTE, '/peers/tata')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1786 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1787 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/tata'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1788
584 c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	1789 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2):
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	1790 self.assertEqual(DoGet(_REMOTE, '/peers?expand'), DoGet(_REMOTE, '/peers?expand=true'))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	1791 self.assertEqual(DoGet(_REMOTE, '/peers'), DoGet(_REMOTE, '/peers?expand=false'))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	1792
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	1793
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1794
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1795 def test_mesterhazy_modification(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1796 # When I modify a series ( eg. curl
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1797 # http://localhost:8042/series/uidhere/modify -X POST -d
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1798 # '{"Replace":{"SeriesDate":"19990101"}}' ) the modified
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1799 # series is added to a new Study, instead of the existing
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1800 # Study. Fixed in Orthanc 0.7.5
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1801
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1802 u = UploadInstance(_REMOTE, 'DummyCT.dcm')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1803 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0'
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1804 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe'
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1805
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1806 modified = DoPost(_REMOTE, '/series/%s/modify' % series,
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1807 json.dumps({ "Replace" : { "SeriesDate" : "19990101" }}))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1808
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1809 self.assertEqual(study, DoGet(_REMOTE, '/series/%s' % modified['ID']) ['ParentStudy'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1810
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1811
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1812 def test_create(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1813 i = DoPost(_REMOTE, '/tools/create-dicom',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1814 json.dumps({
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1815 'PatientName' : 'Jodogne',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1816 'Modality' : 'CT',
58 b5518378e23b fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	1817 'SOPClassUID' : '1.2.840.10008.5.1.4.1.1.1',
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1818 'PixelData' : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==' # red dot in RGBA
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1819 }))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1820
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1821 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip())
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1822 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip())
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1823
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1824 png = GetImage(_REMOTE, '/instances/%s/preview' % i['ID'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1825 self.assertEqual((5, 5), png.size)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1826
38 d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	1827 j = DoGet(_REMOTE, i['Path'])
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	1828 self.assertEqual('Instance', j['Type'])
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	1829 self.assertEqual(j['ID'], i['ID'])
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	1830
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1831
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1832 def test_pilates(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1833 # "SCU failed error when accessing orthanc with osirix" by
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1834 # Pilates Agentur (Mar 10, 2014 at 9:33 PM)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1835 i = UploadInstance(_REMOTE, 'PilatesArgenturGEUltrasoundOsiriX.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1836 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1837 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1838 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1839
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1840
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1841 def test_shared_tags(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1842 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1843 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1844 p = DoGet(_REMOTE, '/patients')[0]
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1845
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1846 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1847 self.assertTrue('PatientName' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p))
136 5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	1848 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/shared-tags?short' % p))
5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	1849
5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	1850 self.assertEqual('KNEE', DoGet(_REMOTE, '/patients/%s/shared-tags' % p)['0010,0010']['Value'])
5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	1851 self.assertEqual('KNEE', DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)['PatientName'])
5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	1852 self.assertEqual('KNEE', DoGet(_REMOTE, '/patients/%s/shared-tags?short' % p)['0010,0010'])
5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	1853
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1854 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1855 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1856 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1857 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1858 self.assertFalse('0008,0018' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1859 self.assertFalse('SOPInstanceUID' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1860
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1861 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/tags' % a))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1862 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/tags?simplify' % a))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1863
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1864
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1865 def test_modules(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1866 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1867 p = DoGet(_REMOTE, '/patients')[0]
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1868 s = DoGet(_REMOTE, '/studies')[0]
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1869 t = DoGet(_REMOTE, '/series')[0]
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1870
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1871 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/module' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1872 self.assertTrue('PatientName' in DoGet(_REMOTE, '/patients/%s/module?simplify' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1873 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/studies/%s/module-patient' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1874 self.assertTrue('PatientName' in DoGet(_REMOTE, '/studies/%s/module-patient?simplify' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1875 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/studies/%s/module' % s))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1876 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/studies/%s/module?simplify' % s))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1877 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/series/%s/module' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1878 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/series/%s/module?simplify' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1879 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/module' % a))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1880 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/module?simplify' % a))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1881
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1882
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1883 def test_auto_directory(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1884 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1885 self.assertTrue('now' in DoGet(_REMOTE, '/tools'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1886 self.assertTrue('dicom-conformance' in DoGet(_REMOTE, '/tools'))
87 4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	1887 self.assertTrue('invalidate-tags' in DoGet(_REMOTE, '/tools'))
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1888 self.assertTrue(len(DoGet(_REMOTE, '/tools/dicom-conformance')) > 1000)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1889 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1890 self.assertTrue('echo' in DoGet(_REMOTE, '/modalities/orthanctest'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1891 self.assertTrue('find' in DoGet(_REMOTE, '/modalities/orthanctest'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1892 self.assertTrue('find-instance' in DoGet(_REMOTE, '/modalities/orthanctest'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1893 self.assertTrue('find-patient' in DoGet(_REMOTE, '/modalities/orthanctest'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1894 self.assertTrue('find-series' in DoGet(_REMOTE, '/modalities/orthanctest'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1895 self.assertTrue('find-study' in DoGet(_REMOTE, '/modalities/orthanctest'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1896 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/orthanctest'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1897 self.assertTrue('store' in DoGet(_REMOTE, '/peers/peer'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1898 self.assertTrue('matlab' in DoGet(_REMOTE, '/instances/%s/frames/0' % a))
79 962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	1899 self.assertTrue('raw' in DoGet(_REMOTE, '/instances/%s/frames/0' % a))
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1900 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/tools/nope'))
28 156c7ae164b5 new test Sebastien Jodogne <s.jodogne@gmail.com> parents: 27 diff changeset	1901 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope'))
156c7ae164b5 new test Sebastien Jodogne <s.jodogne@gmail.com> parents: 27 diff changeset	1902 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope/nope.html'))
156c7ae164b5 new test Sebastien Jodogne <s.jodogne@gmail.com> parents: 27 diff changeset	1903 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope')[0].status)
156c7ae164b5 new test Sebastien Jodogne <s.jodogne@gmail.com> parents: 27 diff changeset	1904 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope/nope.html')[0].status)
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1905
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1906
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1907 def test_echo(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1908 DoPost(_REMOTE, '/modalities/orthanctest/echo')
359 8b476a383999 test empty body in /modalities/.../echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 357 diff changeset	1909 DoPost(_REMOTE, '/modalities/orthanctest/echo', '{}')
8b476a383999 test empty body in /modalities/.../echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 357 diff changeset	1910
8b476a383999 test empty body in /modalities/.../echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 357 diff changeset	1911 # The following was not working in Orthanc 1.7.0 -> 1.8.1
8b476a383999 test empty body in /modalities/.../echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 357 diff changeset	1912 DoPost(_REMOTE, '/modalities/orthanctest/echo', '')
352 3d406c0261fc test /tools/dicom-echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 351 diff changeset	1913 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/nope/echo'))
3d406c0261fc test /tools/dicom-echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 351 diff changeset	1914
3d406c0261fc test /tools/dicom-echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 351 diff changeset	1915 # New in Orthanc 1.8.1
3d406c0261fc test /tools/dicom-echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 351 diff changeset	1916 DoPost(_REMOTE, '/tools/dicom-echo', [
355 95ee4e79825b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 354 diff changeset	1917 _REMOTE['DicomAet'], _REMOTE['Server'], _REMOTE['DicomPort'] ])
352 3d406c0261fc test /tools/dicom-echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 351 diff changeset	1918 DoPost(_REMOTE, '/tools/dicom-echo', DoGet(_REMOTE, '/modalities/orthanctest/configuration'))
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1919
353 49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1920 # Use the 'CheckFind' new option in Orthanc 1.8.1
49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1921 DoPost(_REMOTE, '/modalities/self/echo', { 'CheckFind' : True })
49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1922 DoPost(_REMOTE, '/tools/dicom-echo', {
49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1923 'AET' : _REMOTE['DicomAet'],
49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1924 'Host' : _REMOTE['Server'],
49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1925 'Port' : _REMOTE['DicomPort'],
49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1926 'CheckFind' : True
49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1927 })
49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1928
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1929
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1930 def test_xml(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1931 json = DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/json' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1932 xml = minidom.parseString(DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/xml' }))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1933 items = xml.getElementsByTagName('root')[0].getElementsByTagName('item')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1934 self.assertEqual(len(items), len(json))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1935
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1936 self.assertTrue('dicom-conformance' in json)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1937
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1938 ok = False
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1939 for i in items:
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1940 if i.childNodes[0].data == 'dicom-conformance':
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1941 ok = True
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1942 self.assertTrue(ok)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1943
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1944
46 85b2e36ed392 explicit GoogleCode source Sebastien Jodogne <s.jodogne@gmail.com> parents: 45 diff changeset	1945 def test_googlecode_issue_16(self):
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1946 i = UploadInstance(_REMOTE, 'Issue16.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1947 t = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)['FrameIncrementPointer']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1948 self.assertEqual('0018,1063', t)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1949
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1950
46 85b2e36ed392 explicit GoogleCode source Sebastien Jodogne <s.jodogne@gmail.com> parents: 45 diff changeset	1951 def test_googlecode_issue_22(self):
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1952 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1953 a = [
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1954 "f804691f62197040438f4627c6b994f1", # Frame 0
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1955 "c69eee9a51eea3e8611e82e578897254",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1956 "315666be83e2d0111c77bc0996d84901",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1957 "3e27aa959d911172c48a1436443c72b1",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1958 "958642c9e7e9d232d3869faff546058c",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1959 "5e7ea8e3e4230cae707d143481355c59",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1960 "eda37f83558d858a596175aed8b2ad47",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1961 "486713bd2895c4ecbe0e97715ac7f80a",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1962 "091ef729eb169e67da8a0faa9631f9a8",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1963 "5aa2b8c7ffe0a483efaa8e12417686ca",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1964 "e2f39e85896fe58876654b94cd0b5013",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1965 "6fd2129e4950abbe1be053bc814d5da8",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1966 "c3331a8ba7a757f3d423735ab7fa81f9",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1967 "746f808582156734dd6b6fdfd3a0b72c",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1968 "8075ea2b227a70c60ea6b7b75a6bb190",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1969 "806b8b3e300c615099c11a5ec23465aa",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1970 "7c836aa298ba6eef96434579af631a11",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1971 "a0357dc9f4f72d73a885c33d7c287446",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1972 "f25ba3be1cc7d7fad95706adc199ea7d",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1973 "8b114c526b8cbed6cad8a3248b7b480c",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1974 "44e6670f127e612a2b4aa60a0d207698",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1975 "b8945f90fe02facf2ace24ca1ecbe0a5",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1976 "95c796c2fa8f59018b15cf2987b1f79b",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1977 "ce0a51ab30224205b44920221dc27351", # Frame 23
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1978 ]
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1979
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1980 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s)))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1981 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/preview' % s))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1982
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1983 for i in range(len(a)):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1984 self.assertEqual(a[i], ComputeMD5(DoGet(_REMOTE, '/instances/%s/frames/%d/preview' % (s, i))))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1985
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1986
46 85b2e36ed392 explicit GoogleCode source Sebastien Jodogne <s.jodogne@gmail.com> parents: 45 diff changeset	1987 def test_googlecode_issue_19(self):
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	1988 # This is an image with "YBR_FULL" photometric interpretation, it is not supported by Orthanc
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1989 # gdcmconv -i /home/jodogne/DICOM/GdcmDatabase/US_DataSet/HDI5000_US/3EAF5E01 -w -o Issue19.dcm
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1990
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1991 a = UploadInstance(_REMOTE, 'Issue19.dcm')['ID']
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	1992 if not HasGdcmPlugin(_REMOTE):
299 c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	1993 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/941ad3c8-05d05b88-560459f9-0eae0e20-6cddd533/preview'))
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1994
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1995
46 85b2e36ed392 explicit GoogleCode source Sebastien Jodogne <s.jodogne@gmail.com> parents: 45 diff changeset	1996 def test_googlecode_issue_37(self):
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1997 # Same test for issues 35 and 37. Fixed in Orthanc 0.9.1
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1998 u = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1999
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	2000 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	2001 'CaseSensitive' : True,
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	2002 'Query' : { 'StationName' : 'SMR4-MP3' }})
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	2003 self.assertEqual(1, len(a))
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2004
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2005
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2006 def test_rest_find(self):
548 3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2007 # Upload 12 instances
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2008 for i in range(3):
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2009 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2010 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2011 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2012 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2013
548 3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2014
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2015 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2016 'CaseSensitive' : True,
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2017 'Query' : {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2018 'PatientName' : 'NE',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2019 'StudyDate': '20080819'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2020 }})
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2021 self.assertEqual(1, len(a))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2022
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2023 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2024 'CaseSensitive' : True,
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2025 'Query' : {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2026 'PatientName' : 'NE',
555 739cad709a8c skipping DicomWeb test not implemented yet Alain Mazy <am@osimis.io> parents: 548 diff changeset	2027 'PatientBirthDate': '20080101-20081231',
548 3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2028 'PatientSex': '0000'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2029 }})
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2030 self.assertEqual(1, len(a))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2031
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2032 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2033 'CaseSensitive' : True,
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2034 'Query' : {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2035 'StudyInstanceUID' : '2.16.840.1.113669.632.20.121711.10000160881'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2036 }})
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2037 self.assertEqual(2, len(a))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2038
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2039 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2040 'CaseSensitive' : True,
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2041 'Query' : {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2042 'StudyInstanceUID' : '2.16.840.1.113669.632.20.121711.10000160881',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2043 'SeriesInstanceUID': '1.3.46.670589.11.17521.5.0.3124.2008081908564160709'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2044 }})
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2045 self.assertEqual(3, len(a))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2046
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2047 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2048 'CaseSensitive' : True,
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2049 'Query' : {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2050 'StudyDate' : '20080818-20080820',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2051 'Modality': 'MR'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2052 }})
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2053 self.assertEqual(2, len(a))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2054
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2055 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2056 'CaseSensitive' : True,
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2057 'Query' : {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2058 'StudyDate' : '20080818-',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2059 'ModalitiesInStudy': 'MR'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2060 }})
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2061 self.assertEqual(1, len(a))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2062
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2063
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2064 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2065 'CaseSensitive' : False,
194 9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2066 'Query' : { 'PatientName' : 'BRAINIX' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2067 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2068
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2069 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2070 'CaseSensitive' : False,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2071 'Query' : { 'PatientName' : 'BRAINIX\\KNEE\\NOPE' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2072 self.assertEqual(2, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2073
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2074 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2075 'CaseSensitive' : False,
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2076 'Query' : { 'PatientName' : 'n' }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2077 self.assertEqual(2, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2078
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2079 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2080 'CaseSensitive' : True,
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2081 'Query' : { 'PatientName' : 'n' }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2082 self.assertEqual(0, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2083
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2084 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True,
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2085 'Level' : 'Patient',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2086 'CaseSensitive' : False,
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2087 'Query' : { 'PatientName' : 'ne' }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2088 self.assertEqual(1, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2089 self.assertEqual('20080822', a[0]['MainDicomTags']['PatientBirthDate'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2090
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2091 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2092 'CaseSensitive' : True,
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2093 'Query' : { 'PatientName' : 'ne' }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2094 self.assertEqual(0, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2095
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2096 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2097 'CaseSensitive' : True,
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2098 'Query' : { 'PatientName' : 'NE' }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2099 self.assertEqual(1, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2100
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2101 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2102 'CaseSensitive' : True,
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2103 'Query' : { 'PatientName' : 'NE' }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2104 self.assertEqual(2, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2105
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2106 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2107 'CaseSensitive' : True,
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2108 'Query' : { 'PatientName' : 'NE' }})
548 3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2109 self.assertEqual(6, len(a))
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2110
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2111 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', 'Query' : { }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2112 self.assertEqual(2, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2113
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2114 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', 'Query' : { }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2115 self.assertEqual(2, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2116
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2117 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', 'Query' : { }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2118 self.assertEqual(4, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2119
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2120 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', 'Query' : { }})
548 3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2121 self.assertEqual(12, len(a))
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2122
194 9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2123 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2124 'Expand' : True,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2125 'Query' : { 'StudyDate' : '20061201-20061201' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2126 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2127 self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName'])
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2128
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2129 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2130 'Expand' : True,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2131 'Query' : { 'StudyDate' : '20061201-20091201' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2132 self.assertEqual(2, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2133 for i in range(2):
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2134 self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE'])
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2135
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2136 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2137 'Query' : { 'StudyDate' : '20061202-20061202' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2138 self.assertEqual(0, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2139
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2140 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2141 'Expand' : True,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2142 'Query' : { 'StudyDate' : '-20061201' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2143 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2144 self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName'])
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2145
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2146 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2147 'Expand' : True,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2148 'Query' : { 'StudyDate' : '-20051201' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2149 self.assertEqual(0, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2150
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2151 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2152 'Expand' : True,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2153 'Query' : { 'StudyDate' : '20061201-' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2154 self.assertEqual(2, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2155 for i in range(2):
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2156 self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE'])
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2157
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2158 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2159 'Expand' : True,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2160 'Query' : { 'StudyDate' : '20061202-' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2161 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2162 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName'])
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2163
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2164 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2165 'Expand' : True,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2166 'Query' : { 'StudyDate' : '20080819-' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2167 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2168 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName'])
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2169
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2170 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2171 'Expand' : True,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2172 'Query' : { 'StudyDate' : '20080820-' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2173 self.assertEqual(0, len(a))
666 acd22dd27e30 extended test_rest_find Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	2174
acd22dd27e30 extended test_rest_find Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	2175 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
acd22dd27e30 extended test_rest_find Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	2176 'Expand' : True,
acd22dd27e30 extended test_rest_find Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	2177 'Query' : { 'PatientPosition' : 'HFS' }})
acd22dd27e30 extended test_rest_find Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	2178 self.assertEqual(2, len(a))
acd22dd27e30 extended test_rest_find Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	2179
acd22dd27e30 extended test_rest_find Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	2180 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
acd22dd27e30 extended test_rest_find Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	2181 'Expand' : False,
acd22dd27e30 extended test_rest_find Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	2182 'Query' : { 'PatientPosition' : 'HFS' }})
acd22dd27e30 extended test_rest_find Sebastien Jodogne <s.jodogne@gmail.com> parents: 665 diff changeset	2183 self.assertEqual(2, len(a))
194 9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2184
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2185
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2186 def test_rest_query_retrieve(self):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2187 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2188
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2189 # Upload 8 instances
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2190 for i in range(2):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2191 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2192 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2193 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2194 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2195
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2196 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2197 for p in DoGet(_REMOTE, '/patients'):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2198 DoPost(_REMOTE, '/modalities/orthanctest/store', p)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2199 DoDelete(_REMOTE, '/patients/%s' % p)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2200
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2201 for q in DoGet(_REMOTE, '/queries'):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2202 DoDelete(_REMOTE, '/queries/%s' % q)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2203
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2204 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2205 self.assertEqual(0, len(DoGet(_REMOTE, '/queries')))
509 17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2206
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2207 if not IsOrthancVersionAbove(_LOCAL, 1, 11, 2): # TODO: check why this works with 0.8.6 and not with more recent versions
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2208 a = DoPost(_REMOTE, '/modalities/orthanctest/query', { 'Level' : 'Series',
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2209 'Query' : {
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2210 'PatientName' : 'NE',
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2211 'StudyDate' : '*',
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2212 }})['ID']
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2213 self.assertEqual(1, len(DoGet(_REMOTE, '/queries')))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2214
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2215 b = DoGet(_REMOTE, '/queries/%s' % a)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2216 self.assertTrue('answers' in b)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2217 self.assertTrue('level' in b)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2218 self.assertTrue('modality' in b)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2219 self.assertTrue('query' in b)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2220 self.assertTrue('retrieve' in b)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2221 self.assertEqual('Series', DoGet(_REMOTE, '/queries/%s/level' % a))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2222 self.assertEqual('orthanctest', DoGet(_REMOTE, '/queries/%s/modality' % a))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2223
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2224 q = DoGet(_REMOTE, '/queries/%s/query?simplify' % a)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2225 self.assertEqual(2, len(q))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2226 self.assertTrue('PatientName' in q)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2227 self.assertTrue('StudyDate' in q)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2228 self.assertEqual('NE', q['PatientName'])
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2229 self.assertEqual('*', q['StudyDate'])
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2230
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2231 self.assertEqual(2, len(DoGet(_REMOTE, '/queries/%s/answers' % a)))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2232
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2233 s = DoGet(_REMOTE, '/queries/%s/answers/0' % a)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2234 self.assertTrue('content' in s)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2235 self.assertTrue('retrieve' in s)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2236
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2237 s = DoGet(_REMOTE, '/queries/%s/answers/0/content?simplify' % a)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2238 self.assertEqual('887', s['PatientID'])
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2239 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', s['StudyInstanceUID'])
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2240
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2241 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2242 DoPost(_REMOTE, '/queries/%s/answers/0/retrieve' % a, 'ORTHANC')
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2243 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2244 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2245 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2246 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2247
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2248 DoPost(_REMOTE, '/queries/%s/answers/1/retrieve' % a, 'ORTHANC', 'application/json') # make sure the issue #36 is fixed (query/retrieve Rest API: /retrieve route shall accept application/json content type)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2249 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2250 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2251 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2252 self.assertEqual(4, len(DoGet(_REMOTE, '/instances')))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2253
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2254 # New in Orthanc 1.4.3
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2255 s = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2256 self.assertEqual(2, len(s))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2257 for i in range(2):
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2258 self.assertEqual('SERIES', s[i]['QueryRetrieveLevel'])
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2259 self.assertEqual('887', s[i]['PatientID'])
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2260 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', s[i]['StudyInstanceUID'])
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2261
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2262 DoDelete(_REMOTE, '/queries/%s' % a)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	2263 self.assertEqual(0, len(DoGet(_REMOTE, '/queries')))
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2264
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2265
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2266 def test_parent(self):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2267 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2268 patient = '6816cb19-844d5aee-85245eba-28e841e6-2414fae2'
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2269 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0'
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2270 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe'
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2271 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d'
107 fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	2272 self.assertEqual(instance, u)
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2273
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2274 a = DoGet(_REMOTE, '/studies/%s/patient' % study)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2275 self.assertEqual('Patient', a['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2276 self.assertEqual(patient, a['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2277
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2278 a = DoGet(_REMOTE, '/series/%s/patient' % series)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2279 self.assertEqual('Patient', a['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2280 self.assertEqual(patient, a['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2281
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2282 a = DoGet(_REMOTE, '/series/%s/study' % series)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2283 self.assertEqual('Study', a['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2284 self.assertEqual(study, a['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2285
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2286 a = DoGet(_REMOTE, '/instances/%s/patient' % instance)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2287 self.assertEqual('Patient', a['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2288 self.assertEqual(patient, a['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2289
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2290 a = DoGet(_REMOTE, '/instances/%s/study' % instance)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2291 self.assertEqual('Study', a['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2292 self.assertEqual(study, a['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2293
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2294 a = DoGet(_REMOTE, '/instances/%s/series' % instance)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2295 self.assertEqual('Series', a['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2296 self.assertEqual(series, a['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2297
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2298
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2299 def test_shanon(self):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2300 def Anonymize(instance, replacements = {}):
119 7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	2301 return DoPost(_REMOTE, '/instances/%s/anonymize' % instance, {
7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	2302 'Replace' : replacements,
7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	2303 'Force' : True,
7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	2304 }, 'application/json')
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2305
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2306 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2307 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2308 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2309
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2310 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ]
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2311 ids = [ 'ozp00SjY2xG',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2312 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2313 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2314 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ]
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2315
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2316 a = ExtractDicomTags(Anonymize(u), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2317 for i in range(4):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2318 self.assertNotEqual(ids[i], a[i])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2319 self.assertTrue(a[4].startswith('Orthanc'))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2320
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2321 a = ExtractDicomTags(Anonymize(u, { 'PatientName' : 'toto' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2322 for i in range(4):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2323 self.assertNotEqual(ids[i], a[i])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2324 self.assertFalse(a[4].startswith('Orthanc'))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2325
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2326 a = ExtractDicomTags(Anonymize(u, { 'SOPInstanceUID' : 'instance' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2327 self.assertEqual('instance', a[3])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2328 self.assertFalse(a[4].startswith('Orthanc'))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2329
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2330 a = ExtractDicomTags(Anonymize(u, { 'SeriesInstanceUID' : 'series' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2331 self.assertEqual('series', a[2])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2332 self.assertFalse(a[4].startswith('Orthanc'))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2333
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2334 a = ExtractDicomTags(Anonymize(u, { 'StudyInstanceUID' : 'study' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2335 self.assertEqual('study', a[1])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2336 self.assertFalse(a[4].startswith('Orthanc'))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2337
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2338 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2339 self.assertEqual('patient', a[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2340 self.assertFalse(a[4].startswith('Orthanc'))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2341
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2342 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2343 'StudyInstanceUID' : 'study',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2344 'SeriesInstanceUID' : 'series',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2345 'SOPInstanceUID' : 'instance' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2346 self.assertEqual('patient', a[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2347 self.assertFalse(a[4].startswith('Orthanc'))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2348
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2349 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2350
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2351
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2352 def test_shanon_2(self):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2353 def Modify(instance, replacements = {}):
119 7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	2354 return DoPost(_REMOTE, '/instances/%s/modify' % instance, {
7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	2355 'Replace' : replacements,
7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	2356 'Force': True,
7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	2357 }, 'application/json')
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2358
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2359 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2360 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2361 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2362
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2363 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ]
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2364 ids = [ 'ozp00SjY2xG',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2365 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2366 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2367 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ]
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2368
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2369 a = ExtractDicomTags(Modify(u), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2370 self.assertEqual(ids[0], a[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2371 self.assertEqual(ids[1], a[1])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2372 self.assertEqual(ids[2], a[2])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2373 self.assertNotEqual(ids[3], a[3])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2374 self.assertEqual(0, len(a[4]))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2375
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2376 a = ExtractDicomTags(Modify(u, { 'SOPInstanceUID' : 'instance' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2377 self.assertEqual(ids[0], a[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2378 self.assertEqual(ids[1], a[1])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2379 self.assertEqual(ids[2], a[2])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2380 self.assertEqual('instance', a[3])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2381
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2382 a = ExtractDicomTags(Modify(u, { 'SeriesInstanceUID' : 'series' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2383 self.assertEqual(ids[0], a[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2384 self.assertEqual(ids[1], a[1])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2385 self.assertEqual('series', a[2])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2386 self.assertNotEqual(ids[3], a[3])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2387
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2388 a = ExtractDicomTags(Modify(u, { 'StudyInstanceUID' : 'study' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2389 self.assertEqual(ids[0], a[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2390 self.assertEqual('study', a[1])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2391 self.assertNotEqual(ids[2], a[2])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2392 self.assertNotEqual(ids[3], a[3])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2393
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2394 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2395 self.assertEqual('patient', a[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2396 self.assertNotEqual(ids[1], a[1])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2397 self.assertNotEqual(ids[2], a[2])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2398 self.assertNotEqual(ids[3], a[3])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2399
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2400 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2401 'StudyInstanceUID' : 'study',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2402 'SeriesInstanceUID' : 'series',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2403 'SOPInstanceUID' : 'instance' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2404 self.assertEqual('patient', a[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2405 self.assertEqual('study', a[1])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2406 self.assertEqual('series', a[2])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2407 self.assertEqual('instance', a[3])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2408
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2409 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2410
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2411
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2412 def test_instances_tags(self):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2413 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2414 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')['ID']
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2415 #a = UploadInstance(_REMOTE, 'Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386937.676343')['ID']
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2416 #b = UploadInstance(_REMOTE, 'Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386925.676329')['ID']
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2417
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2418 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/patients')[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2419 self.assertEqual(2, len(i))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2420 self.assertEqual('887', i[i.keys()[0]]['PatientID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2421 self.assertEqual('887', i[i.keys()[1]]['PatientID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2422
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2423 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/studies')[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2424 self.assertEqual(2, len(i))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2425 self.assertEqual('887', i[i.keys()[0]]['PatientID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2426 self.assertEqual('887', i[i.keys()[1]]['PatientID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2427
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2428 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2429 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2430 self.assertEqual(1, len(i))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2431 self.assertEqual('887', i[i.keys()[0]]['PatientID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2432
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2433 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[1])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2434 self.assertEqual(1, len(i))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2435 self.assertEqual('887', i[i.keys()[0]]['PatientID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2436
136 5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	2437 i = DoGet(_REMOTE, '/patients/%s/instances-tags?short' % DoGet(_REMOTE, '/series')[1])
5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	2438 self.assertEqual(1, len(i))
5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	2439 self.assertEqual('887', i[i.keys()[0]]['0010,0020'])
5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	2440
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2441
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2442 def test_lookup(self):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2443 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG')
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2444 self.assertEqual(0, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2445
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2446 UploadInstance(_REMOTE, 'DummyCT.dcm')
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2447
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2448 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG')
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2449 self.assertEqual(1, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2450 self.assertEqual('Patient', a[0]['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2451 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', a[0]['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2452 self.assertEqual('/patients/%s' % a[0]['ID'], a[0]['Path'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2453
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2454 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390')
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2455 self.assertEqual(1, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2456 self.assertEqual('Study', a[0]['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2457 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', a[0]['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2458 self.assertEqual('/studies/%s' % a[0]['ID'], a[0]['Path'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2459
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2460 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394')
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2461 self.assertEqual(1, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2462 self.assertEqual('Series', a[0]['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2463 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', a[0]['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2464 self.assertEqual('/series/%s' % a[0]['ID'], a[0]['Path'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2465
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2466 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109')
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2467 self.assertEqual(1, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2468 self.assertEqual('Instance', a[0]['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2469 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', a[0]['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2470 self.assertEqual('/instances/%s' % a[0]['ID'], a[0]['Path'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2471
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2472 DropOrthanc(_REMOTE)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2473 a = DoPost(_REMOTE, '/tools/lookup', '3113719P')
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2474 self.assertEqual(0, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2475
15 2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2476
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2477 def test_autorouting(self):
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2478 knee1 = 'Knee/T1/IM-0001-0001.dcm'
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2479 knee2 = 'Knee/T2/IM-0001-0002.dcm'
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2480 other = 'Brainix/Flair/IM-0001-0001.dcm'
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2481
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2482 # Check that this version is >= 0.8.0
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2483 self.assertTrue(IsDefinedInLua(_REMOTE, '_InitializeJob'))
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2484 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities'))
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2485
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2486 UploadInstance(_REMOTE, knee1)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2487 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2488
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2489 DropOrthanc(_REMOTE)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2490 DropOrthanc(_LOCAL)
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	2491 InstallLuaScriptFromPath(_REMOTE, 'Lua/Autorouting.lua')
15 2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2492 UploadInstance(_REMOTE, knee1)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2493 UploadInstance(_REMOTE, knee2)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2494 UploadInstance(_REMOTE, other)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2495 WaitEmpty(_REMOTE)
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	2496 UninstallLuaCallbacks(_REMOTE)
15 2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2497 self.assertEqual(3, len(DoGet(_LOCAL, '/instances')))
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2498
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2499 DropOrthanc(_REMOTE)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2500 DropOrthanc(_LOCAL)
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	2501 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingConditional.lua')
15 2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2502 UploadInstance(_REMOTE, knee1)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2503 UploadInstance(_REMOTE, knee2)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2504 UploadInstance(_REMOTE, other)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2505 WaitEmpty(_REMOTE)
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	2506 UninstallLuaCallbacks(_REMOTE)
15 2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2507 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2508
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2509 DropOrthanc(_REMOTE)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2510 DropOrthanc(_LOCAL)
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	2511 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingModification.lua')
15 2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2512 UploadInstance(_REMOTE, knee1)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2513 WaitEmpty(_REMOTE)
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	2514 UninstallLuaCallbacks(_REMOTE)
15 2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2515 i = DoGet(_LOCAL, '/instances')
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2516 self.assertEqual(1, len(i))
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2517
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2518 with tempfile.NamedTemporaryFile(delete = True) as f:
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2519 f.write(DoGet(_LOCAL, '/instances/%s/file' % i[0]))
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2520 f.flush()
45 a8cc12e9b268 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 44 diff changeset	2521 routed = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ])
15 2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2522 self.assertEqual('My Medical Device', re.search('"StationName">(.*?)<', routed).group(1).strip())
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2523 self.assertEqual(None, re.search('"MilitaryRank"', routed))
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2524 self.assertEqual(None, re.search('"0051,0010"', routed)) # A private tag
17 7c8500991a12 karsten Sebastien Jodogne <s.jodogne@gmail.com> parents: 15 diff changeset	2525
7c8500991a12 karsten Sebastien Jodogne <s.jodogne@gmail.com> parents: 15 diff changeset	2526
7c8500991a12 karsten Sebastien Jodogne <s.jodogne@gmail.com> parents: 15 diff changeset	2527 def test_storescu_rf(self):
7c8500991a12 karsten Sebastien Jodogne <s.jodogne@gmail.com> parents: 15 diff changeset	2528 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
7c8500991a12 karsten Sebastien Jodogne <s.jodogne@gmail.com> parents: 15 diff changeset	2529 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
7c8500991a12 karsten Sebastien Jodogne <s.jodogne@gmail.com> parents: 15 diff changeset	2530 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
7c8500991a12 karsten Sebastien Jodogne <s.jodogne@gmail.com> parents: 15 diff changeset	2531 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
18 16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2532
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2533
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2534 def test_anonymize_instance(self):
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2535 def AnonymizeAndUpload(instanceId, parameters):
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2536 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/anonymize' % instanceId, parameters,
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2537 'application/json'), 'application/dicom')['ID']
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2538
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2539 def ModifyAndUpload(instanceId, parameters):
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2540 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/modify' % instanceId, parameters,
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2541 'application/json'), 'application/dicom')['ID']
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2542
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2543 a = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID']
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2544 s1 = DoGet(_REMOTE, '/instances/%s/content/PatientName' % a)
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2545 s2 = DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % a) # Some private tag
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2546 s3 = DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % a)
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2547 s4 = DoGet(_REMOTE, '/instances/%s/content/SeriesDescription' % a)
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2548 s5 = DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a)
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2549
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2550 b = AnonymizeAndUpload(a, '{}')
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2551 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2552 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2553
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2554 # Keep private tag (only OK since Orthanc 0.8.0)
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2555 b = AnonymizeAndUpload(a, '{"Keep":["00e1-10c2"]}')
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2556 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2557 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2558
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2559 b = AnonymizeAndUpload(a, '{"Keep":["00e1,10c2","PatientName"]}')
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2560 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2561 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2562
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2563 b = AnonymizeAndUpload(a, '{"Keep":["PatientName"],"Replace":{"00e1,10c2":"Hello"}}')
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2564 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2565 self.assertTrue(DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b).startswith('Hello'))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2566
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2567 # Examples from the Wiki
118 a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	2568 b = AnonymizeAndUpload(a, '{"Replace":{"PatientName":"hello","0010-0020":"world"},"Keep":["StudyDescription", "SeriesDescription"],"KeepPrivateTags": true,"Force":true}')
18 16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2569 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2570 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2571 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2572 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2573 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2574 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2575 DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a)
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2576 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2577
118 a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	2578 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Remove":["InstitutionName"],"RemovePrivateTags": true,"Force":true}')
18 16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2579 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2580 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2581 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2582 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2583 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2584 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2585
118 a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	2586 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Force":true}')
18 16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2587 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2588 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2589 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1,10c2' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2590 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2591 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2592 self.assertEqual(s5, DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2593
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2594
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2595 # Test modify non-existing
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2596 i = DoPost(_REMOTE, '/tools/create-dicom',
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2597 json.dumps({
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2598 'PatientName' : 'Jodogne',
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2599 'Modality' : 'CT',
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2600 }))['ID']
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2601
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2602 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2603 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % i))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2604 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2605
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2606 b = ModifyAndUpload(i, '{"Replace":{"StudyDescription":"hello","Modality":"world"}}')
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2607 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2608 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2609 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/Modality' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2610
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2611
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2612 def test_incoming_jpeg(self):
463 29aaa3df718f added verbosity and retries for test sometimes failing on CI Alain Mazy <am@osimis.io> parents: 457 diff changeset	2613 # since this test fails regularly on CI, enable verbosity
29aaa3df718f added verbosity and retries for test sometimes failing on CI Alain Mazy <am@osimis.io> parents: 457 diff changeset	2614 DoPut(_REMOTE, '/tools/log-level', 'verbose')
29aaa3df718f added verbosity and retries for test sometimes failing on CI Alain Mazy <am@osimis.io> parents: 457 diff changeset	2615
468 e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2616 def storescu(image, acceptUnknownSopClassUid, expectSuccess = True, retries = 1):
61 967d44407308 test UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	2617 if acceptUnknownSopClassUid:
967d44407308 test UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	2618 tmp = [ '-xf', GetDatabasePath('UnknownSopClassUid.cfg'), 'Default' ]
967d44407308 test UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	2619 else:
967d44407308 test UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	2620 tmp = [ '-xs' ]
967d44407308 test UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	2621
468 e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2622 while retries > 0:
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2623 retries -= 1
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2624 with open(os.devnull, 'w') as FNULL:
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2625 try:
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2626 subprocess.check_call([ FindExecutable('storescu') ] + tmp +
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2627 [ _REMOTE['Server'], str(_REMOTE['DicomPort']),
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2628 GetDatabasePath(image) ],
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2629 stderr = FNULL)
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2630
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2631 if expectSuccess:
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2632 return
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2633 except subprocess.CalledProcessError as e:
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2634 print('storescu failed with error code: %s' % str(e.returncode))
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2635 if not expectSuccess:
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2636 raise e
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2637
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2638 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
373 f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2639
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2640 if IsOrthancVersionAbove(_REMOTE, 1, 9, 0):
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2641 a = DoPut(_REMOTE, '/tools/accepted-transfer-syntaxes', [
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2642 '1.2.840.10008.1.2', '1.2.840.10008.1.2.1', '1.2.840.10008.1.2.2'
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2643 ])
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2644 self.assertTrue('1.2.840.10008.1.2' in a)
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2645 self.assertTrue('1.2.840.10008.1.2.1' in a)
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2646 self.assertTrue('1.2.840.10008.1.2.2' in a)
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2647 self.assertEqual(3, len(a))
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2648 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/unknown-sop-class-accepted', 'nope'))
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2649 DoPut(_REMOTE, '/tools/unknown-sop-class-accepted', '0')
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2650 self.assertEqual(0, DoGet(_REMOTE, '/tools/unknown-sop-class-accepted'))
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2651 else:
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2652 InstallLuaScriptFromPath(_REMOTE, 'Lua/TransferSyntaxDisable.lua')
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2653
490 10a47656e34f new tests for MaximumStorageMode Alain Mazy <am@osimis.io> parents: 488 diff changeset	2654 # the following line regularly fails on CI because storescu still returns 0 although the C-Store fails -> that's why we have implemented retries
468 e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2655 self.assertRaises(Exception, lambda: storescu('Knix/Loc/IM-0001-0001.dcm', False, False, 3))
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2656 self.assertRaises(Exception, lambda: storescu('UnknownSopClassUid.dcm', True, False, 3))
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2657 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
373 f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2658
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2659 if IsOrthancVersionAbove(_REMOTE, 1, 9, 0):
374 78bef07c4118 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 373 diff changeset	2660 a = DoPut(_REMOTE, '/tools/accepted-transfer-syntaxes', '*', 'text/plain')
373 f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2661 self.assertGreaterEqual(42, len(a))
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2662 DoPut(_REMOTE, '/tools/unknown-sop-class-accepted', 'true')
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2663 self.assertEqual(1, DoGet(_REMOTE, '/tools/unknown-sop-class-accepted'))
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2664 else:
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2665 InstallLuaScriptFromPath(_REMOTE, 'Lua/TransferSyntaxEnable.lua')
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2666
62 f9c4ce95756f removal of useless information Sebastien Jodogne <s.jodogne@gmail.com> parents: 61 diff changeset	2667 DoPost(_REMOTE, '/tools/execute-script', "print('All special transfer syntaxes are now accepted')")
61 967d44407308 test UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	2668 storescu('Knix/Loc/IM-0001-0001.dcm', False)
967d44407308 test UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	2669 storescu('UnknownSopClassUid.dcm', True)
967d44407308 test UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	2670 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2671
463 29aaa3df718f added verbosity and retries for test sometimes failing on CI Alain Mazy <am@osimis.io> parents: 457 diff changeset	2672 # set back normal verbosity
29aaa3df718f added verbosity and retries for test sometimes failing on CI Alain Mazy <am@osimis.io> parents: 457 diff changeset	2673 DoPut(_REMOTE, '/tools/log-level', 'default')
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2674
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2675 def test_storescu_jpeg(self):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2676 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2677
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2678 knixStudy = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0'
64 369e439cdfd6 test access header Sebastien Jodogne <s.jodogne@gmail.com> parents: 63 diff changeset	2679 i = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm')['ID']
369e439cdfd6 test access header Sebastien Jodogne <s.jodogne@gmail.com> parents: 63 diff changeset	2680
369e439cdfd6 test access header Sebastien Jodogne <s.jodogne@gmail.com> parents: 63 diff changeset	2681 # This is JPEG lossless
136 5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	2682 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header' % i)['0002,0010']['Value'])
64 369e439cdfd6 test access header Sebastien Jodogne <s.jodogne@gmail.com> parents: 63 diff changeset	2683 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header?simplify' % i)['TransferSyntaxUID'])
136 5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	2684 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header?short' % i)['0002,0010'])
64 369e439cdfd6 test access header Sebastien Jodogne <s.jodogne@gmail.com> parents: 63 diff changeset	2685
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2686 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm')
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2687 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0003.dcm')
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2688
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2689 a = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2690 b = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2691 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2692 DoPost(_REMOTE, '/modalities/orthanctest/store', [ knixStudy, a, b ])
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2693 self.assertEqual(5, len(DoGet(_LOCAL, '/instances')))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2694
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2695 self.assertEqual(3, len(DoGet(_REMOTE, '/exports')['Exports']))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2696
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2697 DropOrthanc(_REMOTE)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2698 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2699
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2700
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2701 def test_pixel_data(self):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2702 jpeg = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2703 color = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2704 phenix = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2705
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2706 phenixSize = 358 * 512 * 2
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2707 colorSize = 1000 * 1000 * 3
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2708 jpegSize = 51918
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2709
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2710 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/content/7fe0-0010' % phenix)))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2711 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/content/7fe0-0010' % color)))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2712 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/content/7fe0-0010' % jpeg)))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2713
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2714 self.assertEqual(0, len(DoGet(_REMOTE, '/instances/%s/content/7fe0-0010/0' % jpeg)))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2715 self.assertEqual(jpegSize, len(DoGet(_REMOTE, '/instances/%s/content/7fe0-0010/1' % jpeg)))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2716
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2717 self.assertEqual(phenixSize, len(DoGet(_REMOTE, '/instances/%s/content/7fe0-0010/0' % phenix)))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2718 self.assertEqual(colorSize, len(DoGet(_REMOTE, '/instances/%s/content/7fe0-0010/0' % color)))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2719
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2720
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2721 def test_decode_brainix(self):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2722 brainix = [
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2723 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'], # (*)
384 9a41306c1fe5 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 383 diff changeset	2724 UploadInstance(_REMOTE, 'Formats/JpegLossless.dcm')['ID'], # JPEG-LS, same as (*) (since Orthanc 0.7.6) => doesn't work on big-endian
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2725 UploadInstance(_REMOTE, 'Formats/Jpeg.dcm')['ID'], # JPEG, same as (*) (since Orthanc 0.7.6)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2726 ]
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2727 h = '6fb11b932d535c2be04beabd99793ff8'
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2728 maxValue = 426.0
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2729
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2730 truth = Image.open(GetDatabasePath('Formats/Brainix.png'))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2731 for i in brainix:
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2732 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % i)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2733 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % i)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2734
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2735 truth2 = map(lambda x: min(255, x), truth.getdata())
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2736 for i in brainix:
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2737 self.AssertSameImages(truth2, '/instances/%s/image-uint8' % i)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2738
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2739 truth2 = map(lambda x: x * 255.0 / maxValue, truth.getdata())
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2740 for i in brainix:
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2741 self.AssertSameImages(truth2, '/instances/%s/preview' % i)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2742
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2743 for i in brainix:
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2744 self.assertEqual(h, ComputeMD5(DoGet(_REMOTE, '/instances/%s/matlab' % i)))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2745
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2746
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2747 def test_decode_color(self):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2748 imagej = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2749 color = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2750
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2751 for i in [ imagej, color ]:
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2752 for j in [ 'image-uint8', 'image-uint16', 'image-int16' ]:
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2753 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/%s' % (i, j)))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2754
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2755 self.assertEqual('c14c687f7a1ea9fe022479fc87c67274', ComputeMD5(DoGet(_REMOTE, '/instances/%s/preview' % imagej)))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2756 self.assertEqual('a87d122918a56f803bcfe9d2586b9125', ComputeMD5(DoGet(_REMOTE, '/instances/%s/preview' % color)))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2757
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2758 self.assertEqual('30cc46bfa7aba77a40e4178f6184c25a', ComputeMD5(DoGet(_REMOTE, '/instances/%s/matlab' % imagej)))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2759 self.assertEqual('ff195005cef06b59666fd220a9b4cd9a', ComputeMD5(DoGet(_REMOTE, '/instances/%s/matlab' % color)))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2760
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2761
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2762 def test_decode_rf(self):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2763 rf = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2764 truth = Image.open(GetDatabasePath('Formats/KarstenHilbertRF.png'))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2765
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2766 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % rf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2767 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % rf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2768 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % rf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2769 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % rf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2770
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2771 self.assertEqual('42254d70efd2f4a1b8f3455909689f0e', ComputeMD5(DoGet(_REMOTE, '/instances/%s/matlab' % rf)))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2772
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2773
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2774 def test_decode_multiframe(self):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2775 mf = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2776
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2777 # Test the first frame
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2778 truth = Image.open(GetDatabasePath('Formats/Multiframe0.png'))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2779 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % mf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2780 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % mf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2781 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % mf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2782 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % mf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2783 self.assertEqual('9812b99d93bbcd4e7684ded089b5dfb3', ComputeMD5(DoGet(_REMOTE, '/instances/%s/matlab' % mf)))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2784
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2785 self.AssertSameImages(truth.getdata(), '/instances/%s/frames/0/image-uint16' % mf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2786
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2787 # Test the last frame
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2788 truth = Image.open(GetDatabasePath('Formats/Multiframe75.png'))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2789 self.AssertSameImages(truth.getdata(), '/instances/%s/frames/75/image-uint16' % mf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2790
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2791
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2792 def test_decode_signed(self):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2793 signed = UploadInstance(_REMOTE, 'SignedCT.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2794 minValue = -2000
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2795 maxValue = 4042
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2796
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2797 truth = Image.open(GetDatabasePath('Formats/SignedCT.png'))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2798 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % signed)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2799
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2800 truth2 = map(lambda x: 0 if x >= 32768 else x, truth.getdata())
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2801 self.AssertSameImages(truth2, '/instances/%s/image-uint16' % signed)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2802
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2803 truth3 = map(lambda x: 255 if x >= 256 else x, truth2)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2804 self.AssertSameImages(truth3, '/instances/%s/image-uint8' % signed)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2805
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2806 tmp = map(lambda x: x - 65536 if x >= 32768 else x, truth.getdata())
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2807 tmp = map(lambda x: (255.0 * (x - minValue)) / (maxValue - minValue), tmp)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2808 self.AssertSameImages(tmp, '/instances/%s/preview' % signed)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2809
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2810 self.assertEqual('b57e6c872a3da50877c7da689b03a444', ComputeMD5(DoGet(_REMOTE, '/instances/%s/matlab' % signed)))
22 8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2811
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2812
46 85b2e36ed392 explicit GoogleCode source Sebastien Jodogne <s.jodogne@gmail.com> parents: 45 diff changeset	2813 def test_googlecode_issue_32(self):
92 dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2814 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/default-encoding', 'nope'))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2815 self.assertEqual('Windows1251', DoPut(_REMOTE, '/tools/default-encoding', 'Windows1251'))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2816 self.assertEqual('Windows1251', DoGet(_REMOTE, '/tools/default-encoding'))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2817
22 8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2818 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID']
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2819 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f)
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2820 self.assertEqual(u'Рентгенография', tags['SeriesDescription'])
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2821 self.assertEqual(u'Таз', tags['BodyPartExamined'])
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2822 self.assertEqual(u'Прямая', tags['ViewPosition'])
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2823
92 dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2824 # Replay the same test using Latin1 as default encoding: This must fail
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2825 self.assertEqual('Latin1', DoPut(_REMOTE, '/tools/default-encoding', 'Latin1'))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2826
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2827 DoDelete(_REMOTE, '/instances/%s' % f)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2828 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID']
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2829 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2830 self.assertNotEqual(u'Рентгенография', tags['SeriesDescription'])
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2831
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2832
22 8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2833 def test_encodings(self):
23 30ecc857fa07 test latin-2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	2834 # Latin-1 (ISO_IR 100)
22 8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2835 brainix = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID']
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2836 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % brainix)
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2837 self.assertEqual(u'IRM cérébrale, neuro-crâne', tags['StudyDescription'])
23 30ecc857fa07 test latin-2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	2838
30ecc857fa07 test latin-2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	2839 # Latin-2 (ISO_IR 101)
30ecc857fa07 test latin-2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	2840 a = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID']
30ecc857fa07 test latin-2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	2841 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % a)
30ecc857fa07 test latin-2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	2842 # dcm2xml MarekLatin2.dcm \| iconv -f latin2 -t utf-8 \| xmllint --format -
30ecc857fa07 test latin-2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	2843 self.assertEqual('Imię i Nazwisko osoby opisującej',
30ecc857fa07 test latin-2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	2844 i['ContentSequence'][4]['ConceptNameCodeSequence'][0]['CodeMeaning'].encode('utf-8'))
30ecc857fa07 test latin-2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	2845
26 040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2846
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2847 def test_storescu_custom_aet(self):
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2848 # This tests a feature introduced in Orthanc 0.9.1: "Custom
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2849 # setting of the local AET during C-Store SCU (both in Lua and
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2850 # in the REST API)."
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2851 # https://groups.google.com/forum/#!msg/orthanc-users/o5qMULformU/wZjW2iSaMcAJ
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2852
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2853 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2854
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2855 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2856 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2857 c = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0003.dcm')
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2858
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2859 j = DoPost(_REMOTE, '/modalities/orthanctest/store', {
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2860 'LocalAet' : 'YOP',
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2861 'Resources' : [ a['ID'], b['ID'] ]
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2862 })
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2863
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2864 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2865 self.assertEqual('YOP', DoGet(_LOCAL, '/instances/%s/metadata/RemoteAET' % a['ID']))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2866
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2867 DropOrthanc(_LOCAL)
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2868 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2869
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2870 j = DoPost(_REMOTE, '/modalities/orthanctest/store', {
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2871 'Resources' : [ c['ID'] ]
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2872 })
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2873
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2874 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2875 self.assertEqual('ORTHANC', DoGet(_LOCAL, '/instances/%s/metadata/RemoteAET' % c['ID']))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2876
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2877 DropOrthanc(_REMOTE)
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2878 DropOrthanc(_LOCAL)
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2879
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	2880 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingChangeAet.lua')
26 040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2881 DoPost(_REMOTE, '/tools/execute-script', 'aet = "HELLO"', 'application/lua')
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2882
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2883 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2884 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2885 WaitEmpty(_REMOTE)
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2886 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2887 self.assertEqual('HELLO', DoGet(_LOCAL, '/instances/%s/metadata/RemoteAET' % a['ID']))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2888
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2889 DoPost(_REMOTE, '/tools/execute-script', 'aet = nill', 'application/lua')
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2890 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2891 WaitEmpty(_REMOTE)
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2892 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2893 self.assertEqual('ORTHANC', DoGet(_LOCAL, '/instances/%s/metadata/RemoteAET' % b['ID']))
34 1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2894
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2895 def test_resources_since_limit(self):
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2896 # Upload 16 instances
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2897 for i in range(4):
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2898 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2899 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2900 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2901 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2902
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2903 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2904 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2905 self.assertEqual(4, len(DoGet(_REMOTE, '/series')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2906 self.assertEqual(16, len(DoGet(_REMOTE, '/instances')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2907
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2908 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/patients&since=10' % i))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2909 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/patients&limit=10' % i))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2910
675 c8c4bebf18b8 fix limit=0 test Alain Mazy <am@orthanc.team> parents: 669 diff changeset	2911 if not IsOrthancVersionAbove(_REMOTE, 1, 12, 5): # with ExtendedFind, the limit=0 means no-limit like in /tools/find
c8c4bebf18b8 fix limit=0 test Alain Mazy <am@orthanc.team> parents: 669 diff changeset	2912 self.assertEqual(0, len(DoGet(_REMOTE, '/patients?since=0&limit=0')))
34 1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2913 self.assertEqual(2, len(DoGet(_REMOTE, '/patients?since=0&limit=100')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2914 self.assertEqual(2, len(DoGet(_REMOTE, '/studies?since=0&limit=100')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2915 self.assertEqual(4, len(DoGet(_REMOTE, '/series?since=0&limit=100')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2916 self.assertEqual(16, len(DoGet(_REMOTE, '/instances?since=0&limit=100')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2917 self.assertEqual(1, len(DoGet(_REMOTE, '/patients?since=1&limit=100')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2918 self.assertEqual(0, len(DoGet(_REMOTE, '/patients?since=2&limit=100')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2919 self.assertEqual(0, len(DoGet(_REMOTE, '/patients?since=3&limit=100')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2920 self.assertEqual(1, len(DoGet(_REMOTE, '/studies?since=1&limit=100')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2921 self.assertEqual(3, len(DoGet(_REMOTE, '/series?since=1&limit=100')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2922 self.assertEqual(2, len(DoGet(_REMOTE, '/series?since=2&limit=100')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2923 self.assertEqual(1, len(DoGet(_REMOTE, '/series?since=3&limit=100')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2924 self.assertEqual(0, len(DoGet(_REMOTE, '/series?since=4&limit=100')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2925 self.assertEqual(0, len(DoGet(_REMOTE, '/series?since=100&limit=100')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2926 self.assertEqual(15, len(DoGet(_REMOTE, '/instances?since=1&limit=100')))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2927
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2928 for limit in [ 1, 2, 3, 7, 16, 17 ]:
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2929 s = {}
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2930 since = 0
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2931 while True:
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2932 t = DoGet(_REMOTE, '/instances?since=%d&limit=%d' % (since, limit))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2933 if len(t) == 0:
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2934 break
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2935
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2936 since += len(t)
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2937 for i in t:
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2938 s[i] = None
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2939
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2940 self.assertEqual(16, len(s))
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2941 for instance in DoGet(_REMOTE, '/instances'):
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2942 self.assertTrue(instance in s)
36 42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2943
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2944
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2945 def test_create_pdf(self):
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2946 # Upload 4 instances
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2947 brainixInstance = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2948 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2949 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2950 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2951
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2952 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0'
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2953 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988'
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2954 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8'
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2955
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2956 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f:
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2957 pdf = f.read()
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2958
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2959 i = DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2960 json.dumps({
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2961 'Tags' : {
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2962 'PatientName' : 'Jodogne',
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2963 'Modality' : 'CT',
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2964 },
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2965 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2966 }))
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2967
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2968 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip())
565 855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	2969 self.assertEqual('1.2.840.10008.5.1.4.1.1.104.1', DoGet(_REMOTE, '/instances/%s/content/SOPClassUID' % i['ID']).strip('\x00'))
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	2970 self.assertEqual('WSD', DoGet(_REMOTE, '/instances/%s/content/ConversionType' % i['ID']).strip())
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	2971 self.assertEqual('application/pdf', DoGet(_REMOTE, '/instances/%s/content/MIMETypeOfEncapsulatedDocument' % i['ID']).strip())
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	2972
446 9184e6cb215a allow custom value for "Modality" in /tools/create-dicom for PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 445 diff changeset	2973 # In Orthanc <= 1.9.7, the "CT" would have been replaced by "OT"
9184e6cb215a allow custom value for "Modality" in /tools/create-dicom for PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 445 diff changeset	2974 # https://groups.google.com/g/orthanc-users/c/eNSddNrQDtM/m/wc1HahimAAAJ
9184e6cb215a allow custom value for "Modality" in /tools/create-dicom for PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 445 diff changeset	2975 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip())
36 42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2976
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2977 b = DoGet(_REMOTE, '/instances/%s/content/0042-0011' % i['ID'])
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2978 self.assertEqual(len(b), len(pdf) + 1)
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2979 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf + '\0'))
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2980
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2981 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2982 json.dumps({
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2983 'Parent' : brainixPatient,
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2984 'Tags' : {
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2985 'PatientName' : 'Jodogne',
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2986 }
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2987 })))
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2988
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2989 i = DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2990 json.dumps({
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2991 'Parent' : brainixPatient,
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2992 'Tags' : { 'StudyDescription' : 'PDF^Patient' },
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2993 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2994 }))
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2995
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2996 self.assertEqual(brainixPatient, DoGet(_REMOTE, '/instances/%s/patient' % i['ID'])['ID'])
565 855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	2997 self.assertEqual('1.2.840.10008.5.1.4.1.1.104.1', DoGet(_REMOTE, '/instances/%s/content/SOPClassUID' % i['ID']).strip('\x00'))
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	2998 self.assertEqual('OT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip('\x00'))
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	2999 self.assertEqual('WSD', DoGet(_REMOTE, '/instances/%s/content/ConversionType' % i['ID']).strip())
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	3000 self.assertEqual('application/pdf', DoGet(_REMOTE, '/instances/%s/content/MIMETypeOfEncapsulatedDocument' % i['ID']).strip())
36 42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3001
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3002 i = DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3003 json.dumps({
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3004 'Parent' : brainixStudy,
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3005 'Tags' : { 'SeriesDescription' : 'PDF^Study' },
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3006 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3007 }))
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3008
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3009 self.assertEqual(brainixStudy, DoGet(_REMOTE, '/instances/%s/study' % i['ID'])['ID'])
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3010
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3011 i = DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3012 json.dumps({
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3013 'Parent' : brainixEpi,
37 6f86a5168e68 test Sebastien Jodogne <s.jodogne@gmail.com> parents: 36 diff changeset	3014 'Tags' : { 'SpecificCharacterSet' : 'ISO_IR 13' },
36 42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3015 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3016 }))
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3017
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3018 self.assertEqual(brainixEpi, DoGet(_REMOTE, '/instances/%s/series' % i['ID'])['ID'])
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3019
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3020 b = DoGet(_REMOTE, '/instances/%s/pdf' % i['ID'])
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3021 self.assertEqual(len(b), len(pdf))
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3022 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf))
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3023
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	3024 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/pdf' % brainixInstance))
38 d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3025
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3026
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3027 def test_create_series(self):
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3028 i = DoPost(_REMOTE, '/tools/create-dicom',
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3029 json.dumps({
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3030 'Tags' : {
40 8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3031 'SpecificCharacterSet' : 'ISO_IR 100',
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3032 'PatientName' : 'Sébastien Jodogne',
38 d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3033 'Modality' : 'CT',
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3034 },
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3035 'Content' : [
40 8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3036 {
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3037 'Content': 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==', # red dot in RGBA
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3038 'Tags' : { 'ImageComments' : 'Tutu' }
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3039 },
38 d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3040 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAoUlEQVQ4jZ2SWw3EIBREjwUsYAELa2EtoAULFUCyXAtroRZqoRbox254BdLC/DZnZjoXWJFgCDg8egW2CBEhEnDzyRk+Ecxz2KP/0AL8S99T+jQccAVs22qKwAuPuq0uyNg9cPLh3am+pe/dkHLZtqJHj6vXJrZ7nvzvxxgemXgUwnGfXqpee09mUwp8m022OYP6bLF7mVuVe0y/umxinsAXRd9z0k1ubWsAAAAASUVORK5CYII=',
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3041 ]
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3042 }))
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3043
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3044 s = DoGet(_REMOTE, i['Path'])
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3045 self.assertEqual('Series', s['Type'])
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3046 self.assertEqual(s['ID'], i['ID'])
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	3047 self.assertEqual(2, len(s['Instances']))
39 7412a437ab47 test Sebastien Jodogne <s.jodogne@gmail.com> parents: 38 diff changeset	3048 self.assertEqual(2, s['ExpectedNumberOfInstances'])
7412a437ab47 test Sebastien Jodogne <s.jodogne@gmail.com> parents: 38 diff changeset	3049 self.assertEqual('Complete', s['Status'])
40 8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3050
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3051 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][0])
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3052 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][1])
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3053 self.assertTrue('ImageComments' in a or 'ImageComments' in b)
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3054 if 'ImageComments' in a:
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3055 self.assertEqual('Tutu', a['ImageComments'])
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3056 else:
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3057 self.assertEqual('Tutu', b['ImageComments'])
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3058
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3059 patient = DoGet(_REMOTE, '/instances/%s/patient' % s['Instances'][0])
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3060 self.assertEqual(patient['MainDicomTags']['PatientName'].encode('utf-8'),
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	3061 'Sébastien Jodogne')
47 f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3062
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3063
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3064 def test_create_binary(self):
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3065 binary = ''.join(map(chr, range(256)))
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3066 encoded = 'data:application/octet-stream;base64,' + base64.b64encode(binary)
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3067 tags = {
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3068 'PatientName' : 'Jodogne',
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3069 '8899-8899' : encoded
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3070 }
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3071
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3072 i = DoPost(_REMOTE, '/tools/create-dicom',
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3073 json.dumps({
266 b105bb2233c6 fix issue 140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 265 diff changeset	3074 'Tags' : tags,
b105bb2233c6 fix issue 140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 265 diff changeset	3075 'PrivateCreator' : 'TestBinary',
47 f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3076 }))
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3077
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3078 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip())
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3079 self.assertEqual(binary, DoGet(_REMOTE, '/instances/%s/content/8899-8899' % i['ID']).strip())
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3080
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3081 i = DoPost(_REMOTE, '/tools/create-dicom',
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3082 json.dumps({
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3083 'InterpretBinaryTags' : False,
266 b105bb2233c6 fix issue 140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 265 diff changeset	3084 'Tags' : tags,
b105bb2233c6 fix issue 140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 265 diff changeset	3085 'PrivateCreator' : 'TestBinary',
47 f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3086 }))
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3087
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3088 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip())
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3089 self.assertEqual(encoded, DoGet(_REMOTE, '/instances/%s/content/8899-8899' % i['ID'])[0:-1])
48 e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3090
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3091
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3092 def test_patient_ids_collision(self):
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3093 # Upload 3 instances from 3 different studies, but with the
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3094 # same PatientID
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3095 for i in range(3):
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3096 UploadInstance(_REMOTE, 'PatientIdsCollision/Image%d.dcm' % (i + 1))
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3097
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3098 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3099 'Query' : { 'PatientName' : '*' }})
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3100 self.assertEqual(1, len(a))
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3101 self.assertEqual('COMMON', DoGet(_REMOTE, '/patients/%s' % a[0]) ['MainDicomTags']['PatientID'])
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3102
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3103 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3104 'CaseSensitive' : True,
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3105 'Query' : { 'PatientName' : 'FOO\\HELLO' }})
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3106 self.assertEqual(2, len(a))
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3107
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3108 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3109 'CaseSensitive' : False,
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3110 'Query' : { 'PatientName' : 'Foo' }})
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3111 self.assertEqual(1, len(a))
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3112 self.assertEqual('FOO^SERIES', DoGet(_REMOTE, '/series/%s/study' % a[0]) ['MainDicomTags']['StudyDescription'])
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3113 self.assertEqual('FOO', DoGet(_REMOTE, '/series/%s/study' % a[0]) ['PatientMainDicomTags']['PatientName'])
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3114 self.assertEqual('COMMON', DoGet(_REMOTE, '/series/%s/study' % a[0]) ['PatientMainDicomTags']['PatientID'])
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3115
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3116 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3117 'Query' : { 'PatientName' : '*' }})
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3118 self.assertEqual(3, len(a))
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3119 d = map(lambda x: DoGet(_REMOTE, '/studies/%s' % x) ['MainDicomTags']['StudyDescription'], a)
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3120 self.assertTrue('FOO^SERIES' in d)
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3121 self.assertTrue('HELLO^SERIES' in d)
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3122 self.assertTrue('WORLD^SERIES' in d)
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3123
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3124 d = map(lambda x: DoGet(_REMOTE, '/studies/%s' % x) ['PatientMainDicomTags']['PatientID'], a)
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3125 self.assertEqual(1, len(set(d)))
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3126 self.assertEqual('COMMON', d[0])
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3127
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3128 for i in a:
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3129 d = DoGet(_REMOTE, '/studies/%s' % i) ['MainDicomTags']['StudyDescription']
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3130 p = DoGet(_REMOTE, '/studies/%s' % i) ['PatientMainDicomTags']['PatientName']
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3131 self.assertEqual('%s^SERIES' % p, d)
49 e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3132
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3133
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3134 def test_bitbucket_issue_4(self):
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3135 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3136 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3137 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm')
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3138 UploadInstance(_REMOTE, 'Formats/Jpeg.dcm')
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3139 UploadInstance(_REMOTE, 'Formats/JpegLossless.dcm')
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3140 UploadInstance(_REMOTE, 'Formats/Rle.dcm')
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3141
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3142 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3143 self.assertEqual(6, len(DoGet(_REMOTE, '/instances')))
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3144
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3145 p = DoGet(_REMOTE, '/patients')
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3146 self.assertEqual(2, len(p))
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3147 i1 = map(lambda x: x['ID'], DoGet(_REMOTE, '/patients/%s/instances' % p[0]))
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3148 i2 = map(lambda x: x['ID'], DoGet(_REMOTE, '/patients/%s/instances' % p[1]))
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3149 self.assertEqual(3, len(i1))
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3150 self.assertEqual(3, len(i2))
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3151
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3152 j = DoPost(_REMOTE, '/modalities/orthanctest/store', i2[0:1] + i1 + i2[1:3])
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3153
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3154 self.assertEqual(6, len(DoGet(_LOCAL, '/instances')))
50 8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3155
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3156
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3157 def test_create_sequence(self):
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3158 i = DoPost(_REMOTE, '/tools/create-dicom',
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3159 json.dumps({
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3160 'Tags' : {
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3161 'SpecificCharacterSet': 'ISO_IR 100', # Encode using Latin1
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3162 'PatientName': 'Jodogne^',
51 264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3163 'ReferencedStudySequence': GenerateTestSequence(),
50 8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3164 }
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3165 }))['ID']
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3166
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3167 self.assertEqual('Jodogne^', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i))
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3168 self.assertEqual('Hello^', DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence/0/StudyDescription' % i))
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3169 self.assertEqual('Toto', DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence/0/ReferencedStudySequence/0/StudyDescription' % i))
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3170 self.assertEqual('Tata', DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence/0/ReferencedStudySequence/1/StudyDescription' % i))
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3171 self.assertEqual(u'Sébastien^'.encode('latin-1'),
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3172 DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence/1/StudyDescription' % i))
51 264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3173
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3174
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3175 def test_modify_sequence(self):
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3176 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID']
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3177 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence' % i))
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3178
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3179 j = DoPost(_REMOTE, '/instances/%s/modify' % i,
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3180 json.dumps({
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3181 "Replace" : {
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3182 "PatientName" : "hello",
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3183 'ReferencedStudySequence': GenerateTestSequence(),
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3184 },
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3185 }),
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3186 'application/json')
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3187 j = DoPost(_REMOTE, '/instances', j, 'application/dicom')['ID']
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3188 DoDelete(_REMOTE, '/instances/%s' % i)
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3189
52 7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3190 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence' % j)))
7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3191
7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3192
7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3193 def test_compression(self):
7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3194 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3195
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3196 aa = DoGet(_REMOTE, '/instances/%s/attachments/' % i)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3197 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3198 # This file has no pixel data, so "dicom-until-pixel-data" is not stored
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3199 self.assertEqual(1, len(aa))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3200 self.assertTrue('dicom' in aa)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3201 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3202 self.assertEqual(2, len(aa))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3203 self.assertTrue('dicom' in aa)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3204 self.assertTrue('dicom-as-json' in aa)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3205
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3206 data = DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom/data' % i)[1]
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3207
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3208 # If "StorageCompression" is enabled in the Orthanc to be
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3209 # tested, uncompress the attachment before running the test
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3210 if DoGet(_REMOTE, '/instances/%s/attachments/dicom/is-compressed' % i) != 0:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3211 DoPost(_REMOTE, '/instances/%s/attachments/dicom/uncompress' % i)
52 7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3212
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3213 cs = int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3214 us = int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3215 size = int(DoGet(_REMOTE, '/instances/%s/attachments/dicom/size' % i))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3216 md5 = DoGet(_REMOTE, '/instances/%s/attachments/dicom/md5' % i)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3217 self.assertEqual(data, DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom/compressed-data' % i)[1])
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3218 self.assertEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom/compressed-md5' % i))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3219 self.assertEqual(size, int(DoGet(_REMOTE, '/instances/%s/attachments/dicom/compressed-size' % i)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3220
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3221 ops = DoGet(_REMOTE, '/instances/%s/attachments/dicom' % i)
52 7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3222 self.assertTrue('compress' in ops)
7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3223 self.assertTrue('uncompress' in ops)
7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3224 self.assertTrue('is-compressed' in ops)
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3225 self.assertEqual(0, DoGet(_REMOTE, '/instances/%s/attachments/dicom/is-compressed' % i))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3226 DoPost(_REMOTE, '/instances/%s/attachments/dicom/verify-md5' % i)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3227
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3228 # Re-compress the attachment
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3229 DoPost(_REMOTE, '/instances/%s/attachments/dicom/compress' % i)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3230 DoPost(_REMOTE, '/instances/%s/attachments/dicom/verify-md5' % i)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3231 self.assertEqual(1, DoGet(_REMOTE, '/instances/%s/attachments/dicom/is-compressed' % i))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3232 self.assertGreater(cs, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3233 self.assertEqual(us, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3234 self.assertGreater(len(data), len(DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom/compressed-data' % i)[1]))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3235 self.assertGreater(size, int(DoGet(_REMOTE, '/instances/%s/attachments/dicom/compressed-size' % i)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3236 self.assertEqual(size, int(DoGet(_REMOTE, '/instances/%s/attachments/dicom/size' % i)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3237 self.assertEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom/md5' % i))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3238 self.assertNotEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom/compressed-md5' % i))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3239
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3240 DoPost(_REMOTE, '/instances/%s/attachments/dicom/uncompress' % i)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3241 DoPost(_REMOTE, '/instances/%s/attachments/dicom/verify-md5' % i)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3242 self.assertEqual(0, DoGet(_REMOTE, '/instances/%s/attachments/dicom/is-compressed' % i))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3243 self.assertEqual(data, DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom/compressed-data' % i)[1])
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3244 self.assertEqual(size, int(DoGet(_REMOTE, '/instances/%s/attachments/dicom/compressed-size' % i)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3245 self.assertEqual(size, int(DoGet(_REMOTE, '/instances/%s/attachments/dicom/size' % i)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3246 self.assertEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom/md5' % i))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3247 self.assertEqual(md5, DoGet(_REMOTE, '/instances/%s/attachments/dicom/compressed-md5' % i))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3248 self.assertEqual(cs, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3249 self.assertEqual(us, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']))
53 e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3250
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3251
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3252 def test_ordered_slices(self):
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3253 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3254 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3255 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s)
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3256 self.assertEqual('Sequence', o['Type'])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3257 self.assertEqual(1, len(o['Dicom']))
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3258 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/file', o['Dicom'][0])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3259 self.assertEqual(76, len(o['Slices']))
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3260 for j in range(76):
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3261 self.assertEqual('/instances/9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02/frames/%d' % j, o['Slices'][j])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3262
68 a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3263 self.assertEqual(1, len(o['SlicesShort']))
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3264 self.assertEqual('9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02', o['SlicesShort'][0][0])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3265 self.assertEqual(0, o['SlicesShort'][0][1])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3266 self.assertEqual(76, o['SlicesShort'][0][2])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3267
53 e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3268 i = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3269 j = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')['ID']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3270 k = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm')['ID']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3271 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3272 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s)
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3273
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3274 self.assertEqual('Volume', o['Type'])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3275 self.assertEqual(3, len(o['Dicom']))
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3276 self.assertEqual(3, len(o['Slices']))
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3277 self.assertEqual('/instances/%s/file' % i, o['Dicom'][2])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3278 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3279 self.assertEqual('/instances/%s/file' % k, o['Dicom'][0])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3280 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][2])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3281 self.assertEqual('/instances/%s/frames/0' % j, o['Slices'][1])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3282 self.assertEqual('/instances/%s/frames/0' % k, o['Slices'][0])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3283
68 a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3284 self.assertEqual(3, len(o['SlicesShort']))
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3285 self.assertEqual(k, o['SlicesShort'][0][0])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3286 self.assertEqual(0, o['SlicesShort'][0][1])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3287 self.assertEqual(1, o['SlicesShort'][0][2])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3288 self.assertEqual(j, o['SlicesShort'][1][0])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3289 self.assertEqual(0, o['SlicesShort'][1][1])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3290 self.assertEqual(1, o['SlicesShort'][1][2])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3291 self.assertEqual(i, o['SlicesShort'][2][0])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3292 self.assertEqual(0, o['SlicesShort'][2][1])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3293 self.assertEqual(1, o['SlicesShort'][2][2])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3294
53 e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3295 i = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3296 j = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0002.dcm')['ID']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3297 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3298 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s)
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3299
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3300 self.assertEqual('Sequence', o['Type'])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3301 self.assertEqual(2, len(o['Dicom']))
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3302 self.assertEqual(2, len(o['Slices']))
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3303 self.assertEqual('/instances/%s/file' % i, o['Dicom'][0])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3304 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3305 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][0])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3306 self.assertEqual('/instances/%s/frames/0' % j, o['Slices'][1])
54 c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3307
68 a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3308 self.assertEqual(2, len(o['SlicesShort']))
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3309 self.assertEqual(i, o['SlicesShort'][0][0])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3310 self.assertEqual(0, o['SlicesShort'][0][1])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3311 self.assertEqual(1, o['SlicesShort'][0][2])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3312 self.assertEqual(j, o['SlicesShort'][1][0])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3313 self.assertEqual(0, o['SlicesShort'][1][1])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3314 self.assertEqual(1, o['SlicesShort'][1][2])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3315
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3316
54 c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3317
c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3318 def test_incoming_movescu_accession(self):
c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3319 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3320
137 412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	3321 # No matching patient, so no job is created
54 c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3322 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3323 CallMoveScu([ '--study', '-k', '0008,0052=STUDY', '-k', 'AccessionNumber=nope' ])
c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3324 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3325 CallMoveScu([ '--study', '-k', '0008,0052=PATIENT', '-k', 'AccessionNumber=A10003245599' ])
c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3326 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
137 412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	3327
412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	3328 # 1 Matching patient, track the job
138 0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	3329 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	3330 '--study',
0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	3331 '-k', '0008,0052=STUDY',
0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	3332 '-k', 'AccessionNumber=A10003245599'
0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	3333 ])))
137 412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	3334
54 c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3335 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3336
55 a395fd51cc4f test_dicom_to_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 54 diff changeset	3337
a395fd51cc4f test_dicom_to_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 54 diff changeset	3338 def test_dicom_to_json(self):
a395fd51cc4f test_dicom_to_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 54 diff changeset	3339 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID']
60 cd3c7f70f139 test backward compatibility with Orthanc 0.9.4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	3340 j = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID']
cd3c7f70f139 test backward compatibility with Orthanc 0.9.4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	3341
cd3c7f70f139 test backward compatibility with Orthanc 0.9.4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	3342 t = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
cd3c7f70f139 test backward compatibility with Orthanc 0.9.4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	3343 with open(GetDatabasePath('PrivateMDNTagsSimplify.json'), 'r') as f:
80 8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	3344 self.assertTrue(CompareTags(t, json.loads(f.read()), [
123 ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	3345 # Tags for compatibility with DCMTK 3.6.0
ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	3346 'RETIRED_OtherPatientIDs',
ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	3347 'OtherPatientIDs',
ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	3348 'ACR_NEMA_2C_VariablePixelDataGroupLength',
80 8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	3349 ]))
55 a395fd51cc4f test_dicom_to_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 54 diff changeset	3350
a395fd51cc4f test_dicom_to_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 54 diff changeset	3351 t = DoGet(_REMOTE, '/instances/%s/tags' % i)
a395fd51cc4f test_dicom_to_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 54 diff changeset	3352 with open(GetDatabasePath('PrivateMDNTagsFull.json'), 'r') as f:
87 4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3353 self.assertTrue(CompareTags(t, json.loads(f.read()), [
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3354 ]))
55 a395fd51cc4f test_dicom_to_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 54 diff changeset	3355
60 cd3c7f70f139 test backward compatibility with Orthanc 0.9.4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	3356 t = DoGet(_REMOTE, '/instances/%s/tags?simplify' % j)
cd3c7f70f139 test backward compatibility with Orthanc 0.9.4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	3357 with open(GetDatabasePath('PrivateTagsSimplify.json'), 'r') as f:
80 8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	3358 self.assertTrue(CompareTags(t, json.loads(f.read()), [
8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	3359 ]))
60 cd3c7f70f139 test backward compatibility with Orthanc 0.9.4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	3360
372 e9b03d8f3b78 fix for DCMTK 3.6.6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 369 diff changeset	3361
e9b03d8f3b78 fix for DCMTK 3.6.6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 369 diff changeset	3362 # NB: To get the actual value of the "tags" JSON file, use the
e9b03d8f3b78 fix for DCMTK 3.6.6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 369 diff changeset	3363 # following command:
e9b03d8f3b78 fix for DCMTK 3.6.6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 369 diff changeset	3364 # $ curl http://alice:orthanctest@localhost:8042/instances/d29ead49-43e8601d-72f1e922-7de676ee-ea77c2b4/tags
60 cd3c7f70f139 test backward compatibility with Orthanc 0.9.4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	3365 t = DoGet(_REMOTE, '/instances/%s/tags' % j)
cd3c7f70f139 test backward compatibility with Orthanc 0.9.4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	3366 with open(GetDatabasePath('PrivateTagsFull.json'), 'r') as f:
cd3c7f70f139 test backward compatibility with Orthanc 0.9.4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	3367 a = json.loads(f.read())
378 a4b8450a1158 fix test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 377 diff changeset	3368
a4b8450a1158 fix test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 377 diff changeset	3369 # Starting with Orthanc 1.9.1, the DICOM-as-JSON
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3370 # reports are truncated starting with PixelData
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3371 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3372 self.assertFalse('7fe1,0010' in t)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3373 self.assertFalse('7fe1,1001' in t)
378 a4b8450a1158 fix test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 377 diff changeset	3374 del a['7fe1,0010']
a4b8450a1158 fix test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 377 diff changeset	3375 del a['7fe1,1001']
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3376 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3377 self.assertTrue('7fe1,0010' in t)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3378 self.assertTrue('7fe1,1001' in t)
378 a4b8450a1158 fix test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 377 diff changeset	3379
65 09fc27e0899a patch for testing windows builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 64 diff changeset	3380 aa = json.dumps(a).replace('2e+022', '2e+22')
372 e9b03d8f3b78 fix for DCMTK 3.6.6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 369 diff changeset	3381 tt = (json.dumps(t)
e9b03d8f3b78 fix for DCMTK 3.6.6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 369 diff changeset	3382 .replace('2e+022', '2e+22')
e9b03d8f3b78 fix for DCMTK 3.6.6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 369 diff changeset	3383 # The "IllegalPrivatePixelSequence" tag was introduced in DCMTK 3.6.6 dictionary
e9b03d8f3b78 fix for DCMTK 3.6.6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 369 diff changeset	3384 .replace('IllegalPrivatePixelSequence', 'Unknown Tag & Data'))
65 09fc27e0899a patch for testing windows builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 64 diff changeset	3385 self.assertEqual(aa, tt)
57 784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3386
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3387
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3388 def test_batch_archive(self):
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3389 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3390 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3391 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3392 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0002.dcm')
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3393 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3394 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3395 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3396 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm')
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3397
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3398 s = DoPost(_REMOTE, '/tools/create-archive', [ ])
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3399 z = zipfile.ZipFile(StringIO(s), "r")
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3400 self.assertEqual(0, len(z.namelist()))
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3401
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3402 # One patient
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3403 s = DoPost(_REMOTE, '/tools/create-archive', [ 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' ])
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3404 z = zipfile.ZipFile(StringIO(s), "r")
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3405 self.assertEqual(4, len(z.namelist()))
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3406
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3407 # One patient + twice its study + one series from other patient
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3408 s = DoPost(_REMOTE, '/tools/create-archive', [
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3409 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17',
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3410 '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918',
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3411 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0'
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3412 ])
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3413 z = zipfile.ZipFile(StringIO(s), "r")
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3414 self.assertEqual(6, len(z.namelist()))
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3415
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3416 # One patient + one series + one instance
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3417 s = DoPost(_REMOTE, '/tools/create-archive', [
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3418 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17',
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3419 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0',
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3420 '1d429ccb-bdcc78a1-7d129d6a-ba4966ed-fe4dbd87'
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3421 ])
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3422 z = zipfile.ZipFile(StringIO(s), "r")
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3423 self.assertEqual(7, len(z.namelist()))
59 84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3424
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	3425 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2):
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	3426 s = DoGet(_REMOTE, '/tools/create-archive?resources=ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17,1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0,1d429ccb-bdcc78a1-7d129d6a-ba4966ed-fe4dbd87')
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	3427 z = zipfile.ZipFile(StringIO(s), "r")
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	3428 self.assertEqual(7, len(z.namelist()))
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	3429
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	3430
59 84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3431
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3432 def test_decode_brainix_as_jpeg(self):
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3433 i = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID']
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3434
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3435 j = GetImage(_REMOTE, '/instances/%s/preview' % i)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3436 self.assertEqual('PNG', j.format)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3437 self.assertEqual(j.size[0], 256)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3438 self.assertEqual(j.size[1], 256)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3439
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3440 j = GetImage(_REMOTE, '/instances/%s/preview' % i, headers = { 'Accept' : '/' })
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3441 self.assertEqual('PNG', j.format)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3442
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3443 j = GetImage(_REMOTE, '/instances/%s/preview' % i, headers = { 'Accept' : 'image/*' })
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3444 self.assertEqual('PNG', j.format)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3445
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3446 j = GetImage(_REMOTE, '/instances/%s/preview' % i, headers = { 'Accept' : 'image/png' })
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3447 self.assertEqual('PNG', j.format)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3448
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3449 j = GetImage(_REMOTE, '/instances/%s/preview' % i, headers = { 'Accept' : 'image/jpeg' })
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3450 self.assertEqual('JPEG', j.format)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3451 self.assertEqual(j.size[0], 256)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3452 self.assertEqual(j.size[1], 256)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3453
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3454 a = len(DoGet(_REMOTE, '/instances/%s/preview?quality=50' % i, headers = { 'Accept' : 'image/jpeg' }))
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3455 b = len(DoGet(_REMOTE, '/instances/%s/preview' % i, headers = { 'Accept' : 'image/jpeg' }))
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3456 self.assertLess(a, b)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3457
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3458 j = GetImage(_REMOTE, '/instances/%s/image-uint8' % i, headers = { 'Accept' : 'image/jpeg' })
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3459 self.assertEqual('JPEG', j.format)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3460
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3461 # 16bit encoding is not supported with JPEG
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3462 self.assertRaises(Exception, lambda: GetImage(_REMOTE, '/instances/%s/image-uint16' % i, headers = { 'Accept' : 'image/jpeg' }))
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3463 self.assertRaises(Exception, lambda: GetImage(_REMOTE, '/instances/%s/image-int16' % i, headers = { 'Accept' : 'image/jpeg' }))
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3464
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3465 # No matching content type
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3466 self.assertRaises(Exception, lambda: GetImage(_REMOTE, '/instances/%s/preview' % i, headers = { 'Accept' : 'application/pdf' }))
69 83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3467
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3468
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3469
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3470 def test_media_encodings(self):
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3471 ascii = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3472 latin1 = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID']
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3473 latin2 = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID']
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3474
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3475 tmp = DoPost(_REMOTE, '/tools/create-media', [ascii,latin1,latin2])
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3476 z = zipfile.ZipFile(StringIO(tmp), "r")
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3477
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3478 self.assertEqual(4, len(z.namelist()))
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3479 self.assertTrue('IMAGES/IM0' in z.namelist())
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3480 self.assertTrue('IMAGES/IM1' in z.namelist())
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3481 self.assertTrue('IMAGES/IM2' in z.namelist())
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3482 self.assertTrue('DICOMDIR' in z.namelist())
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3483
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3484 try:
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3485 os.remove('/tmp/DICOMDIR')
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3486 except:
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3487 # The file does not exist
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3488 pass
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3489
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3490 z.extract('DICOMDIR', '/tmp')
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3491 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ],
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3492 stderr = subprocess.STDOUT).split('\n')
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3493
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3494 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ],
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3495 stderr = subprocess.STDOUT).split('\n')
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3496 self.assertEqual(1, len(a))
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3497 self.assertEqual('', a[0])
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3498
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3499 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ])
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3500 self.assertTrue(re.search('1.3.46.670589.11.17521.5.0.3124.2008081908590448738', a) != None)
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3501 self.assertTrue(re.search('1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114333648576', a) != None)
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3502 self.assertTrue(re.search('1.2.826.0.1.3680043.2.1569.1.4.323026757.1700.1399452091.57', a) != None)
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3503
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3504 os.remove('/tmp/DICOMDIR')
71 48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3505
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3506
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3507 def test_findscu_counters(self):
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3508 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm')
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3509 UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0001.dcm')
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3510 UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0002.dcm')
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3511
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3512 i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', 'NumberOfPatientRelatedStudies' ])
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3513 s = re.findall('$0020,1200$.?\[(.?)\]', i)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3514 self.assertEqual(1, len(s))
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3515 self.assertTrue('1 ' in s)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3516
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3517 i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', 'NumberOfPatientRelatedSeries' ])
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3518 s = re.findall('$0020,1202$.?\[(.?)\]', i)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3519 self.assertEqual(1, len(s))
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3520 self.assertTrue('2 ' in s)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3521
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3522 i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', 'NumberOfPatientRelatedInstances' ])
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3523 s = re.findall('$0020,1204$.?\[(.?)\]', i)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3524 self.assertEqual(1, len(s))
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3525 self.assertTrue('3 ' in s)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3526
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3527 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'NumberOfStudyRelatedSeries' ])
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3528 s = re.findall('$0020,1206$.?\[(.?)\]', i)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3529 self.assertEqual(1, len(s))
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3530 self.assertTrue('2 ' in s)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3531
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3532 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'NumberOfStudyRelatedInstances' ])
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3533 s = re.findall('$0020,1208$.?\[(.?)\]', i)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3534 self.assertEqual(1, len(s))
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3535 self.assertTrue('3 ' in s)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3536
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3537 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'NumberOfSeriesRelatedInstances' ])
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3538 s = re.findall('$0020,1209$.?\[(.?)\]', i)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3539 self.assertEqual(2, len(s))
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3540 self.assertTrue('1 ' in s)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3541 self.assertTrue('2 ' in s)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3542
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3543 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'ModalitiesInStudy' ])
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3544 s = re.findall('$0008,0061$.?\[(.?)\]', i)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3545 self.assertEqual(1, len(s))
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3546 t = map(lambda x: x.strip(), s[0].split('\\'))
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3547 self.assertTrue('PT' in t)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3548 self.assertTrue('CT' in t)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3549
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3550 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'SOPClassesInStudy' ])
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3551 s = re.findall('$0008,0062$.?\[(.?)\]', i)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3552 self.assertEqual(1, len(s))
176 48cc188ffb09 strip trailing 0 char that appears with some findscu versions am@osimis.io parents: 175 diff changeset	3553 t = map(lambda x: x.strip('\x00'), s[0].split('\\'))
71 48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3554 self.assertTrue('1.2.840.10008.5.1.4.1.1.2' in t)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3555 self.assertTrue('1.2.840.10008.5.1.4.1.1.128' in t)
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3556
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3557
78 b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3558 def test_decode_transfer_syntax(self):
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3559 def Check(t, md5):
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3560 i = UploadInstance(_REMOTE, 'TransferSyntaxes/%s.dcm' % t)['ID']
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3561
89 74b7b9aed5f8 test TransferSyntax metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	3562 if t != '1.2.840.10008.1.2': # This file has no meta header
74b7b9aed5f8 test TransferSyntax metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	3563 transferSyntax = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i)
74b7b9aed5f8 test TransferSyntax metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	3564 self.assertEqual(t, transferSyntax)
74b7b9aed5f8 test TransferSyntax metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	3565
78 b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3566 if md5 == None:
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3567 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/preview' % i))
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3568 else:
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3569 m = ComputeMD5(DoGet(_REMOTE, '/instances/%s/preview' % i))
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3570 self.assertEqual(m, md5)
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3571
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3572 Check('1.2.840.10008.1.2.1', 'fae08d5415c4c0cd2cdbae4522408631')
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3573 Check('1.2.840.10008.1.2.2', 'f3d9784768b8feb54d6a50b6d5c37682')
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3574 Check('1.2.840.10008.1.2.4.51', 'ccbe75909fe5c9f7361b48416a53fc41')
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3575 Check('1.2.840.10008.1.2.4.57', '7bbefe11d976b1be4e568915c6a82fc3')
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3576 Check('1.2.840.10008.1.2.4.70', '7132cfbc457305b04b59787030c785d2')
384 9a41306c1fe5 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 383 diff changeset	3577 Check('1.2.840.10008.1.2.5', '6ff51ae525d362e0d04f550a64075a0e') # RLE, supported since Orthanc 1.0.1
9a41306c1fe5 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 383 diff changeset	3578 Check('1.2.840.10008.1.2', 'd54aed9f67a100984b42942cc2e9939b')
9a41306c1fe5 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 383 diff changeset	3579
9a41306c1fe5 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 383 diff changeset	3580 # The 3 checks below don't work on big-endian
9a41306c1fe5 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 383 diff changeset	3581 Check('1.2.840.10008.1.2.4.50', '496326046974eea718dbc16b997c646b') # TODO - Doesn't work with GDCM 3.0.7 alone
78 b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3582 Check('1.2.840.10008.1.2.4.80', '6ff51ae525d362e0d04f550a64075a0e')
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3583 Check('1.2.840.10008.1.2.4.81', '801579ae7cbf28e604ea74f2c99fa2ca')
299 c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	3584
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	3585 # JPEG2k image, not supported without GDCM plugin
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	3586 if not HasGdcmPlugin(_REMOTE):
299 c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	3587 Check('1.2.840.10008.1.2.4.90', None)
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	3588 Check('1.2.840.10008.1.2.4.91', None)
79 962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3589
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3590
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3591 def test_raw_frame(self):
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3592 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID']
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3593 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s)))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3594 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s)
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3595 self.assertEqual(512 * 512 * 2, len(a))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3596 self.assertEqual(512 * 512 * 2, len(DoGet(_REMOTE, '/instances/%s/frames/23/raw' % s)))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3597 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/raw' % s))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3598 self.assertEqual('1914287dc4d958eca21fdaacfb3482fa', ComputeMD5(a))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3599
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3600 s = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID']
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3601 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % s)))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3602 self.assertEqual(186274, len(DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s)))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3603 self.assertEqual(189424, len(DoGet(_REMOTE, '/instances/%s/frames/75/raw' % s)))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3604 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/76/raw' % s))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3605 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s)
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3606 self.assertEqual("L", im.mode)
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3607 self.assertEqual(512, im.size[0])
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3608 self.assertEqual(512, im.size[1])
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3609
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3610 # Test an image with 2 JPEG frames spread over multiple fragments
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3611 s = UploadInstance(_REMOTE, 'LenaTwiceWithFragments.dcm')['ID']
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3612 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/frames' % s)))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3613 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s)
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3614 b = DoGet(_REMOTE, '/instances/%s/frames/1/raw' % s)
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3615 self.assertEqual(69214, len(a))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3616 self.assertEqual(ComputeMD5(a), ComputeMD5(b))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3617 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/2/raw' % s))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3618 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s)
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3619 self.assertEqual("RGB", im.mode)
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3620 self.assertEqual(512, im.size[0])
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3621 self.assertEqual(512, im.size[1])
323 fbf5bdebbba7 comment Sebastien Jodogne <s.jodogne@gmail.com> parents: 322 diff changeset	3622 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % s) # TODO - Doesn't work with GDCM 3.0.7 alone
79 962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3623 self.assertEqual("RGB", im.mode)
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3624 self.assertEqual(512, im.size[0])
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3625 self.assertEqual(512, im.size[1])
81 5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3626
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3627
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3628
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3629 def test_rest_movescu(self):
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3630 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3631
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3632 # Upload 4 instances
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3633 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3634 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm')
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3635 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3636 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3637
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3638 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3639 for p in DoGet(_REMOTE, '/patients'):
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3640 DoPost(_REMOTE, '/modalities/orthanctest/store', p)
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3641 DoDelete(_REMOTE, '/patients/%s' % p)
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3642
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3643 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3644
482 535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3645 # Move instance Brainix/Flair/IM-0001-0001.dcm
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3646 DoPost(_REMOTE, '/modalities/orthanctest/move', {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3647 'Level' : 'Instance',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3648 'Resources' : [
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3649 {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3650 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3651 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3652 'SOPInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314079549',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3653 }
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3654 ]})
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3655
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3656 # Move series Brainix/Flair/*
81 5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3657 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3658 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3659 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3660 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3661
482 535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3662 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1):
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3663 # Reset and test asynchronous C-Move at instance level
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3664 for p in DoGet(_REMOTE, '/patients'):
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3665 DoDelete(_REMOTE, '/patients/%s' % p)
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3666
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3667 DoPost(_REMOTE, '/modalities/orthanctest/move', {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3668 'Level' : 'Instance',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3669 'Resources' : [
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3670 {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3671 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3672 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3673 'SOPInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314079549',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3674 }
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3675 ],
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3676 'Asynchronous': True
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3677 })
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3678
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3679 job = MonitorJob2(_REMOTE, lambda: DoPost
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3680 (_REMOTE, '/modalities/orthanctest/move', {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3681 'Level' : 'Instance',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3682 'Resources' : [
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3683 {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3684 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3685 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3686 'SOPInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314079549',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3687 }
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3688 ],
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3689 'Asynchronous': True
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3690 }))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3691
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3692 self.assertNotEqual(None, job)
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3693
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3694 # check the job was successfull
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3695 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3696 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3697 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3698 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3699
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3700 # check the job content
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3701 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content']
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3702 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', jobContent['Query'][0]['0020,000d'])
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3703 self.assertEqual('1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497', jobContent['Query'][0]['0020,000e'])
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3704 self.assertEqual('1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314079549', jobContent['Query'][0]['0008,0018'])
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3705
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3706 # Reset and test synchronous C-Move at series level
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3707 for p in DoGet(_REMOTE, '/patients'):
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3708 DoDelete(_REMOTE, '/patients/%s' % p)
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3709
81 5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3710 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series',
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3711 'Resources' : [
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3712 {
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3713 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775',
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3714 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497',
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3715 }
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3716 ]})
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3717 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3718 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3719 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3720 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3721
482 535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3722 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1):
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3723 # Reset and test asynchronous C-Move at series level with additional PatientID filter
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3724 for p in DoGet(_REMOTE, '/patients'):
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3725 DoDelete(_REMOTE, '/patients/%s' % p)
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3726
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3727 job = MonitorJob2(_REMOTE, lambda: DoPost
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3728 (_REMOTE, '/modalities/orthanctest/move', {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3729 'Level' : 'Series',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3730 'Resources' : [
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3731 {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3732 'PatientID' : '5Yp0E',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3733 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3734 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3735 }
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3736 ],
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3737 'Asynchronous': True
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3738 }))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3739
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3740 self.assertNotEqual(None, job)
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3741
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3742 # check the job was successfull
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3743 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3744 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3745 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3746 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3747
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3748 # check the job content
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3749 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content']
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3750 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', jobContent['Query'][0]['0020,000d'])
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3751 self.assertEqual('1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497', jobContent['Query'][0]['0020,000e'])
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3752 self.assertEqual('5Yp0E', jobContent['Query'][0]['0010,0020'])
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3753
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3754 # Move series Brainix/Epi/*
81 5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3755 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series',
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3756 'Resources' : [
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3757 {
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3758 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775',
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3759 'SeriesInstanceUID' : '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314125550',
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3760 }
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3761 ]})
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3762 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3763 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3764 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3765 self.assertEqual(3, len(DoGet(_REMOTE, '/instances')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3766
482 535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3767 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1):
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3768 # Move study Knee asynchronously
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3769 job = MonitorJob2(_REMOTE, lambda: DoPost
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3770 (_REMOTE, '/modalities/orthanctest/move', {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3771 'Level' : 'Study',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3772 'Resources' : [
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3773 {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3774 'StudyInstanceUID' : '2.16.840.1.113669.632.20.121711.10000160881'
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3775 }
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3776 ],
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3777 'Asynchronous': True
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3778 }))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3779
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3780 self.assertNotEqual(None, job)
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3781
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3782 # check the job was successfull
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3783 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3784 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3785 self.assertEqual(3, len(DoGet(_REMOTE, '/series')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3786 self.assertEqual(4, len(DoGet(_REMOTE, '/instances')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3787
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3788 # check the job content
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3789 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content']
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3790 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', jobContent['Query'][0]['0020,000d'])
81 5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3791
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3792 # Reset
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3793 for p in DoGet(_REMOTE, '/patients'):
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3794 DoDelete(_REMOTE, '/patients/%s' % p)
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3795
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3796 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3797
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3798
482 535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3799 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1):
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3800 # Move all at once asynchronously at PatientLevel
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3801 job = MonitorJob2(_REMOTE, lambda: DoPost(_REMOTE, '/modalities/orthanctest/move',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3802 {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3803 'Level' : 'Patient',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3804 'Resources' : [
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3805 {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3806 'PatientID' : '5Yp0E',
81 5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3807 },
482 535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3808 {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3809 'PatientID': '887',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3810 'PatientName' : 'KNEE',
81 5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3811 }
482 535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3812 ],
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3813 'Synchronous': False
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3814 }))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3815
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3816 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3817 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3818 self.assertEqual(3, len(DoGet(_REMOTE, '/series')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3819 self.assertEqual(4, len(DoGet(_REMOTE, '/instances')))
81 5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3820
86 0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3821
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3822
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3823 def test_reconstruct_json(self):
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3824 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3825
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3826 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3827 first = DoGet(_REMOTE, '/instances/%s/tags' % instance)
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3828
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3829 self.assertEqual('TWINOW', first['0008,1010']['Value'])
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3830
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3831 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3832 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3833 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3834 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance)))
86 0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3835
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3836 # Cannot delete the "DICOM" attachment
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3837 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/instances/%s/attachments/dicom' % instance))
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3838
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3839 # Can delete the "DICOM as JSON" attachment
392 5cbcb4a83b41 fix for revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 391 diff changeset	3840 if not IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
5cbcb4a83b41 fix for revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 391 diff changeset	3841 r = DoDelete(_REMOTE, '/instances/%s/attachments/dicom-as-json' % instance)
5cbcb4a83b41 fix for revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 391 diff changeset	3842 self.assertTrue(type(r) is dict and len(r) == 0)
86 0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3843
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3844 # Only the "DICOM" attachment subsists
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3845 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance)))
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3846
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3847 # Cannot manually reconstruct the "DICOM as JSON" attachment
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3848 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/patients/%s/attachments/dicom-as-json' % patient, 'hello'))
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3849
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3850 # Transparently reconstruct the "DICOM as JSON" attachment
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3851 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json' % instance))
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3852 second = DoGet(_REMOTE, '/instances/%s/tags' % instance)
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3853 self.assertEqual(str(first), str(second))
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3854
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3855 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3856 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3857 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3858 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3859 third = DoGet(_REMOTE, '/instances/%s/attachments/dicom-as-json/data' % instance)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3860 self.assertEqual(str(first), str(third))
87 4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3861
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3862
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3863 def test_reconstruct_json2(self):
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3864 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3865
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3866 a = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3867 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')['ID']
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3868
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3869 self.assertEqual('BRAINIX', DoGet(_REMOTE, '/instances/%s/tags?simplify' % a)['PatientName'])
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3870 self.assertEqual('KNEE', DoGet(_REMOTE, '/instances/%s/tags?simplify' % b)['PatientName'])
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3871
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3872 aa = DoGet(_REMOTE, '/instances/%s/attachments' % a)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3873 bb = DoGet(_REMOTE, '/instances/%s/attachments' % b)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3874
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3875 if not IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3876 self.assertEqual(2, len(aa))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3877 self.assertEqual(aa, bb)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3878 self.assertTrue('dicom' in aa)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3879 self.assertTrue('dicom-as-json' in aa)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3880 elif IsDicomUntilPixelDataStored(_REMOTE):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3881 self.assertEqual(2, len(aa))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3882 self.assertEqual(aa, bb)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3883 self.assertTrue('dicom' in aa)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3884 self.assertTrue('dicom-until-pixel-data' in aa)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3885 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3886 self.assertEqual(1, len(aa))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3887 self.assertEqual(aa, bb)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3888 self.assertTrue('dicom' in aa)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3889
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3890 # In Orthanc <= 1.9.0, this call deletes "dicom-as-json"
87 4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3891 DoPost(_REMOTE, '/tools/invalidate-tags', '', 'text/plain')
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3892
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3893 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1) and IsDicomUntilPixelDataStored(_REMOTE):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3894 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % a)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3895 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % b)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3896 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3897 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % a)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3898 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % b)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3899
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3900 # In Orthanc <= 1.9.0, this call reconstructs "dicom-as-json"
87 4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3901 self.assertEqual('BRAINIX', DoGet(_REMOTE, '/instances/%s/tags?simplify' % a)['PatientName'])
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3902 self.assertEqual('KNEE', DoGet(_REMOTE, '/instances/%s/tags?simplify' % b)['PatientName'])
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3903
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3904 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1) and not IsDicomUntilPixelDataStored(_REMOTE):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3905 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % a)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3906 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % b)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3907 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3908 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % a)))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3909 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % b)))
87 4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3910
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3911
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3912 def test_private_tags(self):
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3913 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID']
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3914 t = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3915 self.assertEqual('1.2.840.113704.1.111.6320.1342451261.21', t['PET-CT Multi Modality Name'])
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3916 self.assertEqual('p37s0_na_ctac.img', t['Original Image Filename'])
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3917
92 dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3918
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3919 def test_findscu_encoding(self):
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3920 # Check out ../Database/Encodings/Generate.sh
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3921 TEST = u'Test-éüäöòДΘĝדصķћ๛ﾈİ'
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3922 ENCODINGS = {
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3923 'Arabic' : [ 'ISO_IR 127' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3924 'Ascii' : [ 'ISO_IR 6' ], # More accurately, ISO 646
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3925 'Cyrillic' : [ 'ISO_IR 144' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3926 'Greek' : [ 'ISO_IR 126' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3927 'Hebrew' : [ 'ISO_IR 138' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3928 'Japanese' : [ 'ISO_IR 13', 'shift-jis' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3929 'Latin1' : [ 'ISO_IR 100' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3930 'Latin2' : [ 'ISO_IR 101' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3931 'Latin3' : [ 'ISO_IR 109' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3932 'Latin4' : [ 'ISO_IR 110' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3933 'Latin5' : [ 'ISO_IR 148' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3934 'Thai' : [ 'ISO_IR 166', 'tis-620' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3935 'Utf8' : [ 'ISO_IR 192' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3936 }
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3937
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3938 for name in ENCODINGS.iterkeys():
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3939 if len(ENCODINGS[name]) == 1:
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3940 ENCODINGS[name].append(name.lower())
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3941
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3942 UploadInstance(_REMOTE, 'Encodings/Lena-utf8.dcm')
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3943
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3944 for name in ENCODINGS.iterkeys():
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3945 self.assertEqual(name, DoPut(_REMOTE, '/tools/default-encoding', name))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3946 self.assertEqual(name, DoGet(_REMOTE, '/tools/default-encoding'))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3947
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3948 i = CallFindScu([ '-k', '0008,0052=STUDY',
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3949 '-k', 'SpecificCharacterSet',
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3950 '-k', 'PatientName' ])
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3951
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3952 characterSet = re.findall('$0008,0005$.?\[(.?)\]', i)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3953 self.assertEqual(1, len(characterSet))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3954 self.assertEqual(ENCODINGS[name][0], characterSet[0].strip())
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3955
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3956 patientName = re.findall('$0010,0010$.?\[(.?)\]', i)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3957 self.assertEqual(1, len(patientName))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3958
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3959 expected = TEST.encode(ENCODINGS[name][1], 'ignore')
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3960 self.assertEqual(expected, patientName[0].strip())
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3961
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3962
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3963 #for master in ENCODINGS:
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3964 for master in [ 'Latin1', 'Utf8', 'Cyrillic' ]: # Shortcut to speedup tests
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3965 self.assertEqual(master, DoPut(_REMOTE, '/tools/default-encoding', master))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3966 self.assertEqual(master, DoGet(_REMOTE, '/tools/default-encoding'))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3967
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3968 for name in ENCODINGS:
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3969 DropOrthanc(_REMOTE)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3970 UploadInstance(_REMOTE, 'Encodings/Lena-%s.dcm' % ENCODINGS[name][1])
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3971
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3972 i = CallFindScu([ '-k', '0008,0052=STUDY',
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3973 '-k', 'PatientID',
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3974 '-k', 'SpecificCharacterSet',
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3975 '-k', 'PatientName' ])
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3976 i = i.decode(ENCODINGS[master][1])
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3977
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3978 characterSet = re.findall('$0008,0005$.?\[(.?)\]', i)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3979 self.assertEqual(1, len(characterSet))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3980 self.assertEqual(ENCODINGS[master][0], characterSet[0].strip())
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3981
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3982 patientId = re.findall('$0010,0020$.?\[(.?)\]', i)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3983 self.assertEqual(1, len(patientId))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3984 self.assertEqual(ENCODINGS[name][1], patientId[0].strip())
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3985
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3986 patientName = re.findall('$0010,0010$.?\[(.?)\]', i)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3987 self.assertEqual(1, len(patientName))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3988
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3989 tmp = ENCODINGS[name][1]
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3990 expected = TEST.encode(tmp, 'ignore').decode(tmp)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3991 tmp = ENCODINGS[master][1]
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3992 expected = expected.encode(tmp, 'ignore').decode(tmp)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3993
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3994 self.assertEqual(expected, patientName[0].strip())
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3995
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3996
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3997 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True,
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3998 'Level' : 'Study',
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3999 'Query' : { }})
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	4000 self.assertEqual(1, len(a))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	4001
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	4002 tmp = ENCODINGS[name][1]
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	4003 self.assertEqual(TEST.encode(tmp, 'ignore').decode(tmp), a[0]["PatientMainDicomTags"]["PatientName"])
96 272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4004
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4005
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4006 def test_reconstruct(self):
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4007 def CompareMainDicomTag(expected, instance, level, tag):
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4008 self.assertEqual(expected, DoGet(_REMOTE, '/instances/%s/%s' % (instance, level))['MainDicomTags'][tag].strip())
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4009
504 16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4010 originalInstanceId = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
96 272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4011
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4012 studies = DoGet(_REMOTE, '/studies/')
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4013 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/')))
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4014 self.assertEqual(1, len(studies))
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4015 self.assertEqual(1, len(DoGet(_REMOTE, '/series/')))
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4016 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/')))
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4017
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4018 modified = DoPost(_REMOTE, '/studies/%s/modify' % studies[0], {
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4019 "Replace" : {
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4020 "StudyDescription" : "hello",
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4021 "SeriesDescription" : "world",
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4022 "SOPClassUID" : "test",
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4023 "SOPInstanceUID" : "myid",
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4024 },
119 7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	4025 "Keep" : [ "StudyInstanceUID", "SeriesInstanceUID" ],
7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	4026 "Force" : True
96 272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4027 })
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4028
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4029 instances = DoGet(_REMOTE, '/instances/')
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4030 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/')))
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4031 self.assertEqual(1, len(DoGet(_REMOTE, '/studies/')))
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4032 self.assertEqual(1, len(DoGet(_REMOTE, '/series/')))
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4033 self.assertEqual(2, len(instances))
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	4034
504 16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4035 modifiedInstanceId = instances[0] if instances[1] == originalInstanceId else instances[1]
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4036
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4037 # in 1.11.3, we have added an automatic reconstruction at the end of the modification
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4038 if not IsOrthancVersionAbove(_REMOTE, 1, 11, 3):
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4039 CompareMainDicomTag('Knee (R)', originalInstanceId, 'study', 'StudyDescription')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4040 CompareMainDicomTag('AX. FSE PD', originalInstanceId, 'series', 'SeriesDescription')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4041 CompareMainDicomTag('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', originalInstanceId, '', 'SOPInstanceUID')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4042 CompareMainDicomTag('myid', modifiedInstanceId, '', 'SOPInstanceUID')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4043 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % originalInstanceId).strip())
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4044 self.assertEqual('test', DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % modifiedInstanceId).strip())
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4045
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4046 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4047 # metadata before reconstruct
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4048 mba = DoGet(_REMOTE, '/instances/%s/metadata?expand' % originalInstanceId)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4049 mbb = DoGet(_REMOTE, '/instances/%s/metadata?expand' % originalInstanceId)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4050
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4051 # reconstruct by taking the new instance as the reference -> should repopulate study fields from this instance tags
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4052 DoPost(_REMOTE, '/instances/%s/reconstruct' % modifiedInstanceId, {})
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4053
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4054 CompareMainDicomTag('hello', originalInstanceId, 'study', 'StudyDescription')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4055 CompareMainDicomTag('world', originalInstanceId, 'series', 'SeriesDescription')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4056 CompareMainDicomTag('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', originalInstanceId, '', 'SOPInstanceUID')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4057
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4058 if not IsOrthancVersionAbove(_REMOTE, 1, 11, 3):
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4059 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4060 # metadata after reconstruct should have been preserved
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4061 maa = DoGet(_REMOTE, '/instances/%s/metadata?expand' % originalInstanceId)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4062 mab = DoGet(_REMOTE, '/instances/%s/metadata?expand' % originalInstanceId)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4063
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4064 self.assertEqual(mba, maa)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	4065 self.assertEqual(mbb, mab)
473 4ee85b016a40 added NewTests framework - only the Housekeeper tests right now Alain Mazy <am@osimis.io> parents: 472 diff changeset	4066
4ee85b016a40 added NewTests framework - only the Housekeeper tests right now Alain Mazy <am@osimis.io> parents: 472 diff changeset	4067
503 138d5efd4407 added test_rle_planar_configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 502 diff changeset	4068 @unittest.skip("httpbin.org is down as of 2022-12-22") # TODO
104 7530eb50c3c4 renamed HttpPost.lua into HttpClient.lua + fix tests amazy parents: 102 diff changeset	4069 def test_httpClient_lua(self):
496 f78f7ee6b660 fix httpclient Alain Mazy <am@osimis.io> parents: 490 diff changeset	4070 retries = 4
463 29aaa3df718f added verbosity and retries for test sometimes failing on CI Alain Mazy <am@osimis.io> parents: 457 diff changeset	4071 result = ''
29aaa3df718f added verbosity and retries for test sometimes failing on CI Alain Mazy <am@osimis.io> parents: 457 diff changeset	4072
104 7530eb50c3c4 renamed HttpPost.lua into HttpClient.lua + fix tests amazy parents: 102 diff changeset	4073 with open(GetDatabasePath('Lua/HttpClient.lua'), 'r') as f:
496 f78f7ee6b660 fix httpclient Alain Mazy <am@osimis.io> parents: 490 diff changeset	4074 scriptContent = f.read()
463 29aaa3df718f added verbosity and retries for test sometimes failing on CI Alain Mazy <am@osimis.io> parents: 457 diff changeset	4075 # retry since this test sometimes fails if httpbin.org is unresponsive
29aaa3df718f added verbosity and retries for test sometimes failing on CI Alain Mazy <am@osimis.io> parents: 457 diff changeset	4076 while retries > 0 and not ('OK' in result):
496 f78f7ee6b660 fix httpclient Alain Mazy <am@osimis.io> parents: 490 diff changeset	4077 print("Executing lua script HttpClient.lua")
f78f7ee6b660 fix httpclient Alain Mazy <am@osimis.io> parents: 490 diff changeset	4078 result = DoPost(_REMOTE, '/tools/execute-script', scriptContent, 'application/lua')
463 29aaa3df718f added verbosity and retries for test sometimes failing on CI Alain Mazy <am@osimis.io> parents: 457 diff changeset	4079 retries -= 1
102 9671578fd4d3 added tests for Lua HttpPost/Put/Get/Delete methods amazy parents: 100 diff changeset	4080
9671578fd4d3 added tests for Lua HttpPost/Put/Get/Delete methods amazy parents: 100 diff changeset	4081 self.assertIn('OK', result)
107 fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4082
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4083
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4084 def test_bitbucket_issue_44(self):
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	4085 # https://bugs.orthanc-server.com/show_bug.cgi?id=44
107 fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4086 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm')
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4087 UploadInstance(_REMOTE, 'Issue44/Monochrome2.dcm')
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4088
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4089 # dcmcjpeg +ua +eb Monochrome1.dcm Monochrome1-Jpeg.dcm
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4090 UploadInstance(_REMOTE, 'Issue44/Monochrome1-Jpeg.dcm')
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4091
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4092 # dcmcjpeg +ua Monochrome1.dcm Monochrome1-JpegLS.dcm
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4093 UploadInstance(_REMOTE, 'Issue44/Monochrome1-JpegLS.dcm')
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4094
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4095 monochrome1 = 'bcdd600a-a6a9c522-5f0a6e84-8657c9f3-b76e59b7'
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4096 monochrome1_jpeg = '9df82121-208a2da8-0038674a-3d7a773b-b7008cd2'
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4097 monochrome1_jpegls = '0486d1a2-9165573f-b1976b20-e927b016-6b8d67ab'
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4098 monochrome2 = 'f00947b7-f61f7164-c93414d1-c6fbda6a-9e92ed20'
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4099
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4100 for i in [ monochrome1, monochrome1_jpeg, monochrome1_jpegls ]:
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4101 im = GetImage(_REMOTE, '/instances/%s/preview' % i)
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4102 self.assertEqual("L", im.mode)
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4103 self.assertEqual(2010, im.size[0])
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4104 self.assertEqual(2446, im.size[1])
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4105
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4106 # This is the chest image, with MONOCHROME1. Raw background is
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4107 # white (255), should be rendered as black (0) => invert
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4108 if i == monochrome1_jpeg:
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4109 # Add some tolerance because of JPEG destructive compression
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4110 self.assertGreater(10, im.getpixel((0,0)))
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4111 else:
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4112 self.assertEqual(0, im.getpixel((0,0)))
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4113
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4114 im = GetImage(_REMOTE, '/instances/%s/preview' % monochrome2)
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4115 self.assertEqual("L", im.mode)
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4116 self.assertEqual(1572, im.size[0])
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4117 self.assertEqual(2010, im.size[1])
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4118
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4119 # This is the key image, with MONOCHROME2. Raw background is
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4120 # white (255), should be rendered as white (255)
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4121 self.assertEqual(255, im.getpixel((0,0)))
111 7005cdeeb704 test_bitbucket_issue_42 Sebastien Jodogne <s.jodogne@gmail.com> parents: 107 diff changeset	4122
7005cdeeb704 test_bitbucket_issue_42 Sebastien Jodogne <s.jodogne@gmail.com> parents: 107 diff changeset	4123
7005cdeeb704 test_bitbucket_issue_42 Sebastien Jodogne <s.jodogne@gmail.com> parents: 107 diff changeset	4124 def test_bitbucket_issue_42(self):
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	4125 # https://bugs.orthanc-server.com/show_bug.cgi?id=42
123 ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	4126 # This test fails on DCMTK 3.6.0, but succeeds in DCMTK 3.6.1 snapshots and DCMTK 3.6.2
111 7005cdeeb704 test_bitbucket_issue_42 Sebastien Jodogne <s.jodogne@gmail.com> parents: 107 diff changeset	4127 UploadInstance(_REMOTE, 'Issue42.dcm')['ID']
7005cdeeb704 test_bitbucket_issue_42 Sebastien Jodogne <s.jodogne@gmail.com> parents: 107 diff changeset	4128 modified = DoPost(_REMOTE,
7005cdeeb704 test_bitbucket_issue_42 Sebastien Jodogne <s.jodogne@gmail.com> parents: 107 diff changeset	4129 '/patients/da128605-e040d0c4-310615d2-3475da63-df2d1ef4/modify',
119 7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	4130 '{"Replace":{"PatientID":"Hello","PatientName":"Sample patient name"},"Force":true}',
111 7005cdeeb704 test_bitbucket_issue_42 Sebastien Jodogne <s.jodogne@gmail.com> parents: 107 diff changeset	4131 'application/json')
7005cdeeb704 test_bitbucket_issue_42 Sebastien Jodogne <s.jodogne@gmail.com> parents: 107 diff changeset	4132 self.assertTrue('PatientID' in modified)
113 3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4133
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4134
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4135 def test_rest_find_limit(self):
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4136 # Check the "Since" and "Limit" parameters in URI "/tools/find"
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	4137 # Related to issue 53: https://bugs.orthanc-server.com/show_bug.cgi?id=53
111 7005cdeeb704 test_bitbucket_issue_42 Sebastien Jodogne <s.jodogne@gmail.com> parents: 107 diff changeset	4138
113 3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4139 # Upload 6 instances
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4140 brainix = []
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4141 knee = []
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4142 for i in range(2):
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4143 brainix.append(UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) ['ID'])
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4144 brainix.append(UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) ['ID'])
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4145 knee.append(UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) ['ID'])
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4146
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4147 # Check using BRAINIX
667 44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4148 # The tests below correspond to "isSimpleLookup_ == true" in "ResourceFinder"
113 3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4149 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4150 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4151 'Limit' : 10 })
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4152 self.assertEqual(4, len(a))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4153
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4154 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4155 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4156 'Limit' : 4 })
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4157 self.assertEqual(4, len(a))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4158
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4159 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4160 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4161 'Since' : 2,
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4162 'Limit' : 4 })
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4163 self.assertEqual(2, len(a))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4164
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4165 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4166 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4167 'Limit' : 3 })
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4168 self.assertEqual(3, len(a))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4169
665 e024ba9e7768 extended test_rest_find_limit Sebastien Jodogne <s.jodogne@gmail.com> parents: 664 diff changeset	4170 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
e024ba9e7768 extended test_rest_find_limit Sebastien Jodogne <s.jodogne@gmail.com> parents: 664 diff changeset	4171 'Query' : { 'PatientName' : 'B*' },
e024ba9e7768 extended test_rest_find_limit Sebastien Jodogne <s.jodogne@gmail.com> parents: 664 diff changeset	4172 'Limit' : 0 }) # This is an arbitrary convention
e024ba9e7768 extended test_rest_find_limit Sebastien Jodogne <s.jodogne@gmail.com> parents: 664 diff changeset	4173 self.assertEqual(4, len(a))
e024ba9e7768 extended test_rest_find_limit Sebastien Jodogne <s.jodogne@gmail.com> parents: 664 diff changeset	4174
113 3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4175 b = []
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4176 for i in range(4):
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4177 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4178 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4179 'Limit' : 1,
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4180 'Since' : i })
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4181 self.assertEqual(1, len(a))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4182 b.append(a[0])
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4183
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4184 # Check whether the two sets are equal through symmetric difference
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4185 self.assertEqual(0, len(set(b) ^ set(brainix)))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4186
665 e024ba9e7768 extended test_rest_find_limit Sebastien Jodogne <s.jodogne@gmail.com> parents: 664 diff changeset	4187 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
e024ba9e7768 extended test_rest_find_limit Sebastien Jodogne <s.jodogne@gmail.com> parents: 664 diff changeset	4188 'Query' : { 'PatientName' : 'B*' },
e024ba9e7768 extended test_rest_find_limit Sebastien Jodogne <s.jodogne@gmail.com> parents: 664 diff changeset	4189 'Limit' : 1,
e024ba9e7768 extended test_rest_find_limit Sebastien Jodogne <s.jodogne@gmail.com> parents: 664 diff changeset	4190 'Since' : 4 })
e024ba9e7768 extended test_rest_find_limit Sebastien Jodogne <s.jodogne@gmail.com> parents: 664 diff changeset	4191 self.assertEqual(0, len(a))
e024ba9e7768 extended test_rest_find_limit Sebastien Jodogne <s.jodogne@gmail.com> parents: 664 diff changeset	4192
113 3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4193 # Check using KNEE
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4194 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4195 'Query' : { 'PatientName' : 'K*' },
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4196 'Limit' : 10 })
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4197 self.assertEqual(2, len(a))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4198
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4199 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4200 'Query' : { 'PatientName' : 'K*' },
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4201 'Limit' : 2 })
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4202 self.assertEqual(2, len(a))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4203
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4204 b = []
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4205 for i in range(2):
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4206 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4207 'Query' : { 'PatientName' : 'K*' },
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4208 'Limit' : 1,
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4209 'Since' : i })
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4210 self.assertEqual(1, len(a))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4211 b.append(a[0])
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4212
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4213 self.assertEqual(0, len(set(b) ^ set(knee)))
115 45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4214
667 44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4215 # Now test "isSimpleLookup_ == false"
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4216 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4217 'Query' : { 'PatientPosition' : '*' }})
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4218 self.assertEqual(3, len(a))
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4219
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4220 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4221 'Query' : { 'PatientPosition' : '*' },
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4222 'Limit' : 0})
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4223 self.assertEqual(3, len(b))
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4224 self.assertEqual(a[0], b[0])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4225 self.assertEqual(a[1], b[1])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4226 self.assertEqual(a[2], b[2])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4227
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4228 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4229 'Query' : { 'PatientPosition' : '*' },
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4230 'Limit' : 1})
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4231 self.assertEqual(1, len(b))
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4232 self.assertEqual(a[0], b[0])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4233
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4234 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4235 'Query' : { 'PatientPosition' : '*' },
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4236 'Since' : 0,
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4237 'Limit' : 1})
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4238 self.assertEqual(1, len(b))
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4239 self.assertEqual(a[0], b[0])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4240
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4241 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4242 'Query' : { 'PatientPosition' : '*' },
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4243 'Since' : 0,
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4244 'Limit' : 3})
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4245 self.assertEqual(3, len(b))
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4246 self.assertEqual(a[0], b[0])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4247 self.assertEqual(a[1], b[1])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4248 self.assertEqual(a[2], b[2])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4249
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4250 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4251 'Query' : { 'PatientPosition' : '*' },
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4252 'Since' : 0,
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4253 'Limit' : 4})
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4254 self.assertEqual(3, len(b))
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4255 self.assertEqual(a[0], b[0])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4256 self.assertEqual(a[1], b[1])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4257 self.assertEqual(a[2], b[2])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4258
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4259 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4260 'Query' : { 'PatientPosition' : '*' },
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4261 'Since' : 1,
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4262 'Limit' : 1})
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4263 self.assertEqual(1, len(b))
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4264 self.assertEqual(a[1], b[0])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4265
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4266 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4267 'Query' : { 'PatientPosition' : '*' },
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4268 'Since' : 1,
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4269 'Limit' : 2})
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4270 self.assertEqual(2, len(b))
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4271 self.assertEqual(a[1], b[0])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4272 self.assertEqual(a[2], b[1])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4273
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4274 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4275 'Query' : { 'PatientPosition' : '*' },
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4276 'Since' : 1,
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4277 'Limit' : 3})
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4278 self.assertEqual(2, len(b))
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4279 self.assertEqual(a[1], b[0])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4280 self.assertEqual(a[2], b[1])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4281
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4282 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4283 'Query' : { 'PatientPosition' : '*' },
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4284 'Since' : 2,
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4285 'Limit' : 1})
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4286 self.assertEqual(1, len(b))
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4287 self.assertEqual(a[2], b[0])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4288
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4289 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4290 'Query' : { 'PatientPosition' : '*' },
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4291 'Since' : 2,
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4292 'Limit' : 2})
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4293 self.assertEqual(1, len(b))
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4294 self.assertEqual(a[2], b[0])
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4295
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4296 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4297 'Query' : { 'PatientPosition' : '*' },
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4298 'Since' : 3,
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4299 'Limit' : 1})
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4300 self.assertEqual(0, len(b))
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4301
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4302 b = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4303 'Query' : { 'PatientPosition' : '*' },
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4304 'Since' : 3,
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4305 'Limit' : 10})
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4306 self.assertEqual(0, len(b))
44405af8cfc5 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 666 diff changeset	4307
115 45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4308
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4309 def test_bitbucket_issue_46(self):
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4310 # "PHI remaining after anonymization"
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	4311 # https://bugs.orthanc-server.com/show_bug.cgi?id=46
115 45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4312
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4313 def GetAnonymizedTags(study, version):
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4314 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4315 { 'DicomVersion' : version },
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4316 'application/json') ['ID']
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4317 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized)
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4318 self.assertEqual(1, len(a))
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4319
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4320 instance = a[0]['ID']
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4321
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4322 return (instance, DoGet(_REMOTE, '/instances/%s/tags' % instance))
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4323
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4324 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm')
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4325 origStudy = '6068a14b-d4df27af-9ec22145-538772d8-74f228ff'
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4326
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4327 # Add the 0032,1033 (Requesting Service) and the 0010,1060
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4328 # (Patient's Mother's Birth Name) tags
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4329 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy,
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4330 '{"Replace":{"0010,1060":"OSIMIS","0032,1033":"MOTHER"}}',
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4331 'application/json')['ID']
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4332
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4333 # Use Table E.1-1 from PS 3.15-2008
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4334 # https://raw.githubusercontent.com/jodogne/dicom-specification/master/2008/08_15pu.pdf
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4335 (instance, tags) = GetAnonymizedTags(newStudy, "2008")
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4336 self.assertTrue('0032,1033' in tags)
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4337 self.assertTrue('0010,1060' in tags)
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4338
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4339 # Use Table E.1-1 from PS 3.15-2011 (only if Orthanc >= 1.2.1)
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4340 # https://raw.githubusercontent.com/jodogne/dicom-specification/master/2008/08_15pu.pdf
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4341 (instance, tags) = GetAnonymizedTags(newStudy, "2017c")
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4342 self.assertFalse('0032,1033' in tags)
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4343 self.assertFalse('0010,1060' in tags)
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4344
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4345 t = {}
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4346 for (key, value) in tags.iteritems():
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4347 t[value['Name']] = value['Value']
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4348
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4349 self.assertEqual('', t['StudyDate']) # Type 1 tag => cleared
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4350 self.assertEqual('', t['StudyTime']) # Type 1 tag => cleared
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4351 self.assertEqual('', t['PatientSex']) # Type 1 tag => cleared
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4352 self.assertFalse('SeriesDate' in t) # Type 3 tag => null
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4353 self.assertFalse('SeriesTime' in t) # Type 3 tag => null
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4354
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4355 with tempfile.NamedTemporaryFile(delete = True) as f:
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4356 # Run "dciodvfy" on the anonymized file to be sure it is still valid
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4357 f.write(DoGet(_REMOTE, '/instances/%s/file' % instance))
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4358 f.flush()
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4359 subprocess.check_output([ FindExecutable('dciodvfy'), f.name ],
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4360 stderr = subprocess.STDOUT).split('\n')
118 a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4361
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4362
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4363 def test_bitbucket_issue_55(self):
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4364 def Run(modify, query):
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4365 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4366
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4367 operation = 'modify' if modify else 'anonymize'
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4368
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4369 self.assertRaises(Exception, lambda: DoPost(
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4370 _REMOTE, '/studies/%s/%s' % (study, operation), query))
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4371 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4372
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4373 query["Force"] = True
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4374 a = DoPost(_REMOTE, '/studies/%s/%s' % (study, operation), query)['Path']
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4375 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4376 DoDelete(_REMOTE, a)
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4377
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4378 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4379
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4380 UploadInstance(_REMOTE, 'DummyCT.dcm')
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4381 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0'
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4382
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4383 Run(True, { "Replace" : { "StudyInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4384 Run(True, { "Replace" : { "SeriesInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4385 Run(True, { "Replace" : { "SOPInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4386
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4387 Run(False, { "Keep" : [ "StudyInstanceUID" ]})
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4388 Run(False, { "Keep" : [ "SeriesInstanceUID" ]})
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4389 Run(False, { "Keep" : [ "SOPInstanceUID" ]})
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4390
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4391 Run(False, { "Replace" : { "StudyInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4392 Run(False, { "Replace" : { "SeriesInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4393 Run(False, { "Replace" : { "SOPInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4394
120 fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4395
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4396 def test_bitbucket_issue_56(self):
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4397 # Case-insensitive matching over accents. This test assumes
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4398 # that the "CaseSensitivePN" configuration option of Orthanc
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4399 # is set to "false" (default value).
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	4400 # https://bugs.orthanc-server.com/show_bug.cgi?id=56
120 fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4401
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4402 def Check(name, expected, expectedSensitive):
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4403 a = CallFindScu([ '-k', '0008,0005=ISO_IR 192', # Use UTF-8
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4404 '-k', '0008,0052=PATIENT',
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4405 '-k', 'PatientName=%s' % name ])
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4406 patientNames = re.findall('$0010,0010$.?\[(.?)\]', a)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4407 self.assertEqual(expected, len(patientNames))
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4408
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4409 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4410 'CaseSensitive' : False,
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4411 'Query' : { 'PatientName' : name }})
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4412 self.assertEqual(expected, len(a))
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4413
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4414 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4415 'CaseSensitive' : True,
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4416 'Query' : { 'PatientName' : name }})
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4417 self.assertEqual(expectedSensitive, len(a))
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4418
533 c5291d97ed54 fix Alain Mazy <am@osimis.io> parents: 531 diff changeset	4419 # SpecificCharacterSet = ISO_IR 100 (Latin1), PatientName=Test-éüäöò
120 fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4420 UploadInstance(_REMOTE, 'Encodings/Lena-latin1.dcm')
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4421
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4422 # WildcardConstraint
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4423 Check('TeSt*', 1, 0)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4424 Check('TeSt-a*', 0, 0)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4425 Check('TeSt-É*', 1, 0)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4426 Check('TeSt-é*', 1, 0)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4427 Check('Test-é*', 1, 1)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4428
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4429 # ListConstraint
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4430 Check('Test-éüäöò\\nope', 1, 1)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4431 Check('Test-ÉÜÄÖÒ\\nope', 1, 0)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4432
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4433 # ValueConstraint
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4434 Check('Test-éüäöò', 1, 1)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4435 Check('Test-ÉÜÄÖÒ', 1, 0)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4436
125 15e4dc0a5810 test_gbk_alias Sebastien Jodogne <s.jodogne@gmail.com> parents: 124 diff changeset	4437
15e4dc0a5810 test_gbk_alias Sebastien Jodogne <s.jodogne@gmail.com> parents: 124 diff changeset	4438 def test_gbk_alias(self):
15e4dc0a5810 test_gbk_alias Sebastien Jodogne <s.jodogne@gmail.com> parents: 124 diff changeset	4439 # https://groups.google.com/d/msg/orthanc-users/WMM8LMbjpUc/02-1f_yFCgAJ
15e4dc0a5810 test_gbk_alias Sebastien Jodogne <s.jodogne@gmail.com> parents: 124 diff changeset	4440 # This test fails on Orthanc <= 1.3.0
15e4dc0a5810 test_gbk_alias Sebastien Jodogne <s.jodogne@gmail.com> parents: 124 diff changeset	4441 i = UploadInstance(_REMOTE, '2017-09-19-GBK-Tumashu.dcm')['ID']
15e4dc0a5810 test_gbk_alias Sebastien Jodogne <s.jodogne@gmail.com> parents: 124 diff changeset	4442 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
15e4dc0a5810 test_gbk_alias Sebastien Jodogne <s.jodogne@gmail.com> parents: 124 diff changeset	4443 self.assertEqual(tags['PatientName'], u'徐浩凯')
15e4dc0a5810 test_gbk_alias Sebastien Jodogne <s.jodogne@gmail.com> parents: 124 diff changeset	4444 self.assertEqual(tags['InstitutionName'], u'灌云县疾病预防控制中心')
126 6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4445
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4446
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4447 def test_long_tag(self):
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4448 i = UploadInstance(_REMOTE, 'DummyCTWithLongTag.dcm')['ID']
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4449 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe'
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4450
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4451 tags = DoGet(_REMOTE, '/instances/%s/tags' % i)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4452 self.assertTrue('0018,1020' in tags)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4453 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4454 self.assertEqual('TooLong', tags['0018,1020']['Type'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4455 self.assertEqual(None, tags['0018,1020']['Value'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4456
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4457 tags = DoGet(_REMOTE, '/instances/%s/tags?ignore-length=0018-1020' % i)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4458 self.assertTrue('0018,1020' in tags)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4459 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4460 self.assertEqual('String', tags['0018,1020']['Type'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4461 self.assertTrue(tags['0018,1020']['Value'].startswith('Lorem ipsum dolor sit amet'))
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4462
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4463 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4464 self.assertTrue('SoftwareVersions' in tags)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4465 self.assertEqual(None, tags['SoftwareVersions'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4466 self.assertTrue('HeartRate' in tags)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4467 self.assertEqual(474, int(tags['HeartRate']))
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4468
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4469 tags = DoGet(_REMOTE, '/instances/%s/simplified-tags' % i)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4470 self.assertTrue('SoftwareVersions' in tags)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4471 self.assertEqual(None, tags['SoftwareVersions'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4472
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4473 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify&ignore-length=0018-1020' % i)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4474 self.assertTrue('SoftwareVersions' in tags)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4475 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet'))
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4476
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4477 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify&ignore-length=SoftwareVersions' % i)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4478 self.assertTrue('SoftwareVersions' in tags)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4479 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet'))
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4480
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4481 tags = DoGet(_REMOTE, '/series/%s/instances-tags' % series)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4482 self.assertEqual(1, len(tags))
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4483 self.assertTrue(i in tags.keys())
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4484 self.assertTrue('0018,1020' in tags[i])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4485 self.assertEqual('TooLong', tags[i]['0018,1020']['Type'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4486
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4487 tags = DoGet(_REMOTE, '/series/%s/instances-tags?ignore-length=SoftwareVersions' % series)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4488 self.assertEqual(1, len(tags))
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4489 self.assertTrue(i in tags.keys())
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4490 self.assertTrue('0018,1020' in tags[i])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4491 self.assertEqual('String', tags[i]['0018,1020']['Type'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4492 self.assertTrue(tags[i]['0018,1020']['Value'].startswith('Lorem ipsum dolor sit amet'))
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4493
127 1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4494
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4495 def test_extended_media(self):
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4496 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4497
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4498 z = GetArchive(_REMOTE, '/patients/%s/media?extended' % DoGet(_REMOTE, '/patients')[0])
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4499 self.assertEqual(2, len(z.namelist()))
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4500 self.assertTrue('IMAGES/IM0' in z.namelist())
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4501 self.assertTrue('DICOMDIR' in z.namelist())
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4502
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4503 try:
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4504 os.remove('/tmp/DICOMDIR')
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4505 except:
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4506 # The file does not exist
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4507 pass
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4508
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4509 z.extract('DICOMDIR', '/tmp')
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4510 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ],
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4511 stderr = subprocess.STDOUT).split('\n')
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4512 self.assertEqual(5, len(a))
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4513 self.assertTrue(a[0].startswith('Warning'))
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4514 self.assertEqual('BasicDirectory', a[1])
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4515 self.assertTrue('not present in standard DICOM IOD' in a[2])
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4516 self.assertTrue('not present in standard DICOM IOD' in a[3])
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4517 self.assertEqual('', a[4])
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4518
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4519 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ],
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4520 stderr = subprocess.STDOUT).split('\n')
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4521 self.assertEqual(1, len(a))
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4522 self.assertEqual('', a[0])
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4523
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4524 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ])
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4525 self.assertTrue(re.search('1.3.46.670589.11.17521.5.0.3124.2008081908590448738', a) != None)
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4526
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4527 # Check the presence of the series description (extended tag)
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4528 self.assertTrue(re.search('T1W_aTSE', a) != None)
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4529
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4530 os.remove('/tmp/DICOMDIR')
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4531
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4532
132 149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4533 def test_anonymize_relationships_1(self):
133 f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4534 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4535 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')
132 149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4536 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4537
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4538 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4539 '{}',
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4540 'application/json')['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4541
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4542 a = DoGet(_REMOTE, '/studies/%s/instances' % study)
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4543 self.assertEqual(2, len(a))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4544 a1 = a[0]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4545 a2 = a[1]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4546
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4547 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized)
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4548 self.assertEqual(2, len(b))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4549 b1 = b[0]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4550 b2 = b[1]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4551
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4552 SEQUENCE = '/instances/%s/content/ReferencedImageSequence'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4553 SOP = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPInstanceUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4554 CLASS = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPClassUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4555 FRAME = '/instances/%s/content/FrameOfReferenceUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4556
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4557 self.assertEqual(DoGet(_REMOTE, FRAME % a1),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4558 DoGet(_REMOTE, FRAME % a2))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4559 self.assertEqual(DoGet(_REMOTE, FRAME % b1),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4560 DoGet(_REMOTE, FRAME % b2))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4561 self.assertNotEqual(DoGet(_REMOTE, FRAME % a1),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4562 DoGet(_REMOTE, FRAME % b1))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4563 self.assertNotEqual(DoGet(_REMOTE, FRAME % a2),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4564 DoGet(_REMOTE, FRAME % b2))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4565
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4566 self.assertEqual(3, len(DoGet(_REMOTE, SEQUENCE % a1)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4567 self.assertEqual(3, len(DoGet(_REMOTE, SEQUENCE % a2)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4568 self.assertEqual(3, len(DoGet(_REMOTE, SEQUENCE % b1)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4569 self.assertEqual(3, len(DoGet(_REMOTE, SEQUENCE % b2)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4570
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4571 for i in range(3):
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4572 self.assertEqual(DoGet(_REMOTE, SOP % (a1, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4573 DoGet(_REMOTE, SOP % (a2, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4574 self.assertEqual(DoGet(_REMOTE, SOP % (b1, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4575 DoGet(_REMOTE, SOP % (b2, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4576 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4577 DoGet(_REMOTE, SOP % (b1, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4578 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4579 DoGet(_REMOTE, SOP % (b2, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4580 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4581 DoGet(_REMOTE, CLASS % (b1, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4582 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4583 DoGet(_REMOTE, CLASS % (b2, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4584
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4585
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4586 def test_anonymize_relationships_2(self):
133 f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4587 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm')
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4588 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0002.dcm')
132 149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4589 study = '6c65289b-db2fcb71-7eaf73f4-8e12470c-a4d6d7cf'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4590
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4591 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4592 '{}',
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4593 'application/json')['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4594
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4595 a = DoGet(_REMOTE, '/studies/%s/instances' % study)
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4596 self.assertEqual(2, len(a))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4597 a1 = a[0]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4598 a2 = a[1]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4599
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4600 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized)
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4601 self.assertEqual(2, len(b))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4602 b1 = b[0]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4603 b2 = b[1]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4604
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4605 SEQUENCE = '/instances/%s/content/SourceImageSequence'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4606 SOP = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPInstanceUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4607 CLASS = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPClassUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4608
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4609 self.assertEqual(1, len(DoGet(_REMOTE, SEQUENCE % a1)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4610 self.assertEqual(1, len(DoGet(_REMOTE, SEQUENCE % a2)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4611 self.assertEqual(1, len(DoGet(_REMOTE, SEQUENCE % b1)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4612 self.assertEqual(1, len(DoGet(_REMOTE, SEQUENCE % b2)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4613 self.assertEqual(DoGet(_REMOTE, SOP % (a1, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4614 DoGet(_REMOTE, SOP % (a2, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4615 self.assertEqual(DoGet(_REMOTE, SOP % (b1, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4616 DoGet(_REMOTE, SOP % (b2, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4617 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4618 DoGet(_REMOTE, SOP % (b1, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4619 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4620 DoGet(_REMOTE, SOP % (b2, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4621 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4622 DoGet(_REMOTE, CLASS % (b1, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4623 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4624 DoGet(_REMOTE, CLASS % (b2, 0)))
133 f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4625
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4626
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4627 def test_anonymize_relationships_3(self):
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4628 sr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM0')['ID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4629 mr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM631')['ID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4630 study = 'ef351eb2-c1147229-062736b8-35a151e3-e32d526b'
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4631
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4632 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4633 { "Keep" : [ "ContentSequence" ] }) ['ID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4634
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4635 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized)
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4636 self.assertEqual(2, len(a))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4637
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4638 if DoGet(_REMOTE, '/instances/%s/content/Modality' % a[0]['ID']) == 'SR':
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4639 sr2 = a[0]['ID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4640 mr2 = a[1]['ID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4641 else:
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4642 sr2 = a[1]['ID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4643 mr2 = a[0]['ID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4644
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4645 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % sr1),
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4646 DoGet(_REMOTE, '/instances/%s/content/Modality' % sr2))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4647 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % mr1),
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4648 DoGet(_REMOTE, '/instances/%s/content/Modality' % mr2))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4649
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4650 mrUid1 = DoGet(_REMOTE, '/instances/%s' % mr1)['MainDicomTags']['SOPInstanceUID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4651 mrUid2 = DoGet(_REMOTE, '/instances/%s' % mr2)['MainDicomTags']['SOPInstanceUID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4652 mrSeries1 = DoGet(_REMOTE, '/instances/%s/content/SeriesInstanceUID' % mr1).strip('\x00')
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4653 mrSeries2 = DoGet(_REMOTE, '/instances/%s/content/SeriesInstanceUID' % mr2).strip('\x00')
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4654 mrStudy1 = DoGet(_REMOTE, '/instances/%s/content/StudyInstanceUID' % mr1).strip('\x00')
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4655 mrStudy2 = DoGet(_REMOTE, '/instances/%s/content/StudyInstanceUID' % mr2).strip('\x00')
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4656
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4657 PATH1 = '/instances/%s/content/CurrentRequestedProcedureEvidenceSequence'
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4658 PATH2 = PATH1 + '/0/ReferencedSeriesSequence'
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4659 PATH3 = PATH2 + '/0/ReferencedSOPSequence'
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4660 PATH4 = PATH3 + '/0/ReferencedSOPInstanceUID'
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4661 PATH5 = PATH3 + '/0/ReferencedSOPClassUID'
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4662
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4663 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr1)))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4664 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr1)))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4665 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr1)))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4666 self.assertEqual(DoGet(_REMOTE, PATH4 % sr1), mrUid1)
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4667 self.assertEqual(mrSeries1, DoGet(_REMOTE, (PATH2 + '/0/SeriesInstanceUID') % sr1).strip('\x00'))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4668 self.assertEqual(mrStudy1, DoGet(_REMOTE, (PATH1 + '/0/StudyInstanceUID') % sr1).strip('\x00'))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4669
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4670 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr2)))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4671 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr2)))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4672 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr2)))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4673 self.assertEqual(DoGet(_REMOTE, PATH5 % sr1), DoGet(_REMOTE, PATH5 % sr2))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4674
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4675 self.assertEqual(mrUid2, DoGet(_REMOTE, PATH4 % sr2).strip('\x00'))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4676 self.assertEqual(mrSeries2, DoGet(_REMOTE, (PATH2 + '/0/SeriesInstanceUID') % sr2).strip('\x00'))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4677 self.assertEqual(mrStudy2, DoGet(_REMOTE, (PATH1 + '/0/StudyInstanceUID') % sr2).strip('\x00'))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4678
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4679 content1 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr1) ['ContentSequence']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4680 content2 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr2) ['ContentSequence']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4681 self.assertEqual(str(content1), str(content2))
141 5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4682
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4683
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4684 def test_bitbucket_issue_94(self):
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4685 # "a simple instance modification should not modify FrameOfReferenceUID + ..."
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	4686 # https://bugs.orthanc-server.com/show_bug.cgi?id=94
141 5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4687 i = UploadInstance(_REMOTE, 'Issue94.dcm')['ID']
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4688
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4689 source = DoGet(_REMOTE, '/instances/%s/attachments/dicom/data' % i)
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4690
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4691 modified = DoPost(_REMOTE, '/instances/%s/modify' % i,
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4692 { "Replace" : {"PatientID" : "toto"}, "Force": True})
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4693
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4694 anonymized = DoPost(_REMOTE, '/instances/%s/anonymize' % i)
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4695
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4696 a = ExtractDicomTags(source, [ 'FrameOfReferenceUID' ])
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4697 self.assertEqual(1, len(a))
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4698
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4699 b = ExtractDicomTags(modified, [ 'FrameOfReferenceUID' ])
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4700 self.assertEqual(1, len(b))
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4701
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4702 c = ExtractDicomTags(anonymized, [ 'FrameOfReferenceUID' ])
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4703 self.assertEqual(1, len(c))
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4704
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4705 self.assertEqual(a, b) # Modified DICOM
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4706 self.assertNotEqual(a, c) # Anonymized DICOM
143 28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4707
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4708
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4709 def test_metadata_origin(self):
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4710 # Upload using the REST API
144 7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4711 i = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
143 28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4712 self.assertEqual('RestApi', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i))
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4713 self.assertEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i))
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4714 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i))
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4715 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/metadata/CalledAET' % i))
315 0124075797cd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	4716
0124075797cd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	4717 # "HttpUsername" is empty iff "AuthenticationEnabled" is "false"
0124075797cd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	4718 self.assertTrue(DoGet(_REMOTE, '/instances/%s/metadata/HttpUsername' % i) in [ '', 'alice' ])
0124075797cd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	4719
144 7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4720 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i)
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4721 self.assertEqual('RestApi', m['Origin'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4722 self.assertEqual('', m['RemoteAET'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4723 self.assertNotEqual('', m['RemoteIP'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4724 self.assertFalse('CalledAET' in m)
315 0124075797cd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	4725 self.assertTrue('HttpUsername' in m)
0124075797cd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	4726 self.assertTrue(m['HttpUsername'] in [ '', 'alice' ])
144 7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4727
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4728 self.assertEqual('1.2.840.10008.1.2.4.91', m['TransferSyntax'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4729 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', m['SopClassUid'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4730 self.assertEqual('1', m['IndexInSeries'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4731 self.assertTrue('ReceptionDate' in m)
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4732
143 28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4733 DoDelete(_REMOTE, '/instances/%s' % i)
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4734
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4735 # Upload using the DICOM protocol
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4736 subprocess.check_call([ FindExecutable('storescu'),
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4737 _REMOTE['Server'], str(_REMOTE['DicomPort']),
144 7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4738 GetDatabasePath('Knee/T1/IM-0001-0001.dcm'),
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4739 '-xw' ]) # Propose JPEG2000
143 28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4740 self.assertEqual('DicomProtocol', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i))
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4741 self.assertEqual('STORESCU', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i))
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4742 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i))
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4743 self.assertEqual('ANY-SCP', DoGet(_REMOTE, '/instances/%s/metadata/CalledAET' % i))
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4744 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/metadata/HttpUsername' % i))
144 7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4745
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4746 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i)
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4747 self.assertEqual('DicomProtocol', m['Origin'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4748 self.assertEqual('STORESCU', m['RemoteAET'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4749 self.assertNotEqual('', m['RemoteIP'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4750 self.assertEqual('ANY-SCP', m['CalledAET'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4751 self.assertFalse('HttpUsername' in m)
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4752
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4753 self.assertEqual('1.2.840.10008.1.2.4.91', m['TransferSyntax'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4754 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', m['SopClassUid'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4755 self.assertEqual('1', m['IndexInSeries'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4756 self.assertTrue('ReceptionDate' in m)
147 ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4757
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4758
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4759 def test_lua_deadlock(self):
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4760 # Rana Asim Wajid (2018-07-14): "It does seem that the issue
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4761 # is with the lua script I'm using for conversion of images to
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4762 # JPEG2000. When the script is used with 1.4.0 the first
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4763 # instance appears to be stored and then everything just
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4764 # halts, ie Orthanc wont respond to anything after that."
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4765 # https://groups.google.com/d/msg/orthanc-users/Rc-Beb42xc8/JUgdzrmCAgAJ
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	4766 InstallLuaScriptFromPath(_REMOTE, 'Lua/Jpeg2000Conversion.lua')
147 ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4767
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4768 subprocess.check_call([ FindExecutable('storescu'),
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4769 _REMOTE['Server'], str(_REMOTE['DicomPort']),
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4770 GetDatabasePath('Brainix/Flair/IM-0001-0001.dcm'),
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4771 GetDatabasePath('Brainix/Flair/IM-0001-0002.dcm'),
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4772 ])
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4773
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4774 instances = DoGet(_REMOTE, '/instances')
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4775 self.assertEqual(2, len(instances))
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4776
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4777 t1 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[0])
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4778 t2 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[1])
175 09ca519087a1 doc am@osimis.io parents: 174 diff changeset	4779 self.assertEqual('1.2.840.10008.1.2.4.90', t1) # this will fail if libgdcm-tools is not installed
147 ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4780 self.assertEqual(t1, t2);
154 4a533d003080 test_find_group_length Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	4781
4a533d003080 test_find_group_length Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	4782
4a533d003080 test_find_group_length Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	4783 def test_find_group_length(self):
4a533d003080 test_find_group_length Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	4784 # Orthanc <= 1.4.1 fails to answer C-FIND queries that contain
4a533d003080 test_find_group_length Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	4785 # one of the Generic Group Length tags (*, 0x0000)
4a533d003080 test_find_group_length Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	4786 a = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
4a533d003080 test_find_group_length Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	4787 result = CallFindScu([ '-k', '0008,0052=STUDY', '-k', '0008,0000=80' ])
4a533d003080 test_find_group_length Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	4788 self.assertFalse('UnableToProcess' in result)
4a533d003080 test_find_group_length Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	4789 self.assertFalse('E:' in result)
179 8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4790
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4791
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4792 def test_split(self):
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4793 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4794 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
254 05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4795 knee1Sop = '1.3.46.670589.11.17521.5.0.3124.2008081908590448738'
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4796 knee2Sop = '1.3.46.670589.11.17521.5.0.3124.2008081909113806560'
179 8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4797 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4798 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4799 t2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59'
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4800
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4801 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4802 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4803
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4804 info = DoGet(_REMOTE, '/studies/%s' % study)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4805 self.assertTrue('ReferringPhysicianName' in info['MainDicomTags'])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4806
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4807 job = MonitorJob2(_REMOTE, lambda: DoPost
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4808 (_REMOTE, '/studies/%s/split' % study, {
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4809 'Series' : [ t2 ],
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4810 'Replace' : { 'PatientName' : 'Hello' },
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4811 'Remove' : [ 'ReferringPhysicianName' ],
181 911070f790e3 more checks Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	4812 'KeepSource' : False,
911070f790e3 more checks Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	4813 'Asynchronous' : True
179 8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4814 }))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4815
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4816 self.assertNotEqual(None, job)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4817
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4818 studies = set(DoGet(_REMOTE, '/studies'))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4819 self.assertEqual(2, len(studies))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4820
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4821 series = set(DoGet(_REMOTE, '/series'))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4822 self.assertEqual(2, len(series))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4823 self.assertTrue(t1 in series)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4824
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4825 study2 = DoGet(_REMOTE, '/jobs/%s' % job)['Content']['TargetStudy']
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4826 self.assertTrue(study in studies)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4827 self.assertTrue(study2 in studies)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4828
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4829 info = DoGet(_REMOTE, '/studies/%s' % study2)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4830 self.assertTrue('Hello', info['PatientMainDicomTags']['PatientName'])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4831 self.assertFalse('ReferringPhysicianName' in info['MainDicomTags'])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4832
254 05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4833 sopInstanceUids = set()
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4834 for i in DoGet(_REMOTE, '/instances?expand'):
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4835 sopInstanceUids.add(i['MainDicomTags']['SOPInstanceUID'])
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4836
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4837 self.assertTrue(knee1Sop in sopInstanceUids)
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4838
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4839 # Fails if Orthanc <= 1.5.7
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4840 self.assertFalse(knee2Sop in sopInstanceUids) # Because "KeepSource" is False
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4841
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4842 # One original instance is kept, another one is added because of the split
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4843 self.assertEqual(2, len(sopInstanceUids))
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4844
179 8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4845
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4846 def test_merge(self):
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4847 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
254 05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4848 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4849 kneeSop = '1.3.46.670589.11.17521.5.0.3124.2008081908590448738'
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4850 brainixSop = '1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314079549'
179 8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4851 knee = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4852 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4853 brainix = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988'
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4854 flair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0'
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4855
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4856 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4857 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4858
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4859 job = MonitorJob2(_REMOTE, lambda: DoPost
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4860 (_REMOTE, '/studies/%s/merge' % knee, {
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4861 'Resources' : [ brainix ],
181 911070f790e3 more checks Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	4862 'KeepSource' : True,
911070f790e3 more checks Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	4863 'Synchronous' : False
179 8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4864 }))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4865
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4866 self.assertNotEqual(None, job)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4867
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4868 studies = set(DoGet(_REMOTE, '/studies'))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4869 self.assertEqual(2, len(studies))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4870 self.assertTrue(knee in studies)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4871 self.assertTrue(brainix in studies)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4872
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4873 series = set(DoGet(_REMOTE, '/studies/%s' % knee)['Series'])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4874 self.assertTrue(t1 in series)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4875 series.remove(t1)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4876 self.assertEqual(1, len(series))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4877
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4878 instances = DoGet(_REMOTE, '/series/%s' % list(series)[0])['Instances']
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4879 self.assertEqual(1, len(instances))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4880 merged = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4881
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4882 instances = DoGet(_REMOTE, '/series/%s' % t1)['Instances']
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4883 self.assertEqual(1, len(instances))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4884 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4885
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4886 instances = DoGet(_REMOTE, '/series/%s' % flair)['Instances']
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4887 self.assertEqual(1, len(instances))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4888 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4889
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4890 tags = DoGet(_REMOTE, '/studies/%s' % knee)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4891
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4892 for key in tags['PatientMainDicomTags']:
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4893 self.assertEqual(a[key], merged[key])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4894 if (key in b and key != 'PatientSex'):
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4895 self.assertNotEqual(a[key], b[key])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4896
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4897 for key in tags['MainDicomTags']:
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4898 # Not in the patient/study module
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4899 if (not key in [ 'InstitutionName',
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4900 'RequestingPhysician',
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4901 'RequestedProcedureDescription', ]):
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4902 self.assertEqual(a[key], merged[key])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4903 if (key in b):
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4904 self.assertNotEqual(a[key], b[key])
254 05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4905
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4906 sopInstanceUids = set()
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4907 for i in DoGet(_REMOTE, '/instances?expand'):
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4908 sopInstanceUids.add(i['MainDicomTags']['SOPInstanceUID'])
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4909
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4910 self.assertTrue(kneeSop in sopInstanceUids)
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4911 self.assertTrue(brainixSop in sopInstanceUids)
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4912
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4913 # Fails if Orthanc <= 1.5.7
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4914 # The 2 original instances are kept, another one is added because of the merge
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4915 self.assertEqual(3, len(sopInstanceUids))
179 8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4916
187 770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4917
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4918 def test_async_archive(self):
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4919 # Testing the asynchronous generation of archives/medias (new
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4920 # in Orthanc 1.4.3)
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4921 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4922 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4923
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4924 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4925 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59'
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4926
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4927 job = MonitorJob2(_REMOTE, lambda: DoPost
508 ae493446336a fix tests for missing archives Alain Mazy <am@osimis.io> parents: 507 diff changeset	4928 (_REMOTE, '/series/%s/archive' % kneeT1, {
187 770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4929 'Synchronous' : False
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4930 }))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4931
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4932 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4933 self.assertEqual(1, len(z.namelist()))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4934 self.assertFalse('DICOMDIR' in z.namelist())
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4935
354 88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4936 info = DoGet(_REMOTE, '/jobs/%s' % job)
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4937 self.assertEqual(0, info['Content']['ArchiveSizeMB']) # New in Orthanc 1.8.1
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4938 self.assertEqual(1, info['Content']['InstancesCount'])
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4939 self.assertEqual(0, info['Content']['UncompressedSizeMB'])
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4940
187 770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4941 job2 = MonitorJob2(_REMOTE, lambda: DoPost
508 ae493446336a fix tests for missing archives Alain Mazy <am@osimis.io> parents: 507 diff changeset	4942 (_REMOTE, '/series/%s/media' % kneeT1, {
187 770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4943 'Synchronous' : False
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4944 }))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4945
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4946 # The archive from the first job has been replaced by the
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4947 # archive from second job (as MediaArchiveSize == 1)
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4948 self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4949
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4950 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job2)
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4951 self.assertEqual(2, len(z.namelist()))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4952 self.assertTrue('DICOMDIR' in z.namelist())
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4953
354 88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4954 info = DoGet(_REMOTE, '/jobs/%s' % job2)
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4955 self.assertEqual(0, info['Content']['ArchiveSizeMB']) # New in Orthanc 1.8.1
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4956 self.assertEqual(1, info['Content']['InstancesCount'])
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4957 self.assertEqual(0, info['Content']['UncompressedSizeMB'])
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4958
187 770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4959 job = MonitorJob2(_REMOTE, lambda: DoPost
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4960 (_REMOTE, '/tools/create-archive', {
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4961 'Synchronous' : False,
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4962 'Resources' : [ kneeT1, kneeT2 ],
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4963 }))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4964
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4965 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4966 self.assertEqual(2, len(z.namelist()))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4967 self.assertFalse('DICOMDIR' in z.namelist())
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4968
354 88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4969 info = DoGet(_REMOTE, '/jobs/%s' % job)
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4970 self.assertEqual(0, info['Content']['ArchiveSizeMB']) # New in Orthanc 1.8.1
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4971 self.assertEqual(2, info['Content']['InstancesCount'])
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4972 self.assertEqual(0, info['Content']['UncompressedSizeMB'])
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4973
187 770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4974 job = MonitorJob2(_REMOTE, lambda: DoPost
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4975 (_REMOTE, '/tools/create-media', {
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4976 'Synchronous' : False,
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4977 'Resources' : [ kneeT1, kneeT2 ],
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4978 }))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4979
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4980 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4981 self.assertEqual(3, len(z.namelist()))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4982 self.assertTrue('DICOMDIR' in z.namelist())
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4983
354 88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4984 self.assertEqual(0, info['Content']['ArchiveSizeMB']) # New in Orthanc 1.8.1
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4985 self.assertEqual(2, info['Content']['InstancesCount'])
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4986 self.assertEqual(0, info['Content']['UncompressedSizeMB'])
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4987
187 770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4988
540 ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4989 def test_archive_job_delete_output(self):
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4990 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4991 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4992 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4993
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4994 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4995 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59'
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4996
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4997 job = MonitorJob2(_REMOTE, lambda: DoPost
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4998 (_REMOTE, '/series/%s/archive' % kneeT1, {
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4999 'Synchronous' : False
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5000 }))
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5001
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5002 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5003 # delete the output
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5004 DoDelete(_REMOTE, '/jobs/%s/archive' % job)
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5005 # make sure it is not available anymore afterwards
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5006 self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job))
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5007
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5008 # repeat with another resource/job
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5009 job = MonitorJob2(_REMOTE, lambda: DoPost
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5010 (_REMOTE, '/series/%s/archive' % kneeT2, {
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5011 'Synchronous' : False
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5012 }))
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5013 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5014 # delete the output
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5015 DoDelete(_REMOTE, '/jobs/%s/archive' % job)
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5016 # make sure it is not available anymore afterwards
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5017 self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job))
572 3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5018 # job is still available
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5019 DoGet(_REMOTE, '/jobs/%s' % job)
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5020
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5021 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2):
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5022 # delete the job itself
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5023 DoDelete(_REMOTE, '/jobs/%s' % job)
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5024 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/jobs/%s' % job))
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5025
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5026 # test deletion of jobs in history
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5027 job = MonitorJob2(_REMOTE, lambda: DoPost
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5028 (_REMOTE, '/series/%s/archive' % kneeT2, {
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5029 'Synchronous' : False
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5030 }))
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5031 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5032 # delete the job itself
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5033 DoDelete(_REMOTE, '/jobs/%s' % job)
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5034 # make sure it is not available anymore afterwards (and its output is not available either)
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5035 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/jobs/%s' % job))
3a5260cc6d55 new tests for DELETE jobs Alain Mazy <am@osimis.io> parents: 557 diff changeset	5036 self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job))
540 ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5037
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	5038
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5039 def test_queries_hierarchy(self):
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5040 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5041 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5042
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5043 tags = {
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5044 'NumberOfPatientRelatedInstances' : '',
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5045 'NumberOfPatientRelatedSeries' : '',
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5046 'NumberOfPatientRelatedStudies' : '',
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5047 'NumberOfStudyRelatedInstances' : '',
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5048 'NumberOfStudyRelatedSeries' : '',
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5049 'NumberOfSeriesRelatedInstances' : '',
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5050 }
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5051
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5052 tags2 = copy.copy(tags)
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5053 tags2['PatientID'] = '887' # Only consider the "Knee" patient
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5054
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5055 patient = DoPost(_REMOTE, '/modalities/self/query', {
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5056 'Level' : 'Patient',
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5057 'Query' : tags2
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5058 }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5059
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5060 study = DoPost(_REMOTE, '/modalities/self/query', {
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5061 'Level' : 'Study',
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5062 'Query' : tags2
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5063 }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5064
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5065 series = DoPost(_REMOTE, '/modalities/self/query', {
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5066 'Level' : 'Series',
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5067 'Query' : tags2
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5068 }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5069
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5070 instance = DoPost(_REMOTE, '/modalities/self/query', {
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5071 'Level' : 'Instance',
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5072 'Query' : tags2
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5073 }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5074
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5075 p = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % patient)
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5076 self.assertEqual(1, len(p))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5077 self.assertEqual('887', p[0]['PatientID'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5078 self.assertEqual('1', p[0]['NumberOfPatientRelatedInstances'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5079 self.assertEqual('1', p[0]['NumberOfPatientRelatedSeries'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5080 self.assertEqual('1', p[0]['NumberOfPatientRelatedStudies'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5081 self.assertFalse('NumberOfStudyRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5082 self.assertFalse('NumberOfStudyRelatedSeries' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5083 self.assertFalse('NumberOfSeriesRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5084
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5085 p = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % study)
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5086 self.assertEqual(1, len(p))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5087 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', p[0]['StudyInstanceUID'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5088 self.assertEqual('1', p[0]['NumberOfStudyRelatedInstances'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5089 self.assertEqual('1', p[0]['NumberOfStudyRelatedSeries'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5090 self.assertFalse('NumberOfPatientRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5091 self.assertFalse('NumberOfPatientRelatedSeries' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5092 self.assertFalse('NumberOfPatientRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5093 self.assertFalse('NumberOfSeriesRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5094
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5095 p = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % series)
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5096 self.assertEqual(1, len(p))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5097 self.assertEqual('1.3.46.670589.11.17521.5.0.3124.2008081908564160709', p[0]['SeriesInstanceUID'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5098 self.assertEqual('1', p[0]['NumberOfSeriesRelatedInstances'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5099 self.assertFalse('NumberOfPatientRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5100 self.assertFalse('NumberOfPatientRelatedSeries' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5101 self.assertFalse('NumberOfPatientRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5102 self.assertFalse('NumberOfStudyRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5103 self.assertFalse('NumberOfStudyRelatedSeries' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5104
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5105 p = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance)
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5106 self.assertEqual(1, len(p))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5107 self.assertEqual('1.3.46.670589.11.17521.5.0.3124.2008081908590448738', p[0]['SOPInstanceUID'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5108
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5109 j = DoPost(_REMOTE, '/queries/%s/answers/0/query-studies' % patient,
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5110 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5111 self.assertEqual(DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % j),
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5112 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % study))
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5113
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5114 j = DoPost(_REMOTE, '/queries/%s/answers/0/query-series' % patient,
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5115 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5116 self.assertEqual(DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % j),
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5117 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % series))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5118
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5119 j = DoPost(_REMOTE, '/queries/%s/answers/0/query-instances' % patient,
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5120 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5121 self.assertEqual(DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % j),
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5122 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5123
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5124 j = DoPost(_REMOTE, '/queries/%s/answers/0/query-series' % study,
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5125 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5126 self.assertEqual(DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % j),
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5127 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % series))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5128
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5129 j = DoPost(_REMOTE, '/queries/%s/answers/0/query-instances' % study,
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5130 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5131 self.assertEqual(DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % j),
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5132 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5133
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5134 j = DoPost(_REMOTE, '/queries/%s/answers/0/query-instances' % series,
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5135 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5136 self.assertEqual(DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % j),
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5137 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5138
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	5139
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5140 def test_dicom_disk_size(self):
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5141 dicomSize = 0
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5142
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	5143 a = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID']
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	5144 isCompressed = (DoGet(_REMOTE, '/instances/%s/attachments/dicom/is-compressed' % a) != 0)
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5145
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5146 for i in range(2):
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5147 p = 'Knee/T%d/IM-0001-0001.dcm' % (i + 1)
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5148 UploadInstance(_REMOTE, p)
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5149 dicomSize += os.path.getsize(GetDatabasePath(p))
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5150
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5151 s = DoGet(_REMOTE, '/patients/ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17/statistics') # Consider Knee patient
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5152 self.assertEqual(2, s['CountInstances'])
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5153 self.assertEqual(2, s['CountSeries'])
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5154 self.assertEqual(1, s['CountStudies'])
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	5155
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	5156 self.assertEqual(dicomSize, int(s['DicomUncompressedSize']))
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	5157
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	5158 if isCompressed:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	5159 self.assertGreater(dicomSize, int(s['DicomDiskSize']))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	5160 self.assertGreater(s['UncompressedSize'], s['DiskSize'])
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	5161 self.assertLess(dicomSize, int(s['UncompressedSize']))
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	5162 else:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	5163 self.assertEqual(dicomSize, int(s['DicomDiskSize']))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	5164 self.assertEqual(s['UncompressedSize'], s['DiskSize'])
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	5165 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	5166 if IsDicomUntilPixelDataStored(_REMOTE):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	5167 self.assertLess(dicomSize, int(s['UncompressedSize']))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	5168 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	5169 self.assertEqual(dicomSize, int(s['UncompressedSize']))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	5170 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	5171 # In Orthanc <= 1.9.0, there is the "dicom-as-json"
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	5172 # attachment in addition to the DICOM file
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	5173 self.assertLess(dicomSize, int(s['UncompressedSize']))
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	5174
202 f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5175
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5176 def test_changes_2(self):
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5177 # More consistent behavior since Orthanc 1.5.2
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5178 # https://groups.google.com/d/msg/orthanc-users/QhzB6vxYeZ0/YxabgqpfBAAJ
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5179
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5180 # Make sure that this is not the first change
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5181 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5182 a = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5183 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5184 DoDelete(_REMOTE, '/instances/%s' % a)
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5185
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5186 # No more instance, but there were previous changes
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5187 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5188
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5189 c = DoGet(_REMOTE, '/changes')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5190 self.assertEqual(0, len(c['Changes']))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5191 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5192 seq = c['Last']
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5193
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5194 c = DoGet(_REMOTE, '/changes?last')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5195 self.assertEqual(0, len(c['Changes']))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5196 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5197 self.assertEqual(seq, c['Last'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5198
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5199 c = DoGet(_REMOTE, '/changes?since=%d' % (seq + 1000))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5200 self.assertEqual(0, len(c['Changes']))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5201 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5202 self.assertEqual(seq, c['Last'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5203
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5204 # Add one instance
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5205 UploadInstance(_REMOTE, 'DummyCT.dcm')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5206 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5207
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5208 c = DoGet(_REMOTE, '/changes')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5209 self.assertEqual(4, len(c['Changes']))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5210 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5211 self.assertEqual(seq + 4, c['Last'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5212
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5213 c = DoGet(_REMOTE, '/changes?last')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5214 self.assertEqual(1, len(c['Changes']))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5215 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5216 self.assertEqual(seq + 4, c['Last'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5217
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5218 c = DoGet(_REMOTE, '/changes?since=%d' % (seq + 1000))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5219 self.assertEqual(0, len(c['Changes']))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5220 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5221 self.assertEqual(seq + 4, c['Last'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5222
389 27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5223 # Add, then delete, one user-defined metadata: This triggers 2
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5224 # changes of type "UpdatedMetadata"
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5225 i = DoGet(_REMOTE, '/instances') [0]
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5226 DoPut(_REMOTE, '/instances/%s/metadata/4000' % i, 'hello', 'text/plain')
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	5227
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	5228 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/4000' % i)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	5229 self.assertEqual('200', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	5230 self.assertEqual('hello', body)
389 27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5231
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5232 c = DoGet(_REMOTE, '/changes?last')
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5233 self.assertEqual(1, len(c['Changes']))
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5234 self.assertTrue(c['Done'])
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5235 self.assertEqual(seq + 5, c['Last'])
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5236 self.assertEqual('UpdatedMetadata', c['Changes'][0]['ChangeType'])
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5237
394 e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	5238 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	5239 DoDelete(_REMOTE, '/instances/%s/metadata/4000' % i, headers = {
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	5240 'If-Match' : headers['etag']
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	5241 })
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	5242 else:
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	5243 self.assertFalse('etag' in headers)
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	5244 DoDelete(_REMOTE, '/instances/%s/metadata/4000' % i)
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	5245
389 27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5246 c = DoGet(_REMOTE, '/changes?last')
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5247 self.assertEqual(1, len(c['Changes']))
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5248 self.assertTrue(c['Done'])
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5249 self.assertEqual(seq + 6, c['Last'])
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5250 self.assertEqual('UpdatedMetadata', c['Changes'][0]['ChangeType'])
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5251
202 f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5252 # Remove the uploaded instance
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5253 DoDelete(_REMOTE, '/instances/%s' % a)
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5254 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5255
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5256 c = DoGet(_REMOTE, '/changes')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5257 self.assertEqual(0, len(c['Changes']))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5258 self.assertTrue(c['Done'])
389 27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5259 self.assertEqual(seq + 6, c['Last'])
202 f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5260
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5261 c = DoGet(_REMOTE, '/changes?last')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5262 self.assertEqual(0, len(c['Changes']))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5263 self.assertTrue(c['Done'])
389 27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5264 self.assertEqual(seq + 6, c['Last'])
202 f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5265
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5266 c = DoGet(_REMOTE, '/changes?since=%d' % (seq + 1000))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5267 self.assertEqual(0, len(c['Changes']))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5268 self.assertTrue(c['Done'])
389 27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5269 self.assertEqual(seq + 6, c['Last'])
202 f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5270
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5271
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5272 def test_bitbucket_issue_124(self):
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5273 a = UploadInstance(_REMOTE, 'Issue124.dcm')['ID']
508 ae493446336a fix tests for missing archives Alain Mazy <am@osimis.io> parents: 507 diff changeset	5274 s = DoGet(_REMOTE, '/instances/%s/series' % a)['ID']
ae493446336a fix tests for missing archives Alain Mazy <am@osimis.io> parents: 507 diff changeset	5275
ae493446336a fix tests for missing archives Alain Mazy <am@osimis.io> parents: 507 diff changeset	5276 z = GetArchive(_REMOTE, '/series/%s/media' % s)
202 f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5277 self.assertEqual(2, len(z.namelist()))
207 a515eec74078 test_invalid_findscp Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	5278
a515eec74078 test_invalid_findscp Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	5279
a515eec74078 test_invalid_findscp Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	5280 def test_invalid_findscp(self):
a515eec74078 test_invalid_findscp Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	5281 UploadInstance(_REMOTE, 'DummyCT.dcm')
a515eec74078 test_invalid_findscp Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	5282 findscu = CallFindScu([ '-S', '-k', '8,52=IMAGE', '-k', '8,16', '-k', '2,2' ])
a515eec74078 test_invalid_findscp Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	5283 self.assertEqual(0, len(re.findall('$0002,0002$', findscu)))
208 2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5284
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5285
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5286 def test_bitbucket_issue_90(self):
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5287 def CountDicomResults(sex):
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5288 a = CallFindScu([ '-S', '-k', '8,52=STUDY', '-k', sex ])
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5289 return len(re.findall('$0010,0040$', a))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5290
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5291 def CountRestResults(sex):
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5292 a = DoPost(_REMOTE, '/tools/find',
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5293 { 'Level' : 'Study', 'Query' : { 'PatientSex' : sex } })
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5294 return len(a)
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5295
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5296 # Just like the "CR000000.dcm" of the issue, the test image
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5297 # "DummyCT.dcm" has the tag PatientSex (0010,0040) unset
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5298 UploadInstance(_REMOTE, 'DummyCT.dcm')
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5299
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5300 # Test that the behavior of DICOM vs. REST API is consistent on missing tags
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5301
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5302 # In wildcard constraints, the patient sex must be set for a match to occur
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5303 self.assertEqual(0, CountDicomResults('PatientSex=*'))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5304 self.assertEqual(0, CountRestResults('*'))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5305
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5306 # In single-valued constraints, the patient sex must be set
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5307 self.assertEqual(0, CountDicomResults('PatientSex=F'))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5308 self.assertEqual(0, CountDicomResults('PatientSex=M'))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5309 self.assertEqual(0, CountRestResults('F'))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5310 self.assertEqual(0, CountRestResults('M'))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5311
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5312 # Empty constraints are only used to ask the actual value of
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5313 # the tag to be added to the answer. The tag should not used
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5314 # as a filter in such a situation.
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5315 self.assertEqual(1, CountDicomResults('PatientSex'))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5316 self.assertEqual(1, CountDicomResults('PatientSex='))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5317 self.assertEqual(1, CountRestResults('')) # This check fails on Orthanc <= 1.5.2 (issue 90)
210 2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5318
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5319
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5320 def test_rest_modalities_in_study(self):
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5321 # Tests a regression that is present in Orthanc 1.5.2 and 1.5.3
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5322 # https://groups.google.com/d/msg/orthanc-users/7lZyG3wpx-M/uOXzAzVCFwAJ
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5323 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5324
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5325 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5326 'Query' : { 'ModalitiesInStudy' : 'US' }})
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5327 self.assertEqual(0, len(a))
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5328
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5329 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5330 'Query' : { 'ModalitiesInStudy' : 'US\\CT' }})
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5331 self.assertEqual(1, len(a))
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5332
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5333 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5334 'Query' : { 'ModalitiesInStudy' : 'CT' }})
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5335 self.assertEqual(1, len(a))
211 a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5336
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5337
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5338 def test_series_status(self):
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5339 def HasCompletedInChanges():
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5340 for c in DoGet(_REMOTE, '/changes?limit=1000&since=0')['Changes']:
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5341 if c['ChangeType'] == 'CompletedSeries':
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5342 return True;
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5343
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5344 return False
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5345
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5346 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm')
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5347 series = '8ea120d7-5057d919-837dfbcc-ccd04e0f-7f3a94aa'
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5348 self.assertEqual('Unknown', DoGet(_REMOTE, '/series/%s' % series)['Status'])
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5349 self.assertFalse(HasCompletedInChanges())
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5350
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5351 series = 'ce25ecb6-ed79d004-5ae43ca7-3fc89bc5-67511614'
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5352
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5353 for i in range(3):
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5354 UploadInstance(_REMOTE, 'Series/Lena-%d.dcm' % (i + 1))
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5355 self.assertEqual('Missing', DoGet(_REMOTE, '/series/%s' % series)['Status'])
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5356 self.assertFalse(HasCompletedInChanges())
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5357
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5358 UploadInstance(_REMOTE, 'Series/Lena-4.dcm')
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5359 self.assertEqual('Complete', DoGet(_REMOTE, '/series/%s' % series)['Status'])
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5360 self.assertTrue(HasCompletedInChanges())
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5361
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5362 DoDelete(_REMOTE, '/changes')
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5363 self.assertFalse(HasCompletedInChanges())
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5364
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5365 UploadInstance(_REMOTE, 'Series/Lena-5.dcm')
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5366 self.assertEqual('Inconsistent', DoGet(_REMOTE, '/series/%s' % series)['Status'])
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5367 self.assertFalse(HasCompletedInChanges())
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5368
215 d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5369
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5370 def test_dicomweb(self):
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5371 def Compare(dicom, reference):
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5372 a = UploadInstance(_REMOTE, dicom) ['ID']
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5373 b = DoGet(_REMOTE, '/instances/%s/file' % a,
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5374 headers = { 'Accept' : 'application/dicom+json' })
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5375 with open(GetDatabasePath(reference), 'rb') as c:
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5376 d = json.load(c)
220 7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5377 AssertAlmostEqualRecursive(self, d, b)
215 d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5378
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5379 Compare('DummyCT.dcm', 'DummyCT.json')
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5380 Compare('MarekLatin2.dcm', 'MarekLatin2.json')
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5381 Compare('HierarchicalAnonymization/StructuredReports/IM0',
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5382 'HierarchicalAnonymization/StructuredReports/IM0.json')
217 a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5383
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5384
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5385 def test_issue_95_encodings(self):
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	5386 # https://bugs.orthanc-server.com/show_bug.cgi?id=95
217 a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5387 # Check out image: "../Database/Encodings/DavidClunie/charsettests.screenshot.png"
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5388
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5389 # Very useful tool: "file2" from package "file-kanji"
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5390
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5391 def GetPatientName(dicom):
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5392 i = UploadInstance(_REMOTE, dicom) ['ID']
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5393 j = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5394 return j['PatientName']
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5395
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5396 def ComparePatientName(name, dicom):
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5397 self.assertEqual(name, GetPatientName(dicom))
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5398
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5399 # gdcmraw -t 10,10 -i SCSFREN -o /tmp/tag && uconv -f ISO-IR-100 -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5400 ComparePatientName(u'Buc^Jérôme', 'Encodings/DavidClunie/SCSFREN')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5401
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5402 # gdcmraw -t 10,10 -i SCSI2 -o /tmp/tag && uconv -f KOREAN -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5403 ComparePatientName(u'Hong^Gildong=洪^吉洞=홍^길동', 'Encodings/DavidClunie/SCSI2') # Since Orthanc 1.5.5
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5404
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5405 # gdcmraw -t 10,10 -i SCSX2 -o /tmp/tag && uconv -f GB18030 -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5406 ComparePatientName(u'Wang^XiaoDong=王^小东=', 'Encodings/DavidClunie/SCSX2')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5407
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5408 # gdcmraw -t 10,10 -i SCSX1 -o /tmp/tag && cat /tmp/tag && echo
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5409 ComparePatientName(u'Wang^XiaoDong=王^小東=', 'Encodings/DavidClunie/SCSX1')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5410
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5411 # gdcmraw -t 10,10 -i SCSH31 -o /tmp/tag && uconv -f JIS -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5412 ComparePatientName(u'Yamada^Tarou=山田^太郎=やまだ^たろう', 'Encodings/DavidClunie/SCSH31')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5413
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5414 # gdcmraw -t 10,10 -i SCSGERM -o /tmp/tag && uconv -f ISO-IR-100 -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5415 ComparePatientName(u'Äneas^Rüdiger', 'Encodings/DavidClunie/SCSGERM')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5416
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5417 # gdcmraw -t 10,10 -i SCSGREEK -o /tmp/tag && uconv -f ISO-IR-126 -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5418 ComparePatientName(u'Διονυσιος', 'Encodings/DavidClunie/SCSGREEK')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5419
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5420 # gdcmraw -t 10,10 -i SCSRUSS -o /tmp/tag && uconv -f ISO-IR-144 -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5421 ComparePatientName(u'Люкceмбypг', 'Encodings/DavidClunie/SCSRUSS')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5422
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5423 # gdcmraw -t 10,10 -i SCSHBRW -o /tmp/tag && uconv -f ISO-IR-138 -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5424 # NB: Hebrew is a right-to-left encoding, copying/pasting from
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5425 # Linux console into Emacs automatically reverse the string
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5426 ComparePatientName(u'שרון^דבורה', 'Encodings/DavidClunie/SCSHBRW')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5427
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5428 # gdcmraw -t 10,10 -i SCSARAB -o /tmp/tag && uconv -f ISO-IR-127 -t UTF-8 /tmp/tag && echo
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5429 # NB: Right-to-left as for Hebrew (SCSHBRW), and the Ubuntu console can't display such
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5430 # characters by default, but copy/paste works with Emacs
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5431 ComparePatientName(u'قباني^لنزار', 'Encodings/DavidClunie/SCSARAB')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5432
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5433 # SCSH32: This SpecificCharacterSet is composed of 2
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5434 # codepages: "ISO 2022 IR 13" (i.e. "SHIFT_JIS") until the
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5435 # first equal, then "ISO 2022 IR 87" (i.e. "JIS") for the
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5436 # remainer. Orthanc only takes into consideration the first
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5437 # codepage: This is a limitation.
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5438 # gdcmraw -t 10,10 -i SCSH32 -o /tmp/tag && cut -d '=' -f 1 /tmp/tag \| uconv -f SHIFT_JIS -t UTF-8
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5439 self.assertTrue(GetPatientName('Encodings/DavidClunie/SCSH32').startswith(u'ﾔﾏﾀﾞ^ﾀﾛｳ='))
218 70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5440
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5441
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5442 def test_findscu_missing_tags(self):
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5443 # dcmodify -e Rows DummyCTInvalidRows.dcm -gst -gse -gin
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5444 UploadInstance(_REMOTE, 'DummyCT.dcm')
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5445 UploadInstance(_REMOTE, 'DummyCTInvalidRows.dcm')
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5446
669 36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5447 i = CallFindScu([ '-k', '0008,0052=IMAGES', '-k', 'PatientName', '-k', 'Rows', '-k', 'Columns' ])
218 70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5448
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5449 # We have 2 instances...
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5450 patientNames = re.findall('$0010,0010$.?\[(.?)\]', i)
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5451 self.assertEqual(2, len(patientNames))
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5452 self.assertEqual('KNIX', patientNames[0])
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5453 self.assertEqual('KNIX', patientNames[1])
669 36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5454
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5455 columns = re.findall('$0028,0011$ US ([0-9]+)', i)
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5456 self.assertEqual(2, len(columns))
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5457 self.assertEqual('512', columns[0])
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5458 self.assertEqual('512', columns[1])
218 70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5459
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5460 # ...but only 1 value for the "Rows" tag
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5461 rows = re.findall('$0028,0010$ US ([0-9]+)', i)
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5462 self.assertEqual(1, len(rows))
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5463 self.assertEqual('512', rows[0])
219 00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5464
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5465
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5466
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5467 def test_bitbucket_issue_131(self):
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5468 # "Orthanc PACS silently fails to C-MOVE due to duplicate
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5469 # StudyInstanceUID in it's database."
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	5470 # https://bugs.orthanc-server.com/show_bug.cgi?id=131
219 00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5471
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5472 # Insert 2 instances, with the same StudyInstanceUID, but with
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5473 # different patient IDs. Orthanc will create 2 distincts
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5474 # patients, and the hierarchy of resources above the two
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5475 # instances will be fully disjoint.
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5476 UploadInstance(_REMOTE, 'PatientIdsCollision/Issue131-a.dcm')
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5477 UploadInstance(_REMOTE, 'PatientIdsCollision/Issue131-b.dcm')
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5478
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5479 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5480 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5481
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5482 a = DoPost(_REMOTE, '/modalities/self/query', {
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5483 'Level' : 'Study',
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5484 'Query' : {"PatientID": "A" }})['ID']
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5485
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5486 # 1 study is matched
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5487 self.assertEqual(1, len(DoGet(_REMOTE, '/queries/%s/answers' % a)))
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5488
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5489 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
220 7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5490 WaitAllNewJobsDone(_REMOTE, lambda: DoPost
7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5491 (_REMOTE, '/queries/%s/retrieve' % a,
7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5492 '{"TargetAet":"ORTHANCTEST","Synchronous":false}'))
219 00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5493
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5494 # The two studies are matched, as we made the request at the
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5495 # Study level, thus the shared StudyInstanceUID is used as the key
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5496 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5497
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5498
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5499 # Match the 2 studies
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5500 a = DoPost(_REMOTE, '/modalities/self/query', {
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5501 'Level' : 'Study',
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5502 'Query' : {"StudyInstanceUID": "2.25.123" }})['ID']
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5503 self.assertEqual(2, len(DoGet(_REMOTE, '/queries/%s/answers' % a)))
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5504 DropOrthanc(_LOCAL)
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5505 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
220 7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5506 WaitAllNewJobsDone(_REMOTE, lambda: DoPost
7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5507 (_REMOTE, '/queries/%s/retrieve' % a,
7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5508 '{"TargetAet":"ORTHANCTEST","Synchronous":false}'))
219 00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5509 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5510
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5511
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5512 # Same test, at the patient level => only 1 instance is transfered
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5513 a = DoPost(_REMOTE, '/modalities/self/query', {
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5514 'Level' : 'Patient',
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5515 'Query' : {"PatientID": "A" }})['ID']
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5516 self.assertEqual(1, len(DoGet(_REMOTE, '/queries/%s/answers' % a)))
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5517 DropOrthanc(_LOCAL)
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5518 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
220 7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5519 WaitAllNewJobsDone(_REMOTE, lambda: DoPost
7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5520 (_REMOTE, '/queries/%s/retrieve' % a,
7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5521 '{"TargetAet":"ORTHANCTEST","Synchronous":false}'))
219 00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5522 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5523
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5524
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5525 # Same test, at the series level => only 1 instance is transfered
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5526 a = DoPost(_REMOTE, '/modalities/self/query', {
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5527 'Level' : 'Series',
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5528 'Query' : {"PatientID": "A" }})['ID']
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5529 self.assertEqual(1, len(DoGet(_REMOTE, '/queries/%s/answers' % a)))
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5530 DropOrthanc(_LOCAL)
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5531 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
220 7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5532 WaitAllNewJobsDone(_REMOTE, lambda: DoPost
7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5533 (_REMOTE, '/queries/%s/retrieve' % a,
7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5534 '{"TargetAet":"ORTHANCTEST","Synchronous":false}'))
219 00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5535 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5536
233 ce0b19a2c807 test_bitbucket_issue_136 Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	5537
ce0b19a2c807 test_bitbucket_issue_136 Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	5538 def test_bitbucket_issue_136(self):
ce0b19a2c807 test_bitbucket_issue_136 Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	5539 UploadInstance(_REMOTE, 'Issue137.dcm')
ce0b19a2c807 test_bitbucket_issue_136 Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	5540 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', '0010,0010', '-k', '0028,0010', '-k', '0040,0275' ])
ce0b19a2c807 test_bitbucket_issue_136 Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	5541 patientNames = re.findall('$0010,0010$.?\[(.?)\]', i)
ce0b19a2c807 test_bitbucket_issue_136 Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	5542 self.assertEqual(1, len(patientNames))
ce0b19a2c807 test_bitbucket_issue_136 Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	5543 self.assertEqual('John Doe', patientNames[0])
234 93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5544
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5545
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5546 def test_anonymize_relationships_4(self):
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5547 # https://groups.google.com/d/msg/orthanc-users/UkcsqyTpszE/bXUpzU0vAAAJ
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5548 sr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/2019-03-28/CR000000.dcm')['ID']
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5549 mr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/2019-03-28/PR000000.dcm')['ID']
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5550 study = '0c923249-d52121a9-2b7167f7-6b85534f-0943697e'
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5551
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5552 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, '{}',
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5553 'application/json')['ID']
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5554 series = DoGet(_REMOTE, '/studies/%s/series' % anonymized)
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5555 self.assertEqual(2, len(series))
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5556
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5557 cr = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'CR', series))
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5558 pr = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'PR', series))
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5559 self.assertEqual(1, len(cr))
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5560 self.assertEqual(1, len(pr))
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5561 self.assertEqual(1, len(cr[0]['Instances']))
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5562 self.assertEqual(1, len(pr[0]['Instances']))
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5563
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5564 crinstance = DoGet(_REMOTE, '/instances/%s' % cr[0]['Instances'][0])
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5565 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % pr[0]['Instances'][0])
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5566
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5567 self.assertEqual(tags['0008,1115'][0]['0008,1140'][0]['0008,1155'],
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5568 crinstance['MainDicomTags']['SOPInstanceUID'])
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5569 self.assertEqual(tags['0008,1115'][0]['0008,1140'][0]['0008,1150'],
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5570 '1.2.840.10008.5.1.4.1.1.1') # SOP class for CR Image Storage
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5571
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5572 # This fails on Orthanc <= 1.5.6
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5573 self.assertEqual(tags['0008,1115'][0]['0020,000e'],
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5574 cr[0]['MainDicomTags']['SeriesInstanceUID'])
235 9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5575
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5576
255 02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5577 def test_anonymize_relationships_5(self):
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5578 ct1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/CT01.dcm')
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5579 rt1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/RT.dcm')
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5580 oStudyId = ct1['ParentStudy']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5581 oCtInstanceId = ct1['ID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5582 oRtInstanceId = rt1['ID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5583
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5584 oCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oCtInstanceId)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5585 oRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oRtInstanceId)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5586
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5587 # first validate the relationships in the source data
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5588 oStudyUID = oCtTags['StudyInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5589 oRtSeriesUID = oRtTags['SeriesInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5590 oRtInstanceUID = oRtTags['SOPInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5591 oRtFrameOfReferenceUID = oRtTags['ReferencedFrameOfReferenceSequence'][0]['FrameOfReferenceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5592 oCtSeriesUID = oCtTags['SeriesInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5593 oCtInstanceUID = oCtTags['SOPInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5594 oCtFrameOfReferenceUID = oCtTags['FrameOfReferenceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5595
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5596 oContourSequenceCount = len(oRtTags['ROIContourSequence'][0]['ContourSequence'])
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5597 self.assertEqual(oCtFrameOfReferenceUID, oRtFrameOfReferenceUID)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5598 self.assertEqual(oStudyUID, oRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['ReferencedSOPInstanceUID'])
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5599 self.assertEqual(oCtSeriesUID, oRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['RTReferencedSeriesSequence'][0]['SeriesInstanceUID'])
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5600 self.assertEqual(oCtInstanceUID, oRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['RTReferencedSeriesSequence'][0]['ContourImageSequence'][0]['ReferencedSOPInstanceUID'])
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5601 self.assertEqual(oCtInstanceUID, oRtTags['ROIContourSequence'][0]['ContourSequence'][oContourSequenceCount-1]['ContourImageSequence'][0]['ReferencedSOPInstanceUID'])
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5602
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5603 ### anonymize
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5604
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5605 aStudyId = DoPost(_REMOTE, '/studies/%s/anonymize' % oStudyId, '{}',
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5606 'application/json')['ID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5607
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5608 ### validate
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5609
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5610 aSeries = DoGet(_REMOTE, '/studies/%s/series' % aStudyId)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5611 self.assertEqual(2, len(aSeries))
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5612
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5613 aCt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'CT', aSeries))
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5614 aRt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'RTSTRUCT', aSeries))
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5615 aCtInstanceId = aCt[0]['Instances'][0]
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5616 aRtInstanceId = aRt[0]['Instances'][0]
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5617 aCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aCtInstanceId)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5618 aRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aRtInstanceId)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5619
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5620 # now validate the relationships in the anonymized data
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5621 aStudyUID = aCtTags['StudyInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5622 aRtSeriesUID = aRtTags['SeriesInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5623 aRtInstanceUID = aRtTags['SOPInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5624 aRtFrameOfReferenceUID = aRtTags['ReferencedFrameOfReferenceSequence'][0]['FrameOfReferenceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5625 aCtSeriesUID = aCtTags['SeriesInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5626 aCtInstanceUID = aCtTags['SOPInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5627 aCtFrameOfReferenceUID = aCtTags['FrameOfReferenceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5628
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5629 aContourSequenceCount = len(aRtTags['ROIContourSequence'][0]['ContourSequence'])
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5630 # make sure all UIDs have been updated
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5631 self.assertNotEqual(oStudyUID, aStudyUID)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5632 self.assertNotEqual(oRtSeriesUID, aRtSeriesUID)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5633 self.assertNotEqual(oRtInstanceUID, aRtInstanceUID)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5634 self.assertNotEqual(oRtFrameOfReferenceUID, aRtFrameOfReferenceUID)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5635 self.assertNotEqual(oCtSeriesUID, aCtSeriesUID)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5636 self.assertNotEqual(oCtInstanceUID, aCtInstanceUID)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5637 self.assertNotEqual(oCtFrameOfReferenceUID, aCtFrameOfReferenceUID)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5638
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5639 # validate the relationships
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5640 self.assertEqual(oContourSequenceCount, aContourSequenceCount)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5641 self.assertEqual(aCtFrameOfReferenceUID, aRtFrameOfReferenceUID)
256 397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5642 self.assertEqual(aStudyUID, aRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['ReferencedSOPInstanceUID'])
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5643 self.assertEqual(aCtSeriesUID, aRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['RTReferencedSeriesSequence'][0]['SeriesInstanceUID'])
255 02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5644 self.assertEqual(aCtInstanceUID, aRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['RTReferencedSeriesSequence'][0]['ContourImageSequence'][0]['ReferencedSOPInstanceUID'])
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5645 self.assertEqual(aCtInstanceUID, aRtTags['ROIContourSequence'][0]['ContourSequence'][aContourSequenceCount-1]['ContourImageSequence'][0]['ReferencedSOPInstanceUID'])
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5646
256 397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5647 def test_anonymize_relationships_5b(self):
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5648 # same test as previous one but, this time, we force the StudyInstanceUID
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5649 ct1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/CT01.dcm')
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5650 rt1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/RT.dcm')
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5651 oStudyId = ct1['ParentStudy']
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5652 oCtInstanceId = ct1['ID']
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5653 oRtInstanceId = rt1['ID']
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5654
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5655 oCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oCtInstanceId)
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5656 oRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oRtInstanceId)
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5657
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5658 ### anonymize while forcing the StudyInstanceUID
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5659
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5660 aStudyId = DoPost(_REMOTE, '/studies/%s/anonymize' % oStudyId, '{ "Replace" : { "StudyInstanceUID" : "1.2.3.4"}, "Force": true}',
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5661 'application/json')['ID']
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5662
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5663 ### validate
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5664
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5665 aSeries = DoGet(_REMOTE, '/studies/%s/series' % aStudyId)
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5666 self.assertEqual(2, len(aSeries))
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5667
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5668 aCt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'CT', aSeries))
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5669 aRt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'RTSTRUCT', aSeries))
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5670 aCtInstanceId = aCt[0]['Instances'][0]
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5671 aRtInstanceId = aRt[0]['Instances'][0]
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5672 aCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aCtInstanceId)
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5673 aRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aRtInstanceId)
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5674
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5675 self.assertEqual("1.2.3.4", aCtTags['StudyInstanceUID'])
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5676 self.assertEqual("1.2.3.4", aRtTags['StudyInstanceUID'])
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5677 self.assertEqual("1.2.3.4", aRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['ReferencedSOPInstanceUID'])
255 02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5678
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5679
235 9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5680 def test_bitbucket_issue_140(self):
266 b105bb2233c6 fix issue 140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 265 diff changeset	5681 # "Modifying private tags with REST API changes VR from LO to
267 f30b5bfa9599 note Sebastien Jodogne <s.jodogne@gmail.com> parents: 266 diff changeset	5682 # UN." This test fails if DCMTK <= 3.6.1 (e.g. fails on Ubuntu 16.04).
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	5683 # https://bugs.orthanc-server.com/show_bug.cgi?id=140
235 9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5684 source = UploadInstance(_REMOTE, 'Issue140.dcm') ['ID']
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5685 series = DoGet(_REMOTE, '/instances/%s' % source) ['ParentSeries']
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5686
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5687 target = DoPost(_REMOTE, '/series/%s/modify' % series, {
266 b105bb2233c6 fix issue 140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 265 diff changeset	5688 'Replace' : { 'RadioButton3' : 'aaabbbccc' },
b105bb2233c6 fix issue 140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 265 diff changeset	5689 'PrivateCreator' : 'RadioLogic', # <= the trick is here
235 9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5690 }, 'application/json') ['ID']
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5691
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5692 instances = DoGet(_REMOTE, '/series/%s/instances' % target)
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5693 self.assertEqual(1, len(instances))
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5694
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5695 tags = DoGet(_REMOTE, '/instances/%s/tags' % source)
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5696 t = tags['4321,1012']
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5697 self.assertEqual('String', t['Type'])
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5698 self.assertEqual('RadioButton3', t['Name'])
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5699 self.assertEqual('RadioLogic', t['PrivateCreator'])
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5700 self.assertEqual('jklmopq', t['Value'])
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5701
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5702 tags = DoGet(_REMOTE, '/instances/%s/tags' % instances[0]['ID'])
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5703 t = tags['4321,1012']
327 33ba5b1a0dd9 note Sebastien Jodogne <s.jodogne@gmail.com> parents: 326 diff changeset	5704 self.assertEqual('String', t['Type']) # This fails if DCMTK <= 3.6.1
235 9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5705 self.assertEqual('RadioButton3', t['Name'])
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5706 self.assertEqual('RadioLogic', t['PrivateCreator'])
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5707 self.assertEqual('aaabbbccc', t['Value'])
236 2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5708
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5709
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5710 def test_find_normalize(self):
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5711 # https://groups.google.com/d/msg/orthanc-users/AIwooGjsh94/YL28MNY4AgAJ
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5712
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5713 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5714
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5715 a = DoPost(_REMOTE, '/modalities/self/query', {
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5716 'Level' : 'Instance',
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5717 'Query' : { 'Rows' : '42' }
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5718 }) ['ID']
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5719
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5720 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a)
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5721 self.assertEqual(1, len(b))
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5722 self.assertFalse('Rows' in b[0])
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5723
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5724 a = DoPost(_REMOTE, '/modalities/self/query', {
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5725 'Level' : 'Instance',
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5726 'Query' : { 'Rows' : '42' },
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5727 'Normalize' : False
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5728 }) ['ID']
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5729
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5730 b = DoGet(_REMOTE, '/queries/%s/answers' % a)
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5731 self.assertEqual(0, len(b))
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5732
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5733 a = DoPost(_REMOTE, '/modalities/self/query', {
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5734 'Level' : 'Instance',
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5735 'Query' : { 'Rows' : '512' },
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5736 'Normalize' : False
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5737 }) ['ID']
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5738
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5739 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a)
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5740 self.assertEqual(1, len(b))
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5741 self.assertTrue('Rows' in b[0])
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5742 self.assertEqual('512', b[0]['Rows'])
237 21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5743
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5744 a = DoPost(_REMOTE, '/modalities/self/query', {
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5745 'Level' : 'Instance',
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5746 'Query' : { 'Rows' : '' },
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5747 'Normalize' : False
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5748 }) ['ID']
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5749
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5750 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a)
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5751 self.assertEqual(1, len(b))
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5752 self.assertTrue('Rows' in b[0])
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5753 self.assertEqual('512', b[0]['Rows'])
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5754
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5755 self.assertRaises(Exception, lambda: DoPost(
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5756 _REMOTE, '/modalities/self/query', {
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5757 'Level' : 'Instance',
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5758 'Query' : { 'Rows' : '*' }, # Out-of-range value
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5759 'Normalize' : False
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5760 }))
243 cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5761
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5762
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5763 def test_bitbucket_issue_141(self):
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	5764 # https://bugs.orthanc-server.com/show_bug.cgi?id=141
243 cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5765 a = UploadInstance(_REMOTE, 'Issue141.dcm') ['ID']
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5766 study = '494c8037-b237f263-d8f15075-c8cb2280-daf39bd1'
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5767
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5768 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f:
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5769 pdf = f.read()
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5770
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5771 b = DoPost(_REMOTE, '/tools/create-dicom', {
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5772 'Parent' : study,
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5773 'Tags' : {},
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5774 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5775 }) ['ID']
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5776
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5777 tagsA = DoGet(_REMOTE, '/instances/%s/tags?short' % a)
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5778 tagsB = DoGet(_REMOTE, '/instances/%s/tags?short' % b)
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5779 self.assertEqual(tagsA['0008,0005'], tagsB['0008,0005'])
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5780 self.assertEqual(tagsA['0008,1030'], tagsB['0008,1030'])
247 1abdab0ba0e6 test_modifying_missing_patientid Sebastien Jodogne <s.jodogne@gmail.com> parents: 243 diff changeset	5781
1abdab0ba0e6 test_modifying_missing_patientid Sebastien Jodogne <s.jodogne@gmail.com> parents: 243 diff changeset	5782
1abdab0ba0e6 test_modifying_missing_patientid Sebastien Jodogne <s.jodogne@gmail.com> parents: 243 diff changeset	5783 def test_modifying_missing_patientid(self):
1abdab0ba0e6 test_modifying_missing_patientid Sebastien Jodogne <s.jodogne@gmail.com> parents: 243 diff changeset	5784 # https://groups.google.com/d/msg/orthanc-users/aphG_h1AHVg/rfOTtTPTAgAJ
1abdab0ba0e6 test_modifying_missing_patientid Sebastien Jodogne <s.jodogne@gmail.com> parents: 243 diff changeset	5785 UploadInstance(_REMOTE, '2019-06-17-VedranZdesic.dcm')
1abdab0ba0e6 test_modifying_missing_patientid Sebastien Jodogne <s.jodogne@gmail.com> parents: 243 diff changeset	5786 DoPost(_REMOTE, '/studies/0c4aca1d-c107a241-6659d6aa-594c674a-a468b94a/modify', {})
262 045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5787
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5788
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5789 def test_log_level(self):
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	5790 # https://bugs.orthanc-server.com/show_bug.cgi?id=65
262 045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5791 original = DoGet(_REMOTE, '/tools/log-level')
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5792
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5793 DoPut(_REMOTE, '/tools/log-level', 'default')
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5794 self.assertEqual('default', DoGet(_REMOTE, '/tools/log-level'))
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5795 DoGet(_REMOTE, '/system')
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5796
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5797 DoPut(_REMOTE, '/tools/log-level', 'verbose')
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5798 self.assertEqual('verbose', DoGet(_REMOTE, '/tools/log-level'))
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5799 DoGet(_REMOTE, '/system')
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5800
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5801 DoPut(_REMOTE, '/tools/log-level', 'trace')
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5802 self.assertEqual('trace', DoGet(_REMOTE, '/tools/log-level'))
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5803 DoGet(_REMOTE, '/system')
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5804
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5805 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/log-level', 'nope'))
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5806
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5807 # Switch back to the original log level
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5808 DoPut(_REMOTE, '/tools/log-level', original)
264 445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5809
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5810
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5811 def test_upload_compressed(self):
265 8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5812 # New in Orthanc 1.6.0
264 445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5813 with open(GetDatabasePath('DummyCT.dcm.gz'), 'rb') as f:
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5814 d = f.read()
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5815
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5816 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances', d, 'application/dicom'))
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5817
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5818 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances', d, 'application/dicom',
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5819 headers = { 'Content-Encoding' : 'nope' }))
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5820
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5821 a = DoPost(_REMOTE, '/instances', d, 'application/dicom',
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5822 headers = { 'Content-Encoding' : 'gzip' })
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5823 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', a['ID'])
262 045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5824
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5825
263 a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5826 def test_study_series_find_inconsistency(self):
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5827 # https://groups.google.com/forum/#!topic/orthanc-users/bLv6Z11COy0
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5828
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5829 def CountAnswers(query):
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5830 a = DoPost(_REMOTE, 'modalities/self/query', query)
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5831 return len(DoGet(_REMOTE, '%s/answers' % a['Path']))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5832
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5833 # This instance has "SeriesDescription" (0008,103e) tag, but no
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5834 # "ProtocolName" (0018,1030). Both of those tags are part of
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5835 # the "main DICOM tags" of Orthanc.
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5836 UploadInstance(_REMOTE, 'Issue137.dcm')
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5837
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5838
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5839 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5840 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5841 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5842
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5843 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5844 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5845 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5846
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5847
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5848 ##
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5849 ## "SeriesDescription" is present, and has VR "CS" => wildcard is allowed
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5850 ## http://dicom.nema.org/medical/dicom/2019e/output/chtml/part04/sect_C.2.2.2.4.html
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5851 ##
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5852
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5853 # At the study level, the "SeriesDescription" tag is not allowed, but
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5854 # is wiped out by the normalization
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5855 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5856 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5857 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5858 'SeriesDescription' : 'NOPE'
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5859 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5860 'Normalize' : False
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5861 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5862 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5863 # This test fails on Orthanc <= 1.5.8
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5864 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5865 'Query' : {
669 36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5866 'ImageComments' : '*' # Wildcard matching => no match, as the tag is absent
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5867 },
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5868 'Normalize' : False
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5869 }))
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5870 self.assertEqual(1, CountAnswers({
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5871 'Level' : 'Study',
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5872 'Query' : {
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5873 'ImageComments' : ''
263 a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5874 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5875 'Normalize' : False
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5876 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5877 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5878 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5879 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5880 'SeriesDescription' : 'THIS^VALUE^IS^WIPED^OUT'
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5881 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5882 'Normalize' : True
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5883 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5884 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5885 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5886 'Query' : {
669 36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5887 'ImageComments' : '*' # Matches, as wiped out by the normalization
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5888 },
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5889 'Normalize' : True
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5890 }))
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5891 self.assertEqual(1, CountAnswers({
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5892 'Level' : 'Study',
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5893 'Query' : {
36c00333f6ef fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 668 diff changeset	5894 'ImageComments' : ''
263 a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5895 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5896 'Normalize' : True
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5897 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5898
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5899 for normalize in [ True, False ]:
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5900 # At the series level, the "SeriesDescription" tag is allowed, and
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5901 # normalization has no effect
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5902
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5903 # "Universal matching" will match all entities, including
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5904 # those with the missing tag
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5905 # http://dicom.nema.org/medical/dicom/2019e/output/chtml/part04/sect_C.2.2.2.3.html
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5906 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5907 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5908 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5909 'SeriesDescription' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5910 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5911 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5912 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5913 # "Universal matching" will match all entities, including
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5914 # those with the missing tag
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5915 # http://dicom.nema.org/medical/dicom/2019e/output/chtml/part04/sect_C.2.2.2.3.html
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5916 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5917 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5918 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5919 'SeriesDescription' : '*' # Wildcard matching
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5920 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5921 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5922 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5923 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5924 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5925 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5926 'SeriesDescription' : 'model' # The actual value is "STL model: intraop Report"
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5927 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5928 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5929 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5930 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5931 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5932 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5933 'SeriesDescription' : 'MISMATCHED^VALUE'
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5934 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5935 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5936 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5937
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5938 # Universal matching matches any instance, even if the
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5939 # query is at the study-level, and thus if "SeriesDescription"
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5940 # makes no sense
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5941 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5942 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5943 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5944 'SeriesDescription' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5945 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5946 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5947 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5948
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5949
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5950
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5951 ##
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5952 ## "ProtocolName" is absent, and has VR "CS" => wildcard is allowed
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5953 ##
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5954
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5955 # At the study level, the "ProtocolName" tag is not allowed, but
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5956 # is wiped out by the normalization
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5957 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5958 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5959 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5960 'ProtocolName' : 'NOPE'
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5961 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5962 'Normalize' : False
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5963 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5964 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5965 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5966 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5967 'ProtocolName' : '*' # Wildcard matching => no match, as the tag is absent
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5968 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5969 'Normalize' : False
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5970 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5971 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5972 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5973 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5974 'ProtocolName' : 'THIS^VALUE^IS^WIPED^OUT'
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5975 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5976 'Normalize' : True
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5977 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5978 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5979 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5980 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5981 'ProtocolName' : '*' # Matches, as wiped out by the normalization
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5982 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5983 'Normalize' : True
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5984 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5985
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5986 for normalize in [ True, False ]:
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5987 # At the series level, the "ProtocolName" tag is allowed, and
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5988 # normalization has no effect
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5989
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5990 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5991 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5992 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5993 'ProtocolName' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5994 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5995 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5996 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5997 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5998 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5999 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6000 'ProtocolName' : '*' # Wildcard matching => no match, as the tag is absent
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6001 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6002 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6003 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6004 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6005 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6006 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6007 'ProtocolName' : 'MISMATCHED^VALUE'
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6008 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6009 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6010 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6011
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6012 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6013 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6014 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6015 'ProtocolName' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6016 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6017 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6018 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6019
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6020
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6021 ##
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6022 ## "StudyInstanceUID" is present, and has VR "UI" => wildcard is not allowed
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6023 ##
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6024
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6025 for level in [ 'Study', 'Series' ] :
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6026 for normalize in [ True, False ]:
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6027 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6028 'Level' : level,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6029 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6030 'StudyInstanceUID' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6031 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6032 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6033 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6034 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6035 'Level' : level,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6036 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6037 'StudyInstanceUID' : 'MISMATCHED^VALUE'
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6038 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6039 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6040 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6041 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6042 'Level' : level,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6043 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6044 'StudyInstanceUID' : '4.5.6' # This is the actual value
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6045 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6046 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6047 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6048
269 b2d8582b9181 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	6049 # Wildcard matching is not allowed for this VR
263 a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6050 # This test fails on Orthanc <= 1.5.8
269 b2d8582b9181 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	6051 self.assertRaises(Exception, lambda: CountAnswers({
263 a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6052 'Level' : level,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6053 'Query' : {
269 b2d8582b9181 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	6054 'StudyInstanceUID' : '*'
263 a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6055 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6056 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	6057 }))
265 8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6058
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6059
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6060 def test_rendered(self):
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6061 # New in Orthanc 1.6.0
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6062 i = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID']
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6063 im = GetImage(_REMOTE, '/instances/%s/rendered' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6064 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6065 self.assertEqual(41, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6066 self.assertEqual(41, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6067
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6068 # http://effbot.org/zone/pil-comparing-images.htm
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6069 truth = Image.open(GetDatabasePath('ColorTestMalaterre.png'))
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6070 self.assertTrue(ImageChops.difference(im, truth).getbbox() is None)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6071
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6072 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6073 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6074 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6075 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6076
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6077 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6078 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6079 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6080 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6081
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6082 im = GetImage(_REMOTE, '/instances/%s/rendered?height=128' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6083 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6084 self.assertEqual(128, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6085 self.assertEqual(128, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6086
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6087 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10&smooth=0' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6088 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6089 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6090 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6091
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6092 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10&smooth=1' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6093 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6094 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6095 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6096
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6097 im = GetImage(_REMOTE, '/instances/%s/rendered?height=5&width=10' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6098 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6099 self.assertEqual(5, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6100 self.assertEqual(5, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6101
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6102
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6103 # Grayscale image
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6104 i = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6105 im = GetImage(_REMOTE, '/instances/%s/rendered' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6106 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6107 self.assertEqual(288, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6108 self.assertEqual(288, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6109 self.assertEqual(0, im.getpixel((0, 0)))
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6110
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6111 # Those are the original windowing parameters that are written
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6112 # inside the DICOM file
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6113 im2 = GetImage(_REMOTE, '/instances/%s/rendered?window-center=248.009544468547&window-width=431.351843817788' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6114 self.assertEqual("L", im2.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6115 self.assertEqual(288, im2.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6116 self.assertEqual(288, im2.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6117 self.assertTrue(ImageChops.difference(im, im2).getbbox() is None)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6118
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6119 im = GetImage(_REMOTE, '/instances/%s/rendered?width=512&smooth=0' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6120 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6121 self.assertEqual(512, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6122 self.assertEqual(512, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6123
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6124 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&smooth=0' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6125 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6126 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6127 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6128
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6129 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&smooth=1' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6130 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6131 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6132 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6133
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6134 im = GetImage(_REMOTE, '/instances/%s/rendered?width=1&window-center=-1000' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6135 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6136 self.assertEqual(1, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6137 self.assertEqual(1, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6138 self.assertEqual(255, im.getpixel((0, 0)))
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6139
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6140 im = GetImage(_REMOTE, '/instances/%s/rendered?width=1&window-center=1000' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6141 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6142 self.assertEqual(1, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6143 self.assertEqual(1, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6144 self.assertEqual(0, im.getpixel((0, 0)))
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6145
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6146
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6147 # Test monochrome 1
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6148 i = UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm')['ID']
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6149 im = GetImage(_REMOTE, '/instances/%s/rendered' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6150 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6151 self.assertEqual(2010, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6152 self.assertEqual(2446, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6153 self.assertEqual(0, im.getpixel((0, 0)))
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6154 im = GetImage(_REMOTE, '/instances/%s/rendered?width=20' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6155 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6156 self.assertEqual(20, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6157 self.assertEqual(24, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6158 im = GetImage(_REMOTE, '/instances/%s/rendered?height=24' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6159 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6160 self.assertEqual(20, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6161 self.assertEqual(24, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6162 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&height=24' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6163 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6164 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6165 self.assertEqual(12, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6166 im = GetImage(_REMOTE, '/instances/%s/rendered?width=40&height=24' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6167 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6168 self.assertEqual(20, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	6169 self.assertEqual(24, im.size[1])
268 c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6170
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6171
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6172 def test_bitbucket_issue_154(self):
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6173 # "Matching against list of UID-s by C-MOVE"
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	6174 # https://bugs.orthanc-server.com/show_bug.cgi?id=154
268 c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6175 a = UploadInstance(_REMOTE, 'Issue154-d1.dcm') ['ID']
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6176 b = UploadInstance(_REMOTE, 'Issue154-d2.dcm') ['ID']
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6177
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6178 study = '1.2.826.0.1.3680043.8.498.35214236271657363033644818354280454731'
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6179 series1 = '1.2.826.0.1.3680043.8.498.12243321927795467590791662266352305113'
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6180 series2 = '1.2.826.0.1.3680043.8.498.43769499931624584079690260699536473555'
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6181
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6182 # C-FIND is working on list of UIDs
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6183 i = CallFindScu([ '-k', 'QueryRetrieveLevel=SERIES',
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6184 '-k', 'StudyInstanceUID=%s' % study,
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6185 '-k', 'SeriesInstanceUID=%s\\%s' % (series1, series2) ])
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6186 series = re.findall('$0020,000e$.?\[(.?)\]', i)
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6187 self.assertEqual(2, len(series))
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6188 self.assertTrue(series1 in series)
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6189 self.assertTrue(series2 in series)
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6190
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6191 # Individual retrieval is working in Orthanc < 1.6.0
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6192 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6193 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6194 '--study', '-k', 'QueryRetrieveLevel=SERIES',
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6195 '-k', 'StudyInstanceUID=%s' % study,
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6196 '-k', 'SeriesInstanceUID=%s' % series1,
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6197 ])))
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6198 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6199 '--study', '-k', 'QueryRetrieveLevel=SERIES',
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6200 '-k', 'StudyInstanceUID=%s' % study,
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6201 '-k', 'SeriesInstanceUID=%s' % series2,
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6202 ])))
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6203 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6204
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6205 DropOrthanc(_LOCAL)
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6206
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6207 # But list matching is working only in Orthanc >= 1.6.0
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6208 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6209 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6210 '--study', '-k', 'QueryRetrieveLevel=SERIES',
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6211 '-k', 'StudyInstanceUID=%s' % study,
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6212 '-k', 'SeriesInstanceUID=%s\\%s' % (series1, series2),
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6213 ])))
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	6214 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
279 31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6215
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6216
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6217 def test_storage_commitment_api(self):
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6218 # Storage commitment is available since Orthanc 1.6.0
280 5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6219
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6220 def WaitTransaction(uid):
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6221 while True:
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6222 s = DoGet(_REMOTE, '/storage-commitment/%s' % uid)
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6223 if s['Status'] != 'Pending':
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6224 return s
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6225 else:
342 bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	6226 time.sleep(0.01)
280 5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6227
281 99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6228 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')
279 31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6229 sopClassUid = '1.2.840.10008.5.1.4.1.1.4'
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6230 sopInstanceUid = '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109'
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6231
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6232 # Against self
281 99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6233 transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', {
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6234 "DicomInstances" : [ [ sopClassUid, sopInstanceUid ] ],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6235 }) ['ID']
279 31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6236 self.assertTrue(transaction.startswith('2.25.'))
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6237
280 5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6238 result = WaitTransaction(transaction)
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6239 self.assertEqual('ORTHANC', result['RemoteAET'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6240 self.assertEqual('Success', result['Status'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6241 self.assertEqual(1, len(result['Success']))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6242 self.assertEqual(0, len(result['Failures']))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6243 self.assertEqual(sopClassUid, result['Success'][0]['SOPClassUID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6244 self.assertEqual(sopInstanceUid, result['Success'][0]['SOPInstanceUID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6245
281 99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6246 tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', {
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6247 "DicomInstances" : [
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6248 { 'SOPClassUID' : sopClassUid,
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6249 'SOPInstanceUID' : sopInstanceUid },
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6250 ],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6251 })
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6252 self.assertEqual(tmp['Path'], '/storage-commitment/%s' % tmp['ID'])
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6253 self.assertEqual(result, WaitTransaction(transaction))
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6254
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6255 tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', {
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6256 "Resources" : [
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6257 instance['ID'],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6258 instance['ParentSeries'],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6259 instance['ParentStudy'],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6260 instance['ParentPatient'],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6261 ]
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6262 })
280 5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6263 self.assertEqual(tmp['Path'], '/storage-commitment/%s' % tmp['ID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6264 self.assertEqual(result, WaitTransaction(transaction))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6265
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6266
281 99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6267 transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', {
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6268 "DicomInstances" : [
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6269 [ 'nope', 'nope2' ],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6270 [ sopClassUid, sopInstanceUid ],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6271 ],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6272 }) ['ID']
279 31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6273 self.assertTrue(transaction.startswith('2.25.'))
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6274
280 5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6275 result = WaitTransaction(transaction)
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6276 self.assertEqual('ORTHANC', result['RemoteAET'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6277 self.assertEqual('Failure', result['Status'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6278 self.assertEqual(1, len(result['Success']))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6279 self.assertEqual(1, len(result['Failures']))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6280 self.assertEqual(sopClassUid, result['Success'][0]['SOPClassUID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6281 self.assertEqual(sopInstanceUid, result['Success'][0]['SOPInstanceUID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6282 self.assertEqual('nope', result['Failures'][0]['SOPClassUID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6283 self.assertEqual('nope2', result['Failures'][0]['SOPInstanceUID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6284 self.assertEqual(274, result['Failures'][0]['FailureReason'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6285
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6286 # Cannot remove items from a failed storage commitment transaction
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6287 self.assertRaises(Exception, lambda:
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6288 DoPost(_REMOTE, '/storage-commitment/%s/remove' % transaction))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6289
279 31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6290
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6291 # Against Orthanc 0.8.6, that does not support storage commitment
509 17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6292 if not IsOrthancVersionAbove(_LOCAL, 1, 11, 2): # don't know which specific version the behaviour changed but this fails with 0.8.6
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6293 self.assertRaises(Exception, lambda:
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6294 DoPost(_REMOTE, '/modalities/orthanctest/storage-commitment', {
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6295 "DicomInstances" : [
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6296 [ sopClassUid, sopInstanceUid ],
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6297 ]
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6298 }))
279 31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6299
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6300
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6301
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6302 def test_storage_commitment_store(self):
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6303 # Storage commitment is available since Orthanc 1.6.0
280 5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6304
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6305 def WaitTransaction(uid):
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6306 while True:
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6307 s = DoGet(_REMOTE, '/storage-commitment/%s' % uid)
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6308 if s['Status'] != 'Pending':
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6309 return s
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6310 else:
342 bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	6311 time.sleep(0.01)
280 5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6312
279 31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6313 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6314 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6315 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6316
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6317 # The Orthanc 0.8.6 from "_LOCAL" does not support storage commitment
509 17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6318 if not IsOrthancVersionAbove(_LOCAL, 1, 11, 2): # don't know which specific version the behaviour changed but this fails with 0.8.6
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6319 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/modalities/orthanctest/store', {
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6320 'Resources' : [ i ],
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6321 'StorageCommitment' : True,
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6322 }))
279 31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6323
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6324 j = DoPost(_REMOTE, '/modalities/orthanctest/store', {
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6325 'Resources' : [ i ],
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6326 'StorageCommitment' : False,
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6327 })
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6328 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6329
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6330 j = DoPost(_REMOTE, '/modalities/self/store', {
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6331 'Resources' : [ i ],
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6332 'StorageCommitment' : True,
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6333 })
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6334
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6335 transaction = j['StorageCommitmentTransactionUID']
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6336 self.assertTrue(transaction.startswith('2.25.'))
280 5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6337
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6338 result = WaitTransaction(transaction)
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6339 self.assertEqual('ORTHANC', result['RemoteAET'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6340 self.assertEqual('Success', result['Status'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6341 self.assertEqual(1, len(result['Success']))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6342 self.assertEqual(0, len(result['Failures']))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6343 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', result['Success'][0]['SOPClassUID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6344 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109',
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6345 result['Success'][0]['SOPInstanceUID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6346
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6347 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6348 DoPost(_REMOTE, '/storage-commitment/%s/remove' % transaction)
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6349 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
285 281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6350
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6351
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6352 def test_store_straight(self): # New in Orthanc 1.6.1
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6353 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6354 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6355
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6356 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f:
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6357 dicom = f.read()
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6358
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6359 self.assertRaises(Exception, lambda: DoPost(
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6360 _REMOTE, '/modalities/orthanctest/store-straight', 'nope', 'nope'))
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6361
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6362 answer = DoPost(_REMOTE, '/modalities/orthanctest/store-straight', dicom, 'nope')
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6363
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6364 self.assertEqual('1.2.840.10008.5.1.4.1.1.4',
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6365 answer['SOPClassUID'])
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6366 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109',
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6367 answer['SOPInstanceUID'])
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6368
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6369 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6370 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
289 4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6371
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6372
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6373 def test_storescu_transcoding(self): # New in Orthanc 1.7.0
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6374 # Add a RLE-encoded DICOM file
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6375 i = UploadInstance(_REMOTE, 'TransferSyntaxes/1.2.840.10008.1.2.5.dcm')['ID']
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6376 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6377 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6378 rleSize = len(DoGet(_REMOTE, '/instances/%s/file' % i))
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6379
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6380 # Export the instance, with transcoding: "_REMOTE" is the
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6381 # Orthanc server being tested
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6382 try:
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6383 DoDelete(_REMOTE, '/modalities/toto')
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6384 except:
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6385 pass
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6386
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6387 params = DoGet(_REMOTE, '/modalities?expand') ['orthanctest']
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6388 DoPut(_REMOTE, '/modalities/toto', params)
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6389 DoPost(_REMOTE, '/modalities/toto/store', str(i), 'text/plain')
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6390 j = DoGet(_LOCAL, '/instances')
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6391 self.assertEqual(1, len(j))
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6392 uncompressedSize = len(DoGet(_LOCAL, '/instances/%s/file' % j[0]))
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6393 self.assertTrue(uncompressedSize > rleSize / 2)
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6394
509 17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6395 # Export, with transcoding disabled => this fails with 0.8.6 but not with more recent versions
289 4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6396 params['AllowTranscoding'] = False
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6397 DoPut(_REMOTE, '/modalities/toto', params)
509 17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6398 if not IsOrthancVersionAbove(_LOCAL, 1, 11, 2): # don't know which specific version the behaviour changed but this fails with 0.8.6
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6399 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/modalities/toto/store', str(i), 'text/plain'))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6400 else:
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	6401 DoPost(_REMOTE, '/modalities/toto/store', str(i), 'text/plain')
378 a4b8450a1158 fix test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 377 diff changeset	6402 DoDelete(_REMOTE, '/modalities/toto')
290 b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6403
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6404
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6405 def test_bitbucket_issue_169(self):
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6406 with open(GetDatabasePath('Issue169.dcm.bz2'), 'rb') as f:
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6407 dicom = bz2.decompress(f.read())
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6408
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6409 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(dicom))
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6410
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6411 self.assertEqual(44350560, len(dicom))
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6412 i = DoPost(_REMOTE, '/instances', dicom, 'application/dicom') ['ID']
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6413
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6414 tags = DoGet(_REMOTE, '/instances/%s/tags' % i)
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6415 self.assertEqual('NORMAL', tags['1337,1001']['Value'])
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6416
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6417 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6418 DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6419 j = DoGet(_LOCAL, '/instances')
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6420 self.assertEqual(1, len(j))
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6421
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6422 # In Orthanc <= 1.6.1, transfer syntax changed from "Explicit
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6423 # VR Little Endian" (1.2.840.10008.1.2.1) to "Implicit VR
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6424 # Little Endian" (1.2.840.10008.1.2)
291 cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6425 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(
cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6426 DoGet(_LOCAL, '/instances/%s/file' % j[0])))
290 b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6427
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6428 # In Orthanc <= 1.6.1, the value of the private tags was lost
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6429 # because of this transcoding
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6430 tags = DoGet(_LOCAL, '/instances/%s/tags' % j[0])
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6431 self.assertEqual('NORMAL', tags['1337,1001']['Value'])
291 cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6432
cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6433
302 22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6434 def test_modify_transcode_instance(self):
291 cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6435 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6436 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(
cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6437 DoGet(_REMOTE, '/instances/%s/file' % i)))
cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6438
299 c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6439 a = ExtractDicomTags(DoGet(_REMOTE, '/instances/%s/file' % i), [ 'SOPInstanceUID' ]) [0]
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6440 self.assertTrue(len(a) > 20)
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6441
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6442 SYNTAXES = [
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6443 '1.2.840.10008.1.2',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6444 '1.2.840.10008.1.2.1',
300 d6c2eb5a2603 disabling test on Deflated Explicit VR Little Endian Sebastien Jodogne <s.jodogne@gmail.com> parents: 299 diff changeset	6445 #'1.2.840.10008.1.2.1.99', # Deflated Explicit VR Little Endian (cannot be decoded in debug mode if Orthanc is statically linked against DCMTK 3.6.5)
299 c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6446 '1.2.840.10008.1.2.2',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6447 '1.2.840.10008.1.2.4.50',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6448 '1.2.840.10008.1.2.4.51',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6449 '1.2.840.10008.1.2.4.57',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6450 '1.2.840.10008.1.2.4.70',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6451 ]
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6452
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	6453 if HasGdcmPlugin(_REMOTE):
299 c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6454 SYNTAXES = SYNTAXES + [
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6455 '1.2.840.10008.1.2.4.80', # This makes DCMTK 3.6.2 crash
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6456 '1.2.840.10008.1.2.4.81', # This makes DCMTK 3.6.2 crash
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6457 '1.2.840.10008.1.2.4.90', # JPEG2k, unavailable without GDCM
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6458 '1.2.840.10008.1.2.4.91', # JPEG2k, unavailable without GDCM
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6459 ]
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6460
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6461 for syntax in SYNTAXES:
291 cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6462 transcoded = DoPost(_REMOTE, '/instances/%s/modify' % i, {
cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6463 'Transcode' : syntax,
299 c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6464 'Keep' : [ 'SOPInstanceUID' ],
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6465 'Force' : True,
291 cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6466 })
cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6467
cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6468 self.assertEqual(syntax, GetTransferSyntax(transcoded))
292 e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6469
299 c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6470 b = ExtractDicomTags(transcoded, [ 'SOPInstanceUID' ]) [0]
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6471 self.assertTrue(len(b) > 20)
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6472 if syntax in [ '1.2.840.10008.1.2.4.50',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6473 '1.2.840.10008.1.2.4.51',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6474 '1.2.840.10008.1.2.4.81',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6475 '1.2.840.10008.1.2.4.91' ]:
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6476 # Lossy transcoding: The SOP instance UID must have changed
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6477 self.assertNotEqual(a, b)
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6478 else:
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6479 self.assertEqual(a, b)
292 e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6480
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6481 def test_archive_transcode(self):
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6482 info = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6483
293 032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6484 # GET on "/media"
292 e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6485 z = GetArchive(_REMOTE, '/patients/%s/media' % info['ParentPatient'])
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6486 self.assertEqual(2, len(z.namelist()))
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6487 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(z.read('IMAGES/IM0')))
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6488
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6489 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/patients/%s/media?transcode=nope' % info['ParentPatient']))
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6490
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6491 z = GetArchive(_REMOTE, '/patients/%s/media?transcode=1.2.840.10008.1.2.4.50' % info['ParentPatient'])
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6492 self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax(z.read('IMAGES/IM0')))
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6493
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6494 z = GetArchive(_REMOTE, '/studies/%s/media?transcode=1.2.840.10008.1.2.4.51' % info['ParentStudy'])
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6495 self.assertEqual('1.2.840.10008.1.2.4.51', GetTransferSyntax(z.read('IMAGES/IM0')))
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6496
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6497 z = GetArchive(_REMOTE, '/series/%s/media?transcode=1.2.840.10008.1.2.4.57' % info['ParentSeries'])
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6498 self.assertEqual('1.2.840.10008.1.2.4.57', GetTransferSyntax(z.read('IMAGES/IM0')))
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6499
293 032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6500
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6501 # POST on "/media"
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6502 self.assertRaises(Exception, lambda: PostArchive(
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6503 _REMOTE, '/patients/%s/media' % info['ParentPatient'], { 'Transcode' : 'nope' }))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6504
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6505 z = PostArchive(_REMOTE, '/patients/%s/media' % info['ParentPatient'], {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6506 'Transcode' : '1.2.840.10008.1.2.4.50',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6507 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6508 self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax(z.read('IMAGES/IM0')))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6509
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6510 z = PostArchive(_REMOTE, '/studies/%s/media' % info['ParentStudy'], {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6511 'Transcode' : '1.2.840.10008.1.2.4.51',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6512 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6513 self.assertEqual('1.2.840.10008.1.2.4.51', GetTransferSyntax(z.read('IMAGES/IM0')))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6514
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6515 z = PostArchive(_REMOTE, '/series/%s/media' % info['ParentSeries'], {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6516 'Transcode' : '1.2.840.10008.1.2.4.57',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6517 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6518 self.assertEqual('1.2.840.10008.1.2.4.57', GetTransferSyntax(z.read('IMAGES/IM0')))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6519
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6520
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6521 # GET on "/archive"
292 e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6522 z = GetArchive(_REMOTE, '/patients/%s/archive' % info['ParentPatient'])
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6523 self.assertEqual(1, len(z.namelist()))
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6524 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(z.read(z.namelist()[0])))
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6525
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6526 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/patients/%s/archive?transcode=nope' % info['ParentPatient']))
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6527
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6528 z = GetArchive(_REMOTE, '/patients/%s/archive?transcode=1.2.840.10008.1.2' % info['ParentPatient'])
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6529 self.assertEqual('1.2.840.10008.1.2', GetTransferSyntax(z.read(z.namelist()[0])))
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6530
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6531 z = GetArchive(_REMOTE, '/studies/%s/archive?transcode=1.2.840.10008.1.2.2' % info['ParentStudy'])
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6532 self.assertEqual('1.2.840.10008.1.2.2', GetTransferSyntax(z.read(z.namelist()[0])))
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6533
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6534 z = GetArchive(_REMOTE, '/series/%s/archive?transcode=1.2.840.10008.1.2.4.70' % info['ParentSeries'])
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6535 self.assertEqual('1.2.840.10008.1.2.4.70', GetTransferSyntax(z.read(z.namelist()[0])))
293 032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6536
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6537
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6538 # POST on "/archive"
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6539 self.assertRaises(Exception, lambda: PostArchive(
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6540 _REMOTE, '/patients/%s/archive' % info['ParentPatient'], { 'Transcode' : 'nope' }))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6541
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6542 z = PostArchive(_REMOTE, '/patients/%s/archive' % info['ParentPatient'], {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6543 'Transcode' : '1.2.840.10008.1.2.4.50',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6544 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6545 self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax(z.read(z.namelist()[0])))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6546
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6547 z = PostArchive(_REMOTE, '/studies/%s/archive' % info['ParentStudy'], {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6548 'Transcode' : '1.2.840.10008.1.2.4.51',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6549 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6550 self.assertEqual('1.2.840.10008.1.2.4.51', GetTransferSyntax(z.read(z.namelist()[0])))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6551
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6552 z = PostArchive(_REMOTE, '/series/%s/archive' % info['ParentSeries'], {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6553 'Transcode' : '1.2.840.10008.1.2.4.57',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6554 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6555 self.assertEqual('1.2.840.10008.1.2.4.57', GetTransferSyntax(z.read(z.namelist()[0])))
292 e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6556
293 032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6557
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6558 # "/tools/create-*"
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6559 z = PostArchive(_REMOTE, '/tools/create-archive', {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6560 'Resources' : [ info['ParentStudy'] ],
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6561 'Transcode' : '1.2.840.10008.1.2.4.50',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6562 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6563 self.assertEqual(1, len(z.namelist()))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6564 self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax(z.read(z.namelist()[0])))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6565
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6566 z = PostArchive(_REMOTE, '/tools/create-media', {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6567 'Resources' : [ info['ParentStudy'] ],
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6568 'Transcode' : '1.2.840.10008.1.2.4.51',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6569 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6570 self.assertEqual(2, len(z.namelist()))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6571 self.assertEqual('1.2.840.10008.1.2.4.51', GetTransferSyntax(z.read('IMAGES/IM0')))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6572
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6573 z = PostArchive(_REMOTE, '/tools/create-media-extended', {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6574 'Resources' : [ info['ParentStudy'] ],
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6575 'Transcode' : '1.2.840.10008.1.2.4.57',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6576 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6577 self.assertEqual(2, len(z.namelist()))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6578 self.assertEqual('1.2.840.10008.1.2.4.57', GetTransferSyntax(z.read('IMAGES/IM0')))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6579
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	6580 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2):
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	6581 z = GetArchive(_REMOTE, '/tools/create-archive?resources=%s&transcode=1.2.840.10008.1.2.4.50' % info['ParentStudy'])
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	6582 self.assertEqual(1, len(z.namelist()))
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	6583 self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax(z.read(z.namelist()[0])))
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	6584
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	6585 z = GetArchive(_REMOTE, '/tools/create-media?resources=%s&transcode=1.2.840.10008.1.2.4.51' % info['ParentStudy'])
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	6586 self.assertEqual(2, len(z.namelist()))
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	6587 self.assertEqual('1.2.840.10008.1.2.4.51', GetTransferSyntax(z.read('IMAGES/IM0')))
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	6588
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	6589 z = GetArchive(_REMOTE, '/tools/create-media-extended?resources=%s&transcode=1.2.840.10008.1.2.4.57' % info['ParentStudy'])
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	6590 self.assertEqual(2, len(z.namelist()))
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	6591 self.assertEqual('1.2.840.10008.1.2.4.57', GetTransferSyntax(z.read('IMAGES/IM0')))
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	6592
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	6593
47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	6594
308 2565d39dd36c integration mainline->c-get Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 305 diff changeset	6595
587 f29d3ff889bf new test for /file?transcode=... Alain Mazy <am@osimis.io> parents: 585 diff changeset	6596 def test_download_file_transcode(self):
f29d3ff889bf new test for /file?transcode=... Alain Mazy <am@osimis.io> parents: 585 diff changeset	6597 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2):
f29d3ff889bf new test for /file?transcode=... Alain Mazy <am@osimis.io> parents: 585 diff changeset	6598
f29d3ff889bf new test for /file?transcode=... Alain Mazy <am@osimis.io> parents: 585 diff changeset	6599 info = UploadInstance(_REMOTE, 'TransferSyntaxes/1.2.840.10008.1.2.1.dcm')
f29d3ff889bf new test for /file?transcode=... Alain Mazy <am@osimis.io> parents: 585 diff changeset	6600 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(
f29d3ff889bf new test for /file?transcode=... Alain Mazy <am@osimis.io> parents: 585 diff changeset	6601 DoGet(_REMOTE, '/instances/%s/file' % info['ID'])))
f29d3ff889bf new test for /file?transcode=... Alain Mazy <am@osimis.io> parents: 585 diff changeset	6602
f29d3ff889bf new test for /file?transcode=... Alain Mazy <am@osimis.io> parents: 585 diff changeset	6603 self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax(
f29d3ff889bf new test for /file?transcode=... Alain Mazy <am@osimis.io> parents: 585 diff changeset	6604 DoGet(_REMOTE, '/instances/%s/file?transcode=1.2.840.10008.1.2.4.50' % info['ID'])))
f29d3ff889bf new test for /file?transcode=... Alain Mazy <am@osimis.io> parents: 585 diff changeset	6605
f29d3ff889bf new test for /file?transcode=... Alain Mazy <am@osimis.io> parents: 585 diff changeset	6606
301 6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6607 def test_modify_keep_source(self):
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6608 # https://groups.google.com/d/msg/orthanc-users/CgU-Wg8vDio/BY5ZWcDEAgAJ
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6609 i = UploadInstance(_REMOTE, 'DummyCT.dcm')
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6610 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6611
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6612 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], {
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6613 'Replace' : {
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6614 'StationName' : 'TEST',
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6615 },
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6616 'KeepSource' : True,
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6617 })
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6618
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6619 s = DoGet(_REMOTE, '/studies')
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6620 self.assertEqual(2, len(s))
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6621 self.assertTrue(i['ParentStudy'] in s)
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6622 self.assertTrue(j['ID'] in s)
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6623
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6624 DoDelete(_REMOTE, '/studies/%s' % j['ID'])
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6625 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6626
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6627 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], {
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6628 'Replace' : {
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6629 'StationName' : 'TEST',
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6630 },
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6631 'KeepSource' : False,
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6632 })
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6633
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6634 s = DoGet(_REMOTE, '/studies')
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6635 self.assertEqual(1, len(s))
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6636 self.assertFalse(i['ParentStudy'] in s)
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6637 self.assertTrue(j['ID'] in s)
302 22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6638
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6639
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6640 def test_modify_transcode_study(self):
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6641 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6642 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6643 DoGet(_REMOTE, '/instances/%s/file' % i['ID'])))
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6644
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6645 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6646 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], {
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6647 'Transcode' : '1.2.840.10008.1.2.4.50',
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6648 'KeepSource' : False
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6649 })
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6650
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6651 k = DoGet(_REMOTE, '/instances')
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6652 self.assertEqual(1, len(k))
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6653 self.assertEqual(i['ID'], DoGet(_REMOTE, '/instances/%s/metadata?expand' % k[0]) ['ModifiedFrom'])
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6654 self.assertEqual('1.2.840.10008.1.2.4.50', GetTransferSyntax(
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6655 DoGet(_REMOTE, '/instances/%s/file' % k[0])))
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6656
305 ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6657
498 62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6658 def test_modify_need_force_to_change_uids(self):
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6659 def Modify(level, resourceId, replaceTags, force, keepSource):
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6660 return DoPost(_REMOTE, '/%s/%s/modify' % (level, resourceId), {
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6661 'Replace' : replaceTags,
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6662 'Force': force,
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6663 'KeepSource' : keepSource
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6664 })
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6665
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6666 self.assertEqual(0, len(DoGet(_REMOTE, '/studies')))
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6667
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6668 i = UploadInstance(_REMOTE, 'DummyCT.dcm')
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6669 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6670
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6671 # can not change the StudyInstanceUID unless you force it
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6672 self.assertRaises(Exception, lambda: Modify('studies', i['ParentStudy'], {'StudyInstanceUID': '1.2'}, force=False, keepSource=True))
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6673 Modify('studies', i['ParentStudy'], {'StudyInstanceUID': '1.2'}, force=True, keepSource=True)
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6674
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6675 # can not change the SeriesInstanceUID unless you force it
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6676 self.assertRaises(Exception, lambda: Modify('series', i['ParentSeries'], {'SeriesInstanceUID': '1.2'}, force=False, keepSource=True))
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6677 Modify('series', i['ParentSeries'], {'SeriesInstanceUID': '1.2'}, force=True, keepSource=True)
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6678
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6679 # can not change the SOPInstanceUID unless you force it
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6680 self.assertRaises(Exception, lambda: Modify('instances', i['ID'], {'SOPInstanceUID': '1.2'}, force=False, keepSource=True))
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6681 Modify('instances', i['ID'], {'SOPInstanceUID': '1.2'}, force=True, keepSource=True)
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6682
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6683
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6684 # can not change the PatientID of a study unless you force it
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6685 self.assertRaises(Exception, lambda: Modify('studies', i['ParentStudy'], {'PatientID': 'NEW'}, force=False, keepSource=True))
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6686 self.assertRaises(Exception, lambda: Modify('series', i['ParentSeries'], {'StudyInstanceUID': '1.3'}, force=False, keepSource=True))
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6687 self.assertRaises(Exception, lambda: Modify('instances', i['ID'], {'SeriesInstanceUID': '1.2'}, force=False, keepSource=True))
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6688
500 5386dfd854b3 fix Alain Mazy <am@osimis.io> parents: 498 diff changeset	6689 if IsOrthancVersionAbove(_REMOTE, 1, 11, 3):
498 62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6690 # this was forbidden even with Force=true till 1.11.2 included
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6691 Modify('studies', i['ParentStudy'], {'PatientID': 'NEW'}, force=True, keepSource=True)
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6692 Modify('series', i['ParentSeries'], {'StudyInstanceUID': '1.3'}, force=True, keepSource=True)
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6693 Modify('instances', i['ID'], {'SeriesInstanceUID': '1.2'}, force=True, keepSource=True)
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6694
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6695
504 16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6696 def test_modify_study_module_reconstruction(self):
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6697 if IsOrthancVersionAbove(_REMOTE, 1, 11, 3):
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6698 def UploadAndModify(level, resourceId, replaceTags, force, keepSource, dropOrthanc=True):
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6699
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6700 if dropOrthanc:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6701 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6702
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6703 UploadFolder(_REMOTE, 'Knee/T1')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6704 UploadFolder(_REMOTE, 'Knee/T2')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6705
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6706 if dropOrthanc:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6707 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6708
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6709 modifyResponse = DoPost(_REMOTE, '/%s/%s/modify' % (level, resourceId), {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6710 'Replace' : replaceTags,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6711 'Force': force,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6712 'KeepSource' : keepSource
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6713 })
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6714 modifiedResource = DoGet(_REMOTE, '/%s/%s' % (level, modifyResponse['ID']))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6715 return (modifyResponse, modifiedResource)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6716
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6717 kneeSeriesT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6718 kneeSeriesT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6719 kneeStudy = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6720 kneePatient = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6721 kneeStudyInstanceUID = '2.16.840.1.113669.632.20.121711.10000160881'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6722 kneeSeriesInstanceUIDT1 = '1.3.46.670589.11.17521.5.0.3124.2008081908564160709'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6723 kneeSeriesInstanceUIDT2 = '1.3.46.670589.11.17521.5.0.3124.2008081909090037350'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6724
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6725 ####### study level tests #######
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6726
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6727 # modify study description and make sure the MainDicomTags are updated
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6728 modifyResponse, modifiedResource = UploadAndModify('studies', kneeStudy, replaceTags={
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6729 'StudyInstanceUID': kneeStudyInstanceUID,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6730 'StudyDescription': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6731 }, force=True, keepSource=True)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6732 self.assertEqual(kneeStudy, modifyResponse['ID'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6733 self.assertEqual('TOTO', modifiedResource['MainDicomTags']['StudyDescription'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6734
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6735 # modify patient name at study level and make sure the PatientMainDicomTags are updated + the patient has been updated
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6736 modifyResponse, modifiedResource = UploadAndModify('studies', kneeStudy, replaceTags={
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6737 'StudyInstanceUID': kneeStudyInstanceUID,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6738 'PatientName': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6739 }, force=True, keepSource=True)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6740 self.assertEqual(kneeStudy, modifyResponse['ID'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6741 self.assertEqual('TOTO', modifiedResource['PatientMainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6742 patient = DoGet(_REMOTE, '/patients/%s' % kneePatient)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6743 self.assertEqual('TOTO', patient['MainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6744
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6745 # modify patient name and patient id at study level and make sure the PatientMainDicomTags are updated + a new patient has been created + the old one does not exist anymore
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6746 modifyResponse, modifiedResource = UploadAndModify('studies', kneeStudy, replaceTags={
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6747 'StudyInstanceUID': kneeStudyInstanceUID,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6748 'PatientID': 'TOTO_ID',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6749 'PatientName': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6750 }, force=True, keepSource=True)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6751 self.assertNotEqual(kneeStudy, modifyResponse['ID']) # the study has changed since the PatientID has changed
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6752 self.assertEqual('TOTO', modifiedResource['PatientMainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6753 self.assertEqual('TOTO_ID', modifiedResource['PatientMainDicomTags']['PatientID'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6754 patient = DoGet(_REMOTE, '/patients/%s' % modifyResponse['PatientID'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6755 self.assertEqual('TOTO', patient['MainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6756 self.assertEqual('TOTO_ID', patient['MainDicomTags']['PatientID'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6757
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6758 ####### series level tests #######
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6759 # modify series description and make sure the MainDicomTags are updated
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6760 modifyResponse, modifiedResource = UploadAndModify('series', kneeStudy, replaceTags={
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6761 'SeriesInstanceUID': kneeSeriesInstanceUIDT1,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6762 'StudyInstanceUID': kneeStudyInstanceUID,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6763 'SeriesDescription': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6764 }, force=True, keepSource=True)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6765 self.assertEqual(kneeSeriesT1, modifyResponse['ID'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6766 self.assertEqual('TOTO', modifiedResource['MainDicomTags']['SeriesDescription'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6767 self.assertEqual(kneeStudy, modifyResponse['ParentResources'][0])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6768
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6769
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6770 def test_rename_patient_with_multiple_studies(self):
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6771 if IsOrthancVersionAbove(_REMOTE, 1, 11, 3):
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6772
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6773 patientOrthancId = '5436938e-7ae68340-5ea6ad3c-4e6e09bd-1bd335de'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6774 patientDicomId = 'TEST_1'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6775 patientName = 'Test'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6776 study1234 = '72de3b86-da4b2556-bb33f32f-d1d84f80-fb017059'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6777 study2345 = '3594f32b-dcf60e81-58252b67-66222714-c09fca81'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6778
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6779 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6780 UploadFolder(_REMOTE, 'PatientWith2studies')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6781
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6782 # each sub-test is in a dedicated 'if' for clarity
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6783
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6784 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6785 # it shall be impossible to rename a patient when modifying a study if that patient already has other studies
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6786 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/%s/%s/modify' % ('studies', study1234), {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6787 'Replace' : {'PatientName': "TOTO"},
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6788 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6789 'KeepSource' : True
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6790 }))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6791
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6792 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6793 # rename the patient (at patient level)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6794 modifyResponse = DoPost(_REMOTE, '/%s/%s/modify' % ('patients', patientOrthancId), {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6795 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6796 'PatientName': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6797 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6798 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6799 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6800 })
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6801 modifiedPatient = DoGet(_REMOTE, '/%s/%s' % ('patients', modifyResponse['ID']))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6802 # make sure the patient name has been edited at patient level
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6803 self.assertEqual('TOTO', modifiedPatient['MainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6804
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6805 # there should only be 2 studies since we have set KeepSource=False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6806 self.assertEqual(2, len(modifiedPatient['Studies']))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6807 modifiedStudy1 = DoGet(_REMOTE, '/%s/%s' % ('studies', modifiedPatient['Studies'][0]))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6808 modifiedStudy2 = DoGet(_REMOTE, '/%s/%s' % ('studies', modifiedPatient['Studies'][1]))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6809 self.assertEqual('TOTO', modifiedStudy1['PatientMainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6810 self.assertEqual('TOTO', modifiedStudy2['PatientMainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6811
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6812 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6813 # rename the patient (at patient level) and don't keep sources and preserve StudyInstanceUID
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6814 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6815 UploadFolder(_REMOTE, 'PatientWith2studies')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6816
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6817 # rename the patient (at patient level) and don't keep sources and preserve StudyInstanceUID, SeriesInstanceUID
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6818 modifyResponse = DoPost(_REMOTE, '/%s/%s/modify' % ('patients', patientOrthancId), {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6819 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6820 'PatientName': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6821 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6822 'Keep': ['StudyInstanceUID', 'SeriesInstanceUID'],
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6823 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6824 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6825 })
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6826 modifiedPatient = DoGet(_REMOTE, '/%s/%s' % ('patients', modifyResponse['ID']))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6827 # make sure tha patient name has been edited at patient level
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6828 self.assertEqual('TOTO', modifiedPatient['MainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6829
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6830 # there should only be 2 studies since we have set KeepSource=False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6831 self.assertEqual(2, len(modifiedPatient['Studies']))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6832 modifiedStudy1 = DoGet(_REMOTE, '/%s/%s' % ('studies', modifiedPatient['Studies'][0]))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6833 modifiedStudy2 = DoGet(_REMOTE, '/%s/%s' % ('studies', modifiedPatient['Studies'][1]))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6834 # the StudyInstanceUID shall not have changed
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6835 self.assertIn(modifiedStudy1['MainDicomTags']['StudyInstanceUID'], ['1.2.3', '2.3.4'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6836 self.assertIn(modifiedStudy2['MainDicomTags']['StudyInstanceUID'], ['1.2.3', '2.3.4'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6837 # the DB model of parent shall have been reconstructed
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6838 self.assertEqual('TOTO', modifiedStudy1['PatientMainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6839 self.assertEqual('TOTO', modifiedStudy2['PatientMainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6840
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6841 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6842 # it shall not be possible to keep all dicom UID and have KeepSource at False since the modified instances
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6843 # would have the same orthanc ids as the source ids -> they would be deleted
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6844 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/%s/%s/modify' % ('patients', study1234), {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6845 'Replace' : {'PatientName': "TOTO"},
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6846 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6847 'Keep': ['StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID'],
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6848 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6849 }))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6850
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6851 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6852 # rename the patient (at patient level) and don't keep sources and preserve all DicomID
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6853 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6854 UploadFolder(_REMOTE, 'PatientWith2studies')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6855
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6856 # rename the patient (at patient level) and don't keep sources and preserve StudyInstanceUID
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6857 modifyResponse = DoPost(_REMOTE, '/%s/%s/modify' % ('patients', patientOrthancId), {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6858 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6859 'PatientName': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6860 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6861 'Keep': ['StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID'],
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6862 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6863 'KeepSource' : True
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6864 })
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6865 modifiedPatient = DoGet(_REMOTE, '/%s/%s' % ('patients', modifyResponse['ID']))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6866 # make sure tha patient name has been edited at patient level
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6867 self.assertEqual('TOTO', modifiedPatient['MainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6868
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6869 # there should only be 2 studies since we have set KeepSource=False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6870 self.assertEqual(2, len(modifiedPatient['Studies']))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6871 modifiedStudy1 = DoGet(_REMOTE, '/%s/%s' % ('studies', modifiedPatient['Studies'][0]))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6872 modifiedStudy2 = DoGet(_REMOTE, '/%s/%s' % ('studies', modifiedPatient['Studies'][1]))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6873 # the StudyInstanceUID shall not have changed
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6874 self.assertIn(modifiedStudy1['MainDicomTags']['StudyInstanceUID'], ['1.2.3', '2.3.4'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6875 self.assertIn(modifiedStudy2['MainDicomTags']['StudyInstanceUID'], ['1.2.3', '2.3.4'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6876 # the DB model of parent shall have been reconstructed
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6877 self.assertEqual('TOTO', modifiedStudy1['PatientMainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6878 self.assertEqual('TOTO', modifiedStudy2['PatientMainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6879
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6880
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6881 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6882 # try to attach the knee study to an existing patient
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6883 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6884 UploadFolder(_REMOTE, 'PatientWith2studies')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6885 UploadFolder(_REMOTE, 'Knee/T1')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6886
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6887 kneeStudy = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6888
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6889 # try to change the PatientID at study level. This only works if we specify all Patient Tags and if they are identical to the existing Patient in DB
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6890
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6891 # this should fail if only specifying the PatientID
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6892 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/%s/%s/modify' % ('studies', kneeStudy), {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6893 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6894 'PatientID': 'TEST_1'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6895 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6896 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6897 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6898 }))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6899
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6900 # this should fail if specifying all tags but one of them is not correct
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6901 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/%s/%s/modify' % ('studies', kneeStudy), {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6902 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6903 'PatientID': 'TEST_1',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6904 'PatientName': 'Test',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6905 'PatientBirthDate': '19000101',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6906 'PatientSex': 'F' # this is wrong !
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6907 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6908 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6909 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6910 }))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6911
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6912 # this should fail if specifying a tag that is not defined in DB for that patient
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6913 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/%s/%s/modify' % ('studies', kneeStudy), {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6914 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6915 'PatientID': 'TEST_1',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6916 'PatientName': 'Test',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6917 'PatientBirthDate': '19000101',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6918 'PatientSex': 'M',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6919 '0010,1000': 'TUTU' # this does not exist in DB
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6920 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6921 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6922 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6923 }))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6924
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6925 # this should now work with all correct tags
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6926 modifyResponse = DoPost(_REMOTE, '/%s/%s/modify' % ('studies', kneeStudy), {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6927 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6928 'PatientID': 'TEST_1',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6929 'PatientName': 'Test',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6930 'PatientBirthDate': '19000101',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6931 'PatientSex': 'M'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6932 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6933 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6934 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6935 })
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6936 modifiedStudy = DoGet(_REMOTE, '/%s/%s' % ('studies', modifyResponse['ID']))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6937 self.assertEqual('Test', modifiedStudy['PatientMainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6938 patient = DoGet(_REMOTE, '/%s/%s' % ('patients', patientOrthancId))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6939 # make sure tha patient name remains the same at patient level
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6940 self.assertEqual('Test', patient['MainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6941
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6942
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6943 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6944 # try to edit patient in Knee (only study from this patient)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6945 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6946 UploadFolder(_REMOTE, 'PatientWith2studies')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6947 UploadFolder(_REMOTE, 'Knee/T1')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6948
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6949 kneeStudy = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6950 originalKneePatientId = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6951
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6952 originalKneePatient = DoGet(_REMOTE, '/%s/%s' % ('patients', originalKneePatientId))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6953
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6954 # try to change the PatientName and StudyDescription at study level.
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6955 modifyResponse = DoPost(_REMOTE, '/%s/%s/modify' % ('studies', kneeStudy), {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6956 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6957 'PatientName': 'Test Knee',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6958 'StudyDescription': 'Knee study'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6959 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6960 'Keep': ['StudyInstanceUID'],
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6961 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6962 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6963 })
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6964 modifiedStudy = DoGet(_REMOTE, '/%s/%s' % ('studies', modifyResponse['ID']))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6965 self.assertEqual('Test Knee', modifiedStudy['PatientMainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6966 # reload the patient, it shall have been updated as well (and kept the same ID since we did not change the PatientID)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6967 modifiedPatient = DoGet(_REMOTE, '/%s/%s' % ('patients', originalKneePatientId))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6968 self.assertEqual('Test Knee', modifiedPatient['MainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6969
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6970 # try to change the PatientID and PatientName and StudyDescription at study level. Since we use a new PatientID, we can modify its name too
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6971 modifyResponse = DoPost(_REMOTE, '/%s/%s/modify' % ('studies', kneeStudy), {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6972 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6973 'PatientName': 'Test Knee 2',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6974 'PatientID': 'TEST_KNEE_2',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6975 'StudyDescription': 'Knee study 2'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6976 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6977 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6978 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6979 })
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6980 modifiedStudy = DoGet(_REMOTE, '/%s/%s' % ('studies', modifyResponse['ID']))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6981 self.assertEqual('Test Knee 2', modifiedStudy['PatientMainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6982 self.assertEqual('Knee study 2', modifiedStudy['MainDicomTags']['StudyDescription'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6983 # reload the patient, now, its orthanc id has changed
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6984 modifiedPatient = DoGet(_REMOTE, '/%s/%s' % ('patients', modifiedStudy['ParentPatient']))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6985 self.assertEqual('Test Knee 2', modifiedPatient['MainDicomTags']['PatientName'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6986 # the previous patient shall not exist anymore
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6987 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/%s/%s' % ('patients', originalKneePatientId)))
498 62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6988
305 ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6989 def test_store_peer_transcoding(self):
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6990 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6991
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6992 SYNTAXES = [
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6993 '1.2.840.10008.1.2',
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6994 '1.2.840.10008.1.2.1',
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6995 #'1.2.840.10008.1.2.1.99', # Deflated Explicit VR Little Endian (cannot be decoded in debug mode if Orthanc is statically linked against DCMTK 3.6.5)
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6996 '1.2.840.10008.1.2.2',
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6997 '1.2.840.10008.1.2.4.50',
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6998 '1.2.840.10008.1.2.4.51',
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6999 '1.2.840.10008.1.2.4.57',
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7000 '1.2.840.10008.1.2.4.70',
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7001 ]
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7002
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7003 if HasGdcmPlugin(_REMOTE):
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7004 SYNTAXES = SYNTAXES + [
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7005 '1.2.840.10008.1.2.4.80', # This makes DCMTK 3.6.2 crash
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7006 '1.2.840.10008.1.2.4.81', # This makes DCMTK 3.6.2 crash
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7007 '1.2.840.10008.1.2.4.90', # JPEG2k, unavailable without GDCM
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7008 '1.2.840.10008.1.2.4.91', # JPEG2k, unavailable without GDCM
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7009 ]
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7010
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7011 for syntax in SYNTAXES:
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7012 body = {
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7013 'Resources' : [ i ],
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7014 }
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7015
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7016 if syntax != '1.2.840.10008.1.2.1':
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7017 body['Transcode'] = syntax
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7018
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7019 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7020 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7021 DoPost(_REMOTE, '/peers/peer/store', body, 'text/plain')
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7022 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7023 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7024 self.assertEqual(syntax, GetTransferSyntax(
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7025 DoGet(_LOCAL, '/instances/%s/file' % DoGet(_LOCAL, '/instances') [0])))
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7026
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	7027 DropOrthanc(_LOCAL)
308 2565d39dd36c integration mainline->c-get Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 305 diff changeset	7028
2565d39dd36c integration mainline->c-get Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 305 diff changeset	7029
295 946b2199f481 added test for c-get Alain Mazy <alain@mazy.be> parents: 285 diff changeset	7030 def test_getscu(self):
307 5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7031 def CleanTarget():
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7032 if os.path.isdir('/tmp/GETSCU'):
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7033 shutil.rmtree('/tmp/GETSCU')
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7034 os.makedirs('/tmp/GETSCU')
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7035
306 da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	7036 env = {}
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	7037 if _DOCKER:
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	7038 # This is "getscu" from DCMTK 3.6.5 compiled using LSB,
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	7039 # and running in a GNU/Linux distribution running DCMTK
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	7040 # 3.6.0. Tell "getscu" where it can find the DICOM dictionary.
529 53cf0e3ad007 get DCMDICPATH from env Alain Mazy <am@osimis.io> parents: 527 diff changeset	7041 env['DCMDICTPATH'] = os.environ.get('DCMDICTPATH', '/usr/share/libdcmtk2/dicom.dic')
306 da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	7042
295 946b2199f481 added test for c-get Alain Mazy <alain@mazy.be> parents: 285 diff changeset	7043 # no transcoding required
307 5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7044 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7045
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7046 CleanTarget()
295 946b2199f481 added test for c-get Alain Mazy <alain@mazy.be> parents: 285 diff changeset	7047
306 da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	7048 subprocess.check_call([
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	7049 FindExecutable('getscu'),
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	7050 _REMOTE['Server'],
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	7051 str(_REMOTE['DicomPort']),
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	7052 '-aec', 'ORTHANC',
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	7053 '-aet', 'ORTHANCTEST', # pretend to be the other orthanc
307 5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7054 '-k', '0020,000d=2.16.840.1.113669.632.20.1211.10000357775',
306 da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	7055 '-k', '0008,0052=STUDY',
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	7056 '--output-directory', '/tmp/GETSCU/'
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	7057 ], env = env)
295 946b2199f481 added test for c-get Alain Mazy <alain@mazy.be> parents: 285 diff changeset	7058
311 07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	7059 f1 = '/tmp/GETSCU/MR.1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314079549'
07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	7060 self.assertTrue(os.path.isfile(f1))
07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	7061 with open(f1, 'rb') as f:
543 8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 540 diff changeset	7062 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(f.read(), encoding='ISO-8859-1'))
311 07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	7063
307 5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7064 CleanTarget()
295 946b2199f481 added test for c-get Alain Mazy <alain@mazy.be> parents: 285 diff changeset	7065
946b2199f481 added test for c-get Alain Mazy <alain@mazy.be> parents: 285 diff changeset	7066 # transcoding required
311 07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	7067 UploadInstance(_REMOTE, 'TransferSyntaxes/1.2.840.10008.1.2.4.50.dcm')
307 5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7068
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7069 subprocess.check_call([
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7070 FindExecutable('getscu'),
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7071 _REMOTE['Server'],
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7072 str(_REMOTE['DicomPort']),
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7073 '-aec', 'ORTHANC',
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7074 '-aet', 'ORTHANCTEST', # pretend to be the other orthanc
311 07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	7075 '-k', '0020,000d=2.16.840.1.113669.632.20.1211.10000357775\\1.2.840.113663.1298.6234813.1.298.20000329.1115122',
307 5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7076 '-k', '0008,0052=STUDY',
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7077 '--output-directory', '/tmp/GETSCU/'
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7078 ], env = env)
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	7079
311 07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	7080 self.assertTrue(os.path.isfile(f1))
07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	7081 with open(f1, 'rb') as f:
543 8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 540 diff changeset	7082 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(f.read(), encoding='ISO-8859-1'))
311 07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	7083
07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	7084 # This file is transcoded from "1.2.840.10008.1.2.4.50" to "1.2.840.10008.1.2.1"
07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	7085 # (LittleEndianExplicit is proposed by default by "getscu")
07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	7086 f2 = '/tmp/GETSCU/US.1.2.840.113663.1298.1.3.715.20000329.1115326'
07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	7087 self.assertTrue(os.path.isfile(f2))
07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	7088 with open(f2, 'rb') as f:
07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	7089 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(f.read()))
324 6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7090
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7091
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7092 def test_findscu_truncation(self):
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7093 # https://groups.google.com/forum/#!msg/orthanc-users/FkckWAHvso8/UbRBAhQ5CwAJ
585 536e1a76a2b5 new hg server Alain Mazy <am@osimis.io> parents: 584 diff changeset	7094 # Fixed by: https://orthanc.uclouvain.be/hg/orthanc/rev/2724977419fb
324 6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7095 UploadInstance(_REMOTE, 'Multiframe.dcm')
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7096 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7097
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7098 study = '1.3.46.670589.7.5.8.80001255161.20000323.151537.1'
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7099
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7100 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyInstanceUID' ])
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7101 result = re.findall('$0020,000d$.?\[(.?)\]', i)
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7102 self.assertEqual(2, len(result))
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7103
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7104 # The "StudyInstanceUID" is set as a list of 5 times the same
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7105 # study, leading to a string of 249 characters
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7106 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k',
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7107 'StudyInstanceUID=%s\\%s\\%s\\%s\\%s' % (( study, ) * 5) ])
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7108 result = re.findall('$0020,000d$.?\[(.?)\]', i)
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7109 self.assertEqual(1, len(result))
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7110
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7111 # The "StudyInstanceUID" is set as a list of 6 times the same
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7112 # study, leading to a string of 299 characters. In Orthanc <=
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7113 # 1.7.2, this is above the value of ORTHANC_MAXIMUM_TAG_LENGTH
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7114 # == 256, and is thus wiped out by C-FIND SCP. As a
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7115 # consequence, Orthanc <= 1.7.2 doesn't apply the filter on
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7116 # "StudyInstanceUID" and returns all the available
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7117 # studies (i.e. 2). This issue was fixed in Orthanc 1.7.3.
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7118 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k',
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7119 'StudyInstanceUID=%s\\%s\\%s\\%s\\%s\\%s' % (( study, ) * 6) ])
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7120 result = re.findall('$0020,000d$.?\[(.?)\]', i)
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7121 self.assertEqual(1, len(result))
328 8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7122
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7123
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7124 def test_store_compressed(self):
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7125 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f:
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7126 dicom = f.read()
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7127 i = DoPost(_REMOTE, '/instances', dicom) ['ID']
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7128 sourceSize = len(dicom)
324 6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	7129
328 8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7130 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7131 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7132
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7133 # Sending to the local Orthanc 0.8.6 server, without compression: OK
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7134 jobId = MonitorJob2(_REMOTE, lambda: DoPost(
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7135 _REMOTE, '/peers/peer/store', {
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7136 'Resources' : [ i ],
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7137 'Synchronous' : False,
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7138 }))
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7139
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7140 job = DoGet(_REMOTE, '/jobs/%s' % jobId)
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7141 self.assertFalse(job['Content']['Compress'])
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7142 self.assertEqual('', job['Content']['Peer'][2]) # Password must not be reported
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7143 self.assertEqual(str(sourceSize), job['Content']['Size'])
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7144
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7145 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7146 DropOrthanc(_LOCAL)
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7147
509 17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7148 if not IsOrthancVersionAbove(_LOCAL, 1, 11, 2): # don't know which specific version the behaviour changed but this fails with 0.8.6
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7149 # Sending to the local Orthanc 0.8.6 server, with compression:
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7150 # Not supported by Orthanc 0.8.6 => failure
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7151 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/peers/peer/store', {
328 8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7152 'Resources' : [ i ],
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7153 'Compress' : True,
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	7154 }))
509 17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7155 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7156
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7157 # Sending to the tested remote server, with compression: OK
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7158 jobId = MonitorJob2(_REMOTE, lambda: DoPost(
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7159 _REMOTE, '/peers/self/store', {
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7160 'Resources' : [ i ],
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7161 'Compress' : True,
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7162 'Synchronous' : False,
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7163 }))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7164
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7165 job = DoGet(_REMOTE, '/jobs/%s' % jobId)
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7166 self.assertTrue(job['Content']['Compress'])
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7167
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7168 # Compression must have divided the size of the sent data at least twice
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7169 self.assertLess(int(job['Content']['Size']), sourceSize / 2)
332 dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7170
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7171
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7172 def test_move_ambra(self):
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7173 # "Orthanc + Ambra: Query/Retrieve" (2020-08-25)
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7174 # https://groups.google.com/g/orthanc-users/c/yIUnZ9v9-Zs/m/GQPXiAOiCQAJ
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7175
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7176 UploadInstance(_REMOTE, '2019-06-17-VedranZdesic.dcm')
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7177
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7178 self.assertFalse(MonitorJob(_REMOTE, lambda: CallMoveScu([
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7179 '--study',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7180 '-k', 'StudyInstanceUID='
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7181 ])))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7182
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7183 self.assertFalse(MonitorJob(_REMOTE, lambda: CallMoveScu([
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7184 '--study',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7185 '-k', 'AccessionNumber=',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7186 ])))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7187
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7188 self.assertFalse(MonitorJob(_REMOTE, lambda: CallMoveScu([
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7189 '--study',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7190 '-k', 'AccessionNumber=',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7191 '-k', 'StudyInstanceUID='
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7192 ])))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7193
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7194 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7195 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7196 '--study',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7197 '-k', 'AccessionNumber=CT16000988',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7198 '-k', 'StudyInstanceUID=',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7199 ])))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7200 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7201 DropOrthanc(_LOCAL)
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7202
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7203 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7204 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7205 '--study',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7206 '-k', 'AccessionNumber=CT16000988',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7207 '-k', 'StudyInstanceUID=1.2.840.113619.2.278.3.4194965761.659.1468842739.39',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7208 ])))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7209 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7210 DropOrthanc(_LOCAL)
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7211
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7212 # This fails on Orthanc <= 1.7.3
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7213 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7214 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7215 '--study',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7216 '-k', 'AccessionNumber=',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7217 '-k', 'StudyInstanceUID=1.2.840.113619.2.278.3.4194965761.659.1468842739.39'
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7218 ])))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7219 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	7220 DropOrthanc(_LOCAL)
333 695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7221
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7222
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7223 def test_decode_elscint(self):
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7224 # https://groups.google.com/g/orthanc-users/c/d9anAx6lSis/m/qEzm1x3PAAAJ
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7225 a = UploadInstance(_REMOTE, '2020-09-12-ELSCINT1-PMSCT_RLE1.dcm')['ID']
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7226 b = UploadInstance(_REMOTE, '2020-09-11-Christopher-ELSCINT1-Raw.dcm')['ID']
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7227
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7228 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % a)
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7229 self.assertEqual("L", im.mode)
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7230 self.assertEqual(512, im.size[0])
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7231 self.assertEqual(512, im.size[1])
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7232
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7233 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % b)
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7234 self.assertEqual("L", im.mode)
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7235 self.assertEqual(512, im.size[0])
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7236 self.assertEqual(512, im.size[1])
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7237
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7238 # The two tests below fail on Orthanc <= 1.7.3
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7239 raw = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % a)
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7240 self.assertEqual(512 * 512 * 2, len(raw))
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7241
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7242 raw = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % b)
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7243 self.assertEqual(512 * 512 * 2, len(raw))
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	7244
334 971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	7245
971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	7246 def test_rest_modalities_in_study_2(self):
971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	7247 # Problem reported by Alain Mazy on 2020-09-15
971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	7248 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm')
971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	7249 UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0001.dcm')
971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	7250
335 96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7251 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', '0020,000d=', '-k', '0008,0061=' ])
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7252 modalitiesInStudy = re.findall('$0008,0061$.?\[(.?)\]', i)
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7253 self.assertEqual(1, len(modalitiesInStudy))
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7254 self.assertEqual('CT\\PT ', modalitiesInStudy[0])
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7255
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7256 for i in [ '', 'CT', 'PT', 'UX', 'UX\\MR', 'CT\\PT', 'UX\\PT', 'CT\\PT', 'UX\\CT\\PT' ]:
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7257 # The empty string '' corresponds to universal matching.
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7258 # The case where "i == 'CT'" failed in Orthanc <= 1.7.3.
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7259
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7260 if i in [ 'UX', 'UX\\MR' ]:
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7261 expected = 0
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7262 else:
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7263 expected = 1
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7264
334 971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	7265 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	7266 'Query' : { 'ModalitiesInStudy' : i }})
335 96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7267 self.assertEqual(expected, len(a))
334 971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	7268
971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	7269 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', '0020,000d=', '-k', '0008,0061=%s' % i ])
971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	7270 studyInstanceUid = re.findall('$0020,000d$.?\[(.?)\]', i)
335 96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7271 self.assertEqual(expected, len(studyInstanceUid))
337 ec13ace43bde trying webdav tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 335 diff changeset	7272
ec13ace43bde trying webdav tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 335 diff changeset	7273
ec13ace43bde trying webdav tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 335 diff changeset	7274 def test_webdav(self):
ec13ace43bde trying webdav tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 335 diff changeset	7275 self.assertRaises(Exception, lambda: DoPropFind(_REMOTE, '/webdav/', 2))
ec13ace43bde trying webdav tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 335 diff changeset	7276
342 bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7277 for suffix in [ '', '/' ]:
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7278 f = DoPropFind(_REMOTE, '/webdav' + suffix, 0)
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7279 self.assertEqual(1, len(f))
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7280 self.assertTrue('/webdav/' in f.keys())
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7281 self.assertTrue(f['/webdav/']['folder'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7282 self.assertEqual('webdav', f['/webdav/']['displayname'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7283
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7284 f = DoPropFind(_REMOTE, '/webdav' + suffix, 1)
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7285 self.assertEqual(6, len(f))
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7286 self.assertTrue(f['/webdav/']['folder'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7287 self.assertEqual('webdav', f['/webdav/']['displayname'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7288
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7289 for i in [ 'by-dates', 'by-patients', 'by-studies', 'by-uids', 'uploads' ]:
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7290 self.assertTrue(f['/webdav/%s' % i]['folder'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7291 self.assertEqual(i, f['/webdav/%s' % i]['displayname'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7292
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7293 for depth in [ 0, 1 ]:
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7294 for suffix2 in [ '', '/' ]:
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7295 g = DoPropFind(_REMOTE, '/webdav/%s%s' % (i, suffix2), depth)
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7296
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7297 if i == 'uploads':
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7298 # Empty folders might still exist in "/uploads/"
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7299 self.assertTrue('/webdav/uploads/' in g)
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7300 self.assertEqual('uploads', g['/webdav/uploads/']['displayname'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7301 for j in g.items():
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7302 self.assertTrue(g.items()[0][1]['folder'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7303 else:
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7304 self.assertEqual(1, len(g))
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7305 self.assertEqual('/webdav/%s/' % i, g.items()[0][0])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7306 self.assertTrue(g.items()[0][1]['folder'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7307 self.assertEqual(i, g.items()[0][1]['displayname'])
341 66a36befb208 extending Toolbox.DoPropFind() Sebastien Jodogne <s.jodogne@gmail.com> parents: 337 diff changeset	7308
342 bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7309 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7310 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f:
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7311 DoPut(_REMOTE, '/webdav/uploads/dummy', f.read(), 'text/plain')
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7312
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7313 while len(DoGet(_REMOTE, '/patients')) == 0:
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7314 time.sleep(0.01)
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7315 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
337 ec13ace43bde trying webdav tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 335 diff changeset	7316
349 698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7317
698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7318 def test_log_categories(self):
350 8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7319 original = DoGet(_REMOTE, '/tools/log-level-http')
349 698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7320
350 8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7321 DoPut(_REMOTE, '/tools/log-level-http', 'default')
8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7322 self.assertEqual('default', DoGet(_REMOTE, '/tools/log-level-http'))
349 698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7323 DoGet(_REMOTE, '/system')
698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7324
350 8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7325 DoPut(_REMOTE, '/tools/log-level-http', 'verbose')
8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7326 self.assertEqual('verbose', DoGet(_REMOTE, '/tools/log-level-http'))
349 698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7327 DoGet(_REMOTE, '/system')
698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7328
350 8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7329 DoPut(_REMOTE, '/tools/log-level-http', 'trace')
8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7330 self.assertEqual('trace', DoGet(_REMOTE, '/tools/log-level-http'))
349 698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7331 DoGet(_REMOTE, '/system')
698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7332
350 8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7333 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/log-level-http', 'nope'))
349 698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7334
698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7335 # Switch back to the original log level
350 8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7336 DoPut(_REMOTE, '/tools/log-level-http', original)
8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7337
8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7338 for c in [ 'generic', 'http', 'dicom', 'plugins', 'sqlite', 'lua', 'jobs' ]:
349 698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7339 DoPut(_REMOTE, '/tools/log-level-%s' % c, DoGet(_REMOTE, '/tools/log-level-%s' % c))
698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7340
698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7341 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/log-level-nope', 'default'))
357 18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7342
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7343
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7344 def test_upload_zip(self):
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7345 f = StringIO()
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7346 with zipfile.ZipFile(f, 'w') as z:
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7347 z.writestr('hello/world/invalid.txt', 'Hello world')
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7348 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as g:
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7349 c = g.read()
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7350 z.writestr('hello/world/dicom1.dcm', c)
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7351 z.writestr('hello/world/dicom2.dcm', c)
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7352
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7353 f.seek(0)
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7354 i = DoPost(_REMOTE, '/instances', f.read())
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7355
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7356 self.assertEqual(2, len(i))
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7357 self.assertEqual(i[0], i[1])
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7358 self.assertEqual(6, len(i[0]))
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7359 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', i[0]['ID'])
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7360 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', i[0]['ParentSeries'])
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7361 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', i[0]['ParentStudy'])
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7362 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', i[0]['ParentPatient'])
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7363 self.assertEqual('/instances/66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', i[0]['Path'])
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7364
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7365 # Both are "Success" (instead of one "AlreadyStored"), because "OverwriteInstance" is true
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7366 self.assertEqual('Success', i[0]['Status'])
361 6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7367
6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7368
6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7369 def test_transfer_syntax_no_metaheader(self):
6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7370 a = UploadInstance(_REMOTE, 'TransferSyntaxes/1.2.840.10008.1.2.dcm')['ID']
6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7371 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % a)
6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7372 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', m['SopClassUid'])
6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7373
6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7374 # This fails on Orthanc <= 1.8.1
6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7375 self.assertTrue('TransferSyntax' in m)
6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7376 self.assertEqual('1.2.840.10008.1.2', m['TransferSyntax'])
368 2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7377
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7378
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7379 def test_upload_multipart_1(self):
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7380 # This tests the "Upload" button in Orthanc Explorer
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7381
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7382 def EncodeChunk(data, boundary, filename):
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7383 return (('--%s\r\n' +
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7384 'Content-Disposition : form-data ; name ="files[]" ; filename = "%s" \r\n' +
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7385 '\r\n%s\r\n') % (boundary, filename, data))
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7386
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7387 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f:
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7388 dcm1 = f.read()
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7389
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7390 with open(GetDatabasePath('ColorTestMalaterre.dcm'), 'rb') as f:
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7391 dcm2 = f.read()
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7392
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7393 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7394
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7395 boundary = '----WebKitFormBoundarypJDNQqJPoXiorRmQ'
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7396 m = DoPost(_REMOTE, '/instances', (EncodeChunk(dcm1, boundary, 'DummyCT.dcm') +
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7397 EncodeChunk(dcm2, boundary, 'ColorTestMalaterre.dcm') +
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7398 '--' + boundary + '--'), headers = {
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7399 'Content-Type' : 'multipart/form-data ; boundary = %s ' % boundary,
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7400 'X-Requested-With' : 'XMLHttpRequest',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7401 })
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7402
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7403 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7404
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7405
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7406 def test_upload_multipart_2(self):
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7407 # This tests the "maxChunkSize" option of "jQuery File Upload
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7408 # 5.12", whose source code can be found in:
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7409 # "OrthancServer/OrthancExplorer/libs/jquery-file-upload/"
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7410
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7411 def EncodeBody(data, boundary, filename):
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7412 return (('--%s\r\n' +
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7413 'Content-Disposition: form-data; name="files[]"; filename="%s"\r\n' +
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7414 '\r\n%s\r\n--%s') % (boundary, filename, data, boundary))
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7415
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7416 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f:
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7417 dcm = f.read()
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7418
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7419 with open(GetDatabasePath('ColorTestMalaterre.dcm'), 'rb') as f:
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7420 dcm2 = f.read()
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7421
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7422 boundary = '----WebKitFormBoundarypJDNQqJPoXiorRmQ'
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7423
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7424 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7425 m = DoPost(_REMOTE, '/instances',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7426 EncodeBody(dcm[0:1000], boundary, 'DummyCT.dcm'),
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7427 headers = {
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7428 'Content-Type' : 'multipart/form-data; boundary=%s' % boundary,
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7429 'X-Requested-With' : 'XMLHttpRequest',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7430 'X-File-Name' : 'DummyCT.dcm',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7431 'X-File-Size' : str(len(dcm)),
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7432 })
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7433
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7434 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7435 m = DoPost(_REMOTE, '/instances',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7436 EncodeBody(dcm[1000:2000], boundary, 'DummyCT.dcm'),
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7437 headers = {
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7438 'Content-Type' : 'multipart/form-data; boundary=%s' % boundary,
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7439 'X-Requested-With' : 'XMLHttpRequest',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7440 'X-File-Name' : 'DummyCT.dcm',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7441 'X-File-Size' : str(len(dcm)),
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7442 })
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7443 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7444
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7445 m = DoPost(_REMOTE, '/instances',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7446 EncodeBody(dcm2, boundary, 'ColorTestMalaterre.dcm'),
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7447 headers = {
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7448 'Content-Type' : 'multipart/form-data; boundary=%s' % boundary,
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7449 'X-Requested-With' : 'XMLHttpRequest',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7450 'X-File-Name' : 'ColorTestMalaterre.dcm',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7451 'X-File-Size' : str(len(dcm2)),
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7452 })
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7453
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7454 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7455
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7456 # Upload the last chunk => the file is now entirely available
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7457 m = DoPost(_REMOTE, '/instances',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7458 EncodeBody(dcm[2000:len(dcm)], boundary, 'DummyCT.dcm'),
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7459 headers = {
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7460 'Content-Type' : 'multipart/form-data; boundary=%s' % boundary,
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7461 'X-Requested-With' : 'XMLHttpRequest',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7462 'X-File-Name' : 'DummyCT.dcm',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7463 'X-File-Size' : str(len(dcm)),
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7464 })
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7465
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7466 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
377 cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7467
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7468
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7469 def test_pixel_data_offset(self):
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7470 # New in Orthanc 1.9.1
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7471 def Check(path, offset):
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7472 i = UploadInstance(_REMOTE, path) ['ID']
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7473 metadata = DoGetRaw(_REMOTE, '/instances/%s/metadata/PixelDataOffset' % i) [1]
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7474 self.assertEqual(offset, metadata)
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7475
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7476 Check('ColorTestMalaterre.dcm', str(0x03a0))
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7477 Check('TransferSyntaxes/1.2.840.10008.1.2.1.dcm', str(0x037c))
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7478 Check('TransferSyntaxes/1.2.840.10008.1.2.2.dcm', str(0x03e8)) # Big endian
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7479 Check('TransferSyntaxes/1.2.840.10008.1.2.4.50.dcm', str(0x04ac))
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7480 Check('TransferSyntaxes/1.2.840.10008.1.2.4.51.dcm', str(0x072c))
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7481 Check('TransferSyntaxes/1.2.840.10008.1.2.4.57.dcm', str(0x0620))
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7482 Check('TransferSyntaxes/1.2.840.10008.1.2.4.70.dcm', str(0x065a))
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7483 Check('TransferSyntaxes/1.2.840.10008.1.2.4.80.dcm', str(0x0b46))
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7484 Check('TransferSyntaxes/1.2.840.10008.1.2.4.81.dcm', str(0x073e))
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7485 Check('TransferSyntaxes/1.2.840.10008.1.2.4.90.dcm', str(0x0b66))
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7486 Check('TransferSyntaxes/1.2.840.10008.1.2.4.91.dcm', str(0x19b8))
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7487 Check('TransferSyntaxes/1.2.840.10008.1.2.5.dcm', str(0x0b0a))
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7488 Check('TransferSyntaxes/1.2.840.10008.1.2.dcm', '') # No valid DICOM preamble
382 a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7489
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7490
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7491 def test_peer_store_straight(self):
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7492 self.assertEqual(0, len(DoGet(_LOCAL, '/exports')['Exports']))
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7493 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7494
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7495 peer = DoGet(_REMOTE, '/peers/peer/system')
509 17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7496 if not IsOrthancVersionAbove(_LOCAL, 0, 8, 6):
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7497 self.assertEqual(3, len(peer))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7498 self.assertEqual(5, peer['DatabaseVersion'])
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7499 self.assertEqual('MyOrthanc', peer['Name'])
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7500 self.assertEqual('0.8.6', peer['Version'])
382 a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7501
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7502 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f:
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7503 j = DoPost(_REMOTE, '/peers/peer/store-straight', f.read(), 'application/dicom')
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7504
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7505 # Remote server is Orthanc 0.8.6, thus "ParentPatient",
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7506 # "ParentStudy", "ParentSeries" are not reported
509 17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7507 if not IsOrthancVersionAbove(_LOCAL, 1, 11, 2): # don't know which specific version the behaviour changed but this fails with 0.8.6
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7508 self.assertEqual(3, len(j))
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7509 else:
17a74118d73a allow the tests to run with more recent LOCAL version of Orthanc (1.11.2 instead of 0.8.6) Alain Mazy <am@osimis.io> parents: 508 diff changeset	7510 self.assertEqual(6, len(j))
382 a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7511 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', j['ID'])
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7512 self.assertEqual('/instances/66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', j['Path'])
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7513 self.assertEqual('Success', j['Status'])
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7514
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7515 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7516 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
383 05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7517
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7518
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7519 def test_cp246(self):
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7520 # This fails on Orthanc <= 1.9.0
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7521 a = UploadInstance(_REMOTE, '2021-02-19-MalaterreCP246.dcm')['ID']
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7522 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7523
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7524 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % a)
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7525 self.assertEqual('1.2.840.10008.5.1.4.1.1.128', tags['0008,0016'])
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7526 self.assertEqual('1.3.12.2.1107.5.1.4.36085.2.0.517715415141633', tags['0008,0018'])
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7527 self.assertEqual('1.2.840.113745.101000.1008000.38179.6792.6324567', tags['0020,000d'])
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7528 self.assertEqual('1.3.12.2.1107.5.1.4.36085.2.0.517714246252254', tags['0020,000e'])
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7529
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7530 study = DoGet(_REMOTE, '/instances/%s/study' % a)
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7531 self.assertEqual(tags['0020,000d'], study['MainDicomTags']['StudyInstanceUID'])
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7532
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7533 series = DoGet(_REMOTE, '/instances/%s/series' % a)
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7534 self.assertEqual(tags['0020,000e'], series['MainDicomTags']['SeriesInstanceUID'])
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7535
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7536 instance = DoGet(_REMOTE, '/instances/%s' % a)
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7537 self.assertEqual(tags['0008,0018'], instance['MainDicomTags']['SOPInstanceUID'])
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7538
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7539
392 5cbcb4a83b41 fix for revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 391 diff changeset	7540 def test_revisions_metadata(self):
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7541 # This test fails on Orthanc <= 1.9.1 (support for revisions
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7542 # was introduced in 1.9.2), or if configuration option
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7543 # "CheckRevisions" is "False". Conventions for HTTP headers
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7544 # related to revisions mimic CouchDB:
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7545 # https://docs.couchdb.org/en/stable/api/document/common.html
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7546 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7547
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7548 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7549 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7550 self.assertEqual('"0-%s"' % ComputeMD5('1.2.840.10008.1.2.4.70'), headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7551 self.assertEqual('1.2.840.10008.1.2.4.70', body)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7552
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7553 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i, headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7554 'If-None-Match' : '"aaa"'
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7555 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7556 self.assertEqual('400', headers['status']) # Bad header format
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7557
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7558 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i, headers = {
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7559 'If-None-Match' : '"aaa-bbb"'
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7560 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7561 self.assertEqual('400', headers['status']) # Bad header format
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7562
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7563 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i, headers = {
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7564 'If-None-Match' : '"0-16de4d7060d0b9d102ef0fca8acc892a"'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7565 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7566 self.assertEqual('304', headers['status']) # Not modified
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7567 self.assertEqual('"0-16de4d7060d0b9d102ef0fca8acc892a"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7568 self.assertEqual('', body) # Body must be empty on 304 status
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7569
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7570 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i, headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7571 'If-None-Match' : '"1-16de4d7060d0b9d102ef0fca8acc892a"' # Bad revision, good MD5
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7572 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7573 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7574 self.assertEqual('"0-16de4d7060d0b9d102ef0fca8acc892a"', headers['etag'])
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7575 self.assertEqual('1.2.840.10008.1.2.4.70', body)
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7576
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7577 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i, headers = {
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7578 'If-None-Match' : '"0-aaa"' # Good revision, bad MD5
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7579 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7580 self.assertEqual('200', headers['status'])
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7581 self.assertEqual('"0-16de4d7060d0b9d102ef0fca8acc892a"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7582 self.assertEqual('1.2.840.10008.1.2.4.70', body)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7583
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7584 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7585 self.assertEqual('403', headers['status']) # Forbidden (system metadata)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7586
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7587 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i, 'hello')
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7588 self.assertEqual('403', headers['status']) # Forbidden (system metadata)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7589
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7590 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/metadata/1024' % i, 'hello')
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7591 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7592 self.assertEqual('"0-%s"' % ComputeMD5('hello'), headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7593
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7594 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/1024' % i)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7595 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7596 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7597 self.assertEqual('hello', body)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7598
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7599 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/1024' % i, headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7600 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7601 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7602 self.assertEqual('304', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7603 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7604 self.assertEqual('', body)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7605
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7606 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/1024' % i, headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7607 'If-None-Match' : '"1-tata"'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7608 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7609 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7610 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7611 self.assertEqual('hello', body)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7612 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/metadata/1024' % i))
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7613
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7614 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/metadata/1024' % i)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7615 self.assertEqual('409', headers['status']) # No revision given, but "CheckRevisions" is True
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7616
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7617 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/metadata/1024' % i, headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7618 'If-Match' : '45-5d41402abc4b2a76b9719d911017c592'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7619 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7620 self.assertEqual('409', headers['status']) # Conflict, as bad revision
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7621
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7622 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/metadata/1024' % i, headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7623 'If-Match' : '0-tata'
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7624 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7625 self.assertEqual('409', headers['status']) # Conflict, as bad MD5
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7626
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7627 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/metadata/1024' % i, headers = {
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7628 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7629 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7630 self.assertEqual('200', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7631
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7632 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/metadata/1024' % i, headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7633 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7634 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7635 self.assertEqual('404', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7636
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7637 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/1024' % i)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7638 self.assertEqual('404', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7639
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7640 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/metadata/1024' % i))
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7641
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7642 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/metadata/1024' % i, 'hello')
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7643 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7644 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7645
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7646 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/metadata/1024' % i, 'hello')
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7647 self.assertEqual('409', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7648
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7649 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/1024' % i, headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7650 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7651 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7652 self.assertEqual('304', headers['status']) # Not modified
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7653 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7654 self.assertEqual('', body) # Body must be empty on 304 status
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7655
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7656 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/metadata/1024' % i, 'hello', headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7657 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7658 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7659 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7660 self.assertEqual('"1-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7661 self.assertEqual('', body)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7662
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7663 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/1024' % i, headers = {
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7664 'If-None-Match' : headers['etag']
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7665 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7666
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7667 if headers['status'] == '200':
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7668 print("Your database backend doesn't store revisions")
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7669 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/metadata/1024' % i, 'hello2', headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7670 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7671 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7672 self.assertEqual('409', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7673
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7674 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/metadata/1024' % i, 'hello2', headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7675 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7676 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7677 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7678 self.assertEqual('"1-6e809cbda0732ac4845916a59016f954"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7679 self.assertEqual('', body)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7680
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7681 elif headers['status'] == '304': # Revisions are supported
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7682 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/metadata/1024' % i, 'hello2', headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7683 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7684 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7685 self.assertEqual('409', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7686
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7687 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/metadata/1024' % i, 'hello2', headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7688 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7689 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7690 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7691 self.assertEqual('"2-6e809cbda0732ac4845916a59016f954"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7692 self.assertEqual('', body)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7693
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7694 else:
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7695 raise Exception('Internal error')
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7696
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7697 self.assertEqual('hello2', DoGet(_REMOTE, '/instances/%s/metadata/1024' % i))
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7698
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7699
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7700 def test_revisions_attachments(self):
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7701 # This test fails on Orthanc <= 1.9.1 (support for revisions
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7702 # was introduced in 1.9.2), or if configuration option
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7703 # "CheckRevisions" is "False". Conventions for HTTP headers
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7704 # related to revisions mimic CouchDB:
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7705 # https://docs.couchdb.org/en/stable/api/document/common.html
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7706 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7707
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7708 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f:
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7709 md5 = ComputeMD5(f.read())
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7710
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7711 # "/compress", "/uncompress" and "/verify-md5" are POST
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7712 # methods, and are not affected by revisions
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7713 for suffix in [ '', '/compressed-data', '/compressed-md5', '/compressed-size',
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7714 '/data', '/is-compressed', '/md5', '/size' ]:
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7715 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom/%s' % (i, suffix))
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7716 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7717 self.assertEqual('"0-%s"' % md5, headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7718
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7719 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom/%s' % (i, suffix), headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7720 'If-None-Match' : '"0-3e29b869978b6db4886355a2b1132124"',
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7721 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7722 self.assertEqual('304', headers['status']) # Not modified
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7723 self.assertEqual('"0-3e29b869978b6db4886355a2b1132124"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7724 self.assertEqual('', body) # Body must be empty on 304 status
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7725
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7726 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom/%s' % (i, suffix), headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7727 'If-None-Match' : '"tata"', # Invalid header
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7728 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7729 self.assertEqual('400', headers['status'])
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7730
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7731 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom/%s' % (i, suffix), headers = {
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7732 'If-None-Match' : '"1-%s"' % md5, # Bad revision, good MD5
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7733 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7734 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7735 self.assertEqual('"0-3e29b869978b6db4886355a2b1132124"', headers['etag'])
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7736
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7737 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/dicom/%s' % (i, suffix), headers = {
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7738 'If-None-Match' : '"0-tata"' # Good revision, bad MD5
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7739 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7740 self.assertEqual('200', headers['status'])
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7741 self.assertEqual('"0-3e29b869978b6db4886355a2b1132124"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7742
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7743 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/attachments/dicom' % i)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7744 self.assertEqual('403', headers['status']) # Forbidden (system metadata)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7745
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7746 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/dicom' % i, 'hello')
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7747 self.assertEqual('403', headers['status']) # Forbidden (system metadata)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7748
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7749 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello')
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7750 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7751 self.assertEqual('"0-%s"' % ComputeMD5('hello'), headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7752
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7753 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7754 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7755 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7756 self.assertEqual('hello', body)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7757
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7758 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i, headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7759 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7760 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7761 self.assertEqual('304', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7762 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7763 self.assertEqual('', body)
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7764
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7765 for h in [ '"1-5d41402abc4b2a76b9719d911017c592"', # Bad revision, good MD5
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7766 '"0-tata"']: # Good revision, bad MD5
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7767 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i, headers = {
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7768 'If-None-Match' : h
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7769 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7770 self.assertEqual('200', headers['status'])
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7771 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7772 self.assertEqual('hello', body)
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7773
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7774 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i, headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7775 'If-None-Match' : 'tata' # Bad header format
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7776 })
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7777 self.assertEqual('400', headers['status'])
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7778 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7779
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7780 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/attachments/1024/data' % i))
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7781
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7782 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/attachments/1024' % i)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7783 self.assertEqual('409', headers['status']) # No revision given, but "CheckRevisions" is True
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7784
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7785 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/attachments/1024' % i, headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7786 'If-Match' : '45-5d41402abc4b2a76b9719d911017c592'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7787 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7788 self.assertEqual('409', headers['status']) # Conflict, as bad revision
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7789
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7790 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/attachments/1024' % i, headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7791 'If-Match' : '0-tata'
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7792 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7793 self.assertEqual('409', headers['status']) # Conflict, as bad MD5
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7794
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7795 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/attachments/1024' % i, headers = {
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7796 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7797 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7798 self.assertEqual('200', headers['status'])
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7799
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7800 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/attachments/1024' % i, headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7801 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7802 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7803 self.assertEqual('404', headers['status'])
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7804
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7805 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7806 self.assertEqual('404', headers['status'])
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7807
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7808 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/attachments/1024' % i))
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7809
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7810 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello')
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7811 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7812 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7813
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7814 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello')
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7815 self.assertEqual('409', headers['status'])
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7816
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7817 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i, headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7818 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7819 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7820 self.assertEqual('304', headers['status']) # Not modified
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7821 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7822 self.assertEqual('', body) # Body must be empty on 304 status
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7823
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7824 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello', headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7825 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7826 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7827 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7828 self.assertEqual('"1-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7829 self.assertEqual('{}', body)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7830
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7831 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i, headers = {
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7832 'If-None-Match' : headers['etag']
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7833 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7834
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7835 if headers['status'] == '200':
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7836 print("Your database backend doesn't store revisions")
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7837 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello2', headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7838 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7839 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7840 self.assertEqual('409', headers['status'])
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7841
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7842 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello2', headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7843 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7844 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7845 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7846 self.assertEqual('"1-6e809cbda0732ac4845916a59016f954"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7847 self.assertEqual('{}', body)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7848
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7849 elif headers['status'] == '304': # Revisions are supported
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7850 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello2', headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7851 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7852 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7853 self.assertEqual('409', headers['status'])
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7854
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7855 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello2', headers = {
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7856 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7857 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7858 self.assertEqual('200', headers['status'])
397 eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7859 self.assertEqual('"2-6e809cbda0732ac4845916a59016f954"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7860 self.assertEqual('{}', body)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7861
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7862 else:
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7863 raise Exception('Internal error')
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7864
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7865 self.assertEqual('hello2', DoGet(_REMOTE, '/instances/%s/attachments/1024/data' % i))
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7866
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7867
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7868 def test_issue_195(self):
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7869 # This fails on Orthanc <= 1.9.2
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	7870 # https://bugs.orthanc-server.com/show_bug.cgi?id=195
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7871 a = UploadInstance(_REMOTE, 'Issue195.dcm')['ID']
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7872 b = DoGet(_REMOTE, '/instances/%s/file' % a,
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7873 headers = { 'Accept' : 'application/dicom+json' })
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7874
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7875 # The expected result can be found by typing "dcm2json Database/Issue195.dcm"
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7876 self.assertEqual(5, len(b))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7877 self.assertEqual(2, len(b["00080018"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7878 self.assertEqual("UI", b["00080018"]["vr"])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7879 self.assertEqual("1.2.276.0.7230010.3.1.4.8323329.13188.1620309604.848735",
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7880 b["00080018"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7881
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7882 self.assertEqual(2, len(b["0020000D"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7883 self.assertEqual("UI", b["0020000D"]["vr"])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7884 self.assertEqual("1.2.276.0.7230010.3.1.2.8323329.13188.1620309604.848733",
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7885 b["0020000D"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7886
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7887 self.assertEqual(2, len(b["0020000E"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7888 self.assertEqual("UI", b["0020000E"]["vr"])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7889 self.assertEqual("1.2.276.0.7230010.3.1.3.8323329.13188.1620309604.848734",
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7890 b["0020000E"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7891
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7892 self.assertEqual(1, len(b["00081030"])) # Case of an empty value
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7893 self.assertEqual("LO", b["00081030"]["vr"])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7894
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7895 self.assertEqual(2, len(b["0008103E"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7896 self.assertEqual("LO", b["0008103E"]["vr"])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7897 self.assertEqual("Hello1", b["0008103E"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7898
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7899 a = UploadInstance(_REMOTE, 'Issue195-bis.dcm')['ID']
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7900 b = DoGet(_REMOTE, '/instances/%s/file' % a,
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7901 headers = { 'Accept' : 'application/dicom+json' })
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7902
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7903 # The expected result can be found by typing "dcm2json Database/Issue195-bis.dcm"
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7904 self.assertEqual(5, len(b))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7905 self.assertEqual(2, len(b["00080018"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7906 self.assertEqual("UI", b["00080018"]["vr"])
424 934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7907 self.assertEqual("1.2.276.0.7230010.3.1.4.8323329.6792.1625504071.652470",
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7908 b["00080018"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7909
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7910 self.assertEqual(2, len(b["0020000D"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7911 self.assertEqual("UI", b["0020000D"]["vr"])
424 934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7912 self.assertEqual("1.2.276.0.7230010.3.1.2.8323329.6792.1625504071.652468",
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7913 b["0020000D"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7914
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7915 self.assertEqual(2, len(b["0020000E"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7916 self.assertEqual("UI", b["0020000E"]["vr"])
424 934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7917 self.assertEqual("1.2.276.0.7230010.3.1.3.8323329.6792.1625504071.652469",
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7918 b["0020000E"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7919
424 934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7920 self.assertEqual(2, len(b["00084567"]))
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7921 self.assertEqual("UN", b["00084567"]["vr"])
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7922
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7923 # NB: "QgA=" corresponds to the base64 encoding of (uint16_t) 0x42 in little endian:
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7924 # $ echo -n 'QgA=' \| base64 -d \| hexdump -C
424 934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7925 self.assertEqual("QgA=", b["00084567"]["InlineBinary"])
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7926
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7927 # Case of an empty value, fails in Orthanc <= 1.9.2 because of issue #195
424 934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7928 self.assertEqual(1, len(b["00084565"]))
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7929 self.assertEqual("UN", b["00084565"]["vr"])
402 cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7930
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7931
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7932 def test_modify_attribute(self):
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7933 # This fails on Orthanc <= 1.9.3 (not implemented)
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7934 # https://groups.google.com/g/orthanc-users/c/1pzCqT-ByXg/m/VyIGK5i5BgAJ
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7935 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7936
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7937 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % i)
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7938 self.assertFalse('0020,9165' in tags)
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7939
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7940 i = DoPost(_REMOTE, '/studies/b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0/modify', {
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7941 "Replace": {
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7942 "0020,9165": "0020,9056",
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7943 }
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7944 })
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7945 instances = DoGet(_REMOTE, '/studies/%s/instances' % i['ID'])
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7946 self.assertEqual(1, len(instances))
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7947
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7948 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % instances[0]['ID'])
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7949 self.assertTrue('0020,9165' in tags)
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7950 self.assertEqual('0020,9056', tags['0020,9165'])
405 6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7951
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7952
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7953 def test_issue_146(self):
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7954 # "Update Anonyization to 2019c"
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	7955 # https://bugs.orthanc-server.com/show_bug.cgi?id=146
405 6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7956
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7957 def GetTags(study, params):
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7958 a = DoPost(_REMOTE, '/studies/%s/anonymize' % study, params) ['ID']
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7959 b = DoGet(_REMOTE, '/studies/%s/instances' % a)
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7960 self.assertEqual(1, len(b))
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7961 return DoGet(_REMOTE, '/instances/%s/tags?short' % b[0]['ID'])
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7962
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7963
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7964 UploadInstance(_REMOTE, 'Issue146.dcm')
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7965 study = '7c950970-321e4ab0-28446c5f-f94850f1-5c44634b'
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7966
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7967 self.assertRaises(Exception, lambda: GetTags(study, { 'DicomVersion' : 'nope' }))
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7968
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7969 tags2008 = GetTags(study, { 'DicomVersion' : '2008' })
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7970 tags2017c = GetTags(study, { 'DicomVersion' : '2017c' })
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7971 tags2021b = GetTags(study, { 'DicomVersion' : '2021b' })
557 1cdb14a679f2 fix anonymization tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 556 diff changeset	7972 tags2023b = GetTags(study, { 'DicomVersion' : '2023b' })
405 6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7973 tagsDefault = GetTags(study, {})
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7974
420 07fbbd3a3fac fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	7975 orthancVersion = DoGet(_REMOTE, '/system') ['Version']
07fbbd3a3fac fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	7976 self.assertEqual('Orthanc %s - PS 3.15-2008 Table E.1-1' % orthancVersion, tags2008['0012,0063'])
07fbbd3a3fac fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	7977 self.assertEqual('Orthanc %s - PS 3.15-2017c Table E.1-1 Basic Profile' % orthancVersion, tags2017c['0012,0063'])
07fbbd3a3fac fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	7978 self.assertEqual('Orthanc %s - PS 3.15-2021b Table E.1-1 Basic Profile' % orthancVersion, tags2021b['0012,0063'])
557 1cdb14a679f2 fix anonymization tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 556 diff changeset	7979 self.assertEqual('Orthanc %s - PS 3.15-2023b Table E.1-1 Basic Profile' % orthancVersion, tags2023b['0012,0063'])
1cdb14a679f2 fix anonymization tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 556 diff changeset	7980 self.assertEqual(tagsDefault['0012,0063'], tags2023b['0012,0063'])
1cdb14a679f2 fix anonymization tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 556 diff changeset	7981
1cdb14a679f2 fix anonymization tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 556 diff changeset	7982 self.assertEqual(len(tags2021b), len(tags2023b))
1cdb14a679f2 fix anonymization tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 556 diff changeset	7983 self.assertNotEqual(tags2021b, tags2023b)
1cdb14a679f2 fix anonymization tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 556 diff changeset	7984
1cdb14a679f2 fix anonymization tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 556 diff changeset	7985 for t in [ tags2008, tags2017c, tags2021b, tags2023b, tagsDefault ]:
405 6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7986 self.assertTrue(t['0010,0010'].startswith('Anonymized'))
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7987 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', t['0008,0016'])
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7988 self.assertEqual(36, len(t['0010,0020'])) # Length of a UUID
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7989 self.assertEqual('YES', t['0012,0062'])
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7990
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7991 for t in [ tags2008 ]:
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7992 self.assertEqual('20200101', t['0008,0020'])
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7993
557 1cdb14a679f2 fix anonymization tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 556 diff changeset	7994 for t in [ tags2017c, tags2021b, tags2023b, tagsDefault ]:
405 6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7995 self.assertEqual('', t['0008,0020']) # Study Date, anonymized between 2008 and 2017c
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7996
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7997 for t in [ tags2008, tags2017c ]:
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7998 self.assertEqual('HELLO^C', t['0050,0020'])
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7999 self.assertEqual('HELLO^D', t['3006,0002'])
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	8000
557 1cdb14a679f2 fix anonymization tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 556 diff changeset	8001 for t in [ tags2021b, tags2023b, tagsDefault ]:
405 6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	8002 self.assertFalse('0050,0020' in t) # Device Description, anonymized between 2017c and 2019c
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	8003 self.assertEqual('', t['3006,0002']) # StructureSetLabel, anonymized between 2019c and 2021b
406 62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8004
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8005
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8006 def test_anonymize_relationships_6(self):
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8007 # 2020-10-20 (Salim Kanoun): "I think I have hit an
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8008 # anonymization issue for the tag 0008,1250. This tags is a
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8009 # sequence containing StudyUID / Series UID of related series.
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8010 # [After anonymization,] this tag keep a reference of the
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8011 # original Study/Series UID.
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8012 # https://groups.google.com/g/orthanc-users/c/T0IokiActrI/m/L9K0vfscAAAJ
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8013 UploadInstance(_REMOTE, '2020-11-16-SalimKanounAnonymization.dcm')
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8014
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8015 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % DoGet(_REMOTE, '/instances') [0])
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8016 self.assertEqual('1.2.840.113619.6.95.31.0.3.4.1.3175.13.6054282',
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8017 tags['0008,1250'][0]['0020,000d'])
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8018 self.assertEqual('1.3.12.2.1107.5.1.4.11047.30000019111306043635400005028',
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8019 tags['0008,1250'][0]['0020,000e'])
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8020
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8021 a = DoGet(_REMOTE, '/studies')
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8022 self.assertEqual(1, len(a))
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8023 b = DoPost(_REMOTE, '/studies/%s/anonymize' % a[0], {}) ['ID']
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8024
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8025 c = DoGet(_REMOTE, '/studies/%s/instances' % b)
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8026 self.assertEqual(1, len(c))
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8027 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % c[0]['ID'])
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8028
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8029 # In Orthanc <= 1.9.3, the two tests below failed
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8030 self.assertNotEqual('1.2.840.113619.6.95.31.0.3.4.1.3175.13.6054282',
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8031 tags['0008,1250'][0]['0020,000d'])
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8032 self.assertNotEqual('1.3.12.2.1107.5.1.4.11047.30000019111306043635400005028',
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	8033 tags['0008,1250'][0]['0020,000e'])
407 ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8034
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8035
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8036 def test_modify_subsequences(self):
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8037 # New in Orthanc 1.9.4 (cf. LSD-629)
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8038 UploadInstance(_REMOTE, 'Issue22-NoPixelData.dcm')
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8039 studies = DoGet(_REMOTE, '/studies')
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8040 self.assertEqual(1, len(studies))
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8041
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8042 def GetTags(study):
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8043 instances = DoGet(_REMOTE, '/studies/%s/instances' % study)
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8044 self.assertEqual(1, len(instances))
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8045 return DoGet(_REMOTE, '/instances/%s/tags?short' % instances[0]['ID'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8046
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8047 tags1 = GetTags(studies[0])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8048
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8049 a = DoPost(_REMOTE, '/studies/%s/modify' % studies[0], {
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8050 'Replace' : {
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8051 'PatientName' : 'Hello1',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8052 'DimensionIndexSequence[1].DimensionDescriptionLabel' : 'Hello2',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8053 'DimensionIndexSequence[*].PatientName' : 'Hello3',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8054 'ReferencedImageEvidenceSequence[2].ReferencedSeriesSequence[0].ReferencedSOPSequence[0].ReferencedSOPInstanceUID' : 'Hello4',
408 4e0b9fddbc71 test "Replace" for UID in subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	8055 'DimensionOrganizationSequence[0].DimensionOrganizationUID' : '1.2.3.4',
407 ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8056 },
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8057 'Remove' : [
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8058 'ReferencedPerformedProcedureStepSequence',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8059 'PerformedProtocolCodeSequence[0].CodeValue',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8060 'SharedFunctionalGroupsSequence[].ReferencedImageSequence[].ReferencedSOPInstanceUID',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8061 'SharedFunctionalGroupsSequence[*].ReferencedImageSequence[1].ReferencedSOPClassUID',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8062 'SharedFunctionalGroupsSequence[2].ReferencedImageSequence', # Inexistent tag
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8063 ]
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8064 })
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8065 tags2 = GetTags(a['ID'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8066
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8067 self.assertEqual('Anonymized1', tags1['0010,0010'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8068 self.assertEqual('Hello1', tags2['0010,0010'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8069
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8070 self.assertEqual('Stack ID', tags1['0020,9222'][0]['0020,9421'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8071 self.assertEqual('In-Stack Position Number', tags1['0020,9222'][1]['0020,9421'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8072 self.assertEqual('Stack ID', tags2['0020,9222'][0]['0020,9421'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8073 self.assertEqual('Hello2', tags2['0020,9222'][1]['0020,9421'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8074
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8075 for i in range(3):
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8076 self.assertFalse('0010,0010' in tags1['0020,9222'][i])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8077 self.assertEqual('Hello3', tags2['0020,9222'][i]['0010,0010'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8078
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8079 self.assertEqual('1.3.46.670589.11.22237.5.20.1.1.7512.2014100814064168452',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8080 tags1['0008,9092'][2]['0008,1115'][0]['0008,1199'][0]['0008,1155'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8081 self.assertEqual('Hello4',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8082 tags2['0008,9092'][2]['0008,1115'][0]['0008,1199'][0]['0008,1155'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8083 self.assertEqual(tags1['0008,9092'][1]['0008,1115'][0]['0008,1199'][0]['0008,1155'],
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8084 tags2['0008,9092'][1]['0008,1115'][0]['0008,1199'][0]['0008,1155'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8085
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8086 self.assertTrue('0008,1111' in tags1)
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8087 self.assertFalse('0008,1111' in tags2)
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8088 self.assertTrue('0008,0100' in tags1['0040,0260'][0])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8089 self.assertFalse('0008,0100' in tags2['0040,0260'][0])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8090
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8091 for i in range(3):
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8092 self.assertTrue('0008,1155' in tags1['5200,9229'][0]['0008,1140'][i])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8093 self.assertFalse('0008,1155' in tags2['5200,9229'][0]['0008,1140'][i])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8094 self.assertTrue('0008,1150' in tags1['5200,9229'][0]['0008,1140'][i])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8095
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8096 self.assertTrue('0008,1150' in tags2['5200,9229'][0]['0008,1140'][0])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8097 self.assertFalse('0008,1150' in tags2['5200,9229'][0]['0008,1140'][1])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8098 self.assertTrue('0008,1150' in tags2['5200,9229'][0]['0008,1140'][2])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8099
408 4e0b9fddbc71 test "Replace" for UID in subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	8100 self.assertEqual('1.3.46.670589.11.22237.5.0.11272.2014100816243076000',
4e0b9fddbc71 test "Replace" for UID in subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	8101 tags1['0020,9221'][0]['0020,9164'])
4e0b9fddbc71 test "Replace" for UID in subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	8102 self.assertEqual('1.2.3.4', tags2['0020,9221'][0]['0020,9164'])
4e0b9fddbc71 test "Replace" for UID in subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	8103
407 ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8104 a = DoPost(_REMOTE, '/studies/%s/anonymize' % studies[0], {
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8105 'Replace' : {
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8106 'DimensionIndexSequence[1].DimensionDescriptionLabel' : 'Hello1',
408 4e0b9fddbc71 test "Replace" for UID in subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	8107 'DimensionOrganizationSequence[0].DimensionOrganizationUID' : '1.2.3.4',
407 ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8108 },
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8109 'Remove' : [
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8110 'SharedFunctionalGroupsSequence[].ReferencedImageSequence[].ReferencedSOPInstanceUID', # 5200,9229
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8111 ],
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8112 'Keep' : [
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8113 'ReferencedImageEvidenceSequence', # 0008,9092
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8114 'DimensionIndexSequence', # 0020,9222
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8115 'PerFrameFunctionalGroupsSequence[].2005,140f[].SOPInstanceUID', # 5200,9230
424 934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8116 '(5200,9230)[].2005,140f[].(0008,0023)', # Compatibility with Orthanc 1.9.4
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8117 '(5200,9230)[].2005,140f[].(0008,0033)', # Compatibility with Orthanc 1.9.4
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8118 ],
557 1cdb14a679f2 fix anonymization tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 556 diff changeset	8119 'DicomVersion' : '2021b',
424 934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8120 'KeepPrivateTags' : True # Compatibility with Orthanc 1.9.4
407 ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8121 })
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8122 tags3 = GetTags(a['ID'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8123
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8124 # UIDs
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8125 for i in [ '0008,0018',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8126 '0010,0020',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8127 '0008,0018',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8128 '0010,0020' ]:
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8129 self.assertNotEqual(tags1[i], tags3[i])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8130
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8131 self.assertNotEqual(tags1['0020,9221'][0]['0020,9164'],
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8132 tags3['0020,9221'][0]['0020,9164'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8133
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8134 self.assertNotEqual(tags1['5200,9229'][0]['2005,140e'][0]['0008,0014'],
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8135 tags3['5200,9229'][0]['2005,140e'][0]['0008,0014'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8136
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8137 # http://dicom.nema.org/medical/dicom/current/output/chtml/part15/chapter_E.html#table_E.1-1
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8138 # Removals (X)
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8139 for i in [ '0008,0021',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8140 '0008,002a',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8141 '0008,0031',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8142 '0008,1030',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8143 '0008,103e',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8144 '0008,1111',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8145 '0010,21c0',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8146 '0040,0006',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8147 '0040,0241',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8148 '0040,0244',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8149 '0040,0245',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8150 '0040,0250',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8151 '0040,0251',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8152 '0040,0253',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8153 '0040,0254',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8154 '0040,0555',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8155 ]:
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8156 self.assertTrue(i in tags1)
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8157 self.assertFalse(i in tags3)
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8158
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8159 # Clearings (Z)
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8160 for i in [ '0008,0020',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8161 '0008,0023',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8162 '0008,0030',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8163 '0008,0033' ]:
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8164 self.assertNotEqual('', tags1[i])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8165 self.assertEqual('', tags3[i])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8166
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8167 # Replace
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8168 self.assertEqual('In-Stack Position Number', tags1['0020,9222'][1]['0020,9421'])
408 4e0b9fddbc71 test "Replace" for UID in subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	8169 self.assertEqual('Hello1', tags3['0020,9222'][1]['0020,9421'])
4e0b9fddbc71 test "Replace" for UID in subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	8170 self.assertEqual('1.2.3.4', tags3['0020,9221'][0]['0020,9164'])
4e0b9fddbc71 test "Replace" for UID in subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	8171
407 ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8172 # "Keep" on DimensionIndexSequence
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8173 for i in range(3):
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8174 self.assertEqual(tags1['0020,9222'][i]['0020,9164'],
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8175 tags3['0020,9222'][i]['0020,9164'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8176
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8177 # "Keep" on ReferencedImageEvidenceSequence
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8178 self.assertEqual(json.dumps(tags1['0008,9092']),
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8179 json.dumps(tags3['0008,9092']))
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8180
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8181 # "Keep" on PerFrameFunctionalGroupsSequence
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8182 self.assertEqual(json.dumps(tags1['5200,9230']),
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8183 json.dumps(tags3['5200,9230']))
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8184
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8185 # "Remove" on SharedFunctionalGroupsSequence
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8186 for i in range(3):
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8187 self.assertTrue('0008,1155' in tags1['5200,9229'][0]['0008,1140'][i])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	8188 self.assertFalse('0008,1155' in tags3['5200,9229'][0]['0008,1140'][i])
410 d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8189
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8190
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8191 def test_bulk_modify(self):
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8192 # New in Orthanc 1.9.4
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8193
411 8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8194 def GetModified(lst, resourceType, expectedCount = None):
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8195 m = map(lambda x: x['ID'], filter(lambda x: x['Type'] == resourceType, lst['Resources']))
410 d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8196 if expectedCount != None:
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8197 self.assertEqual(expectedCount, len(m))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8198 return m
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8199
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8200 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8201 series = DoGet(_REMOTE, '/series') [0]
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8202 study = DoGet(_REMOTE, '/studies') [0]
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8203 patient = DoGet(_REMOTE, '/patients') [0]
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8204
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8205 a = DoPost(_REMOTE, '/tools/bulk-modify', {
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8206 'Resources' : [ instance ]
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8207 })
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8208
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8209 self.assertNotEqual(instance, GetModified(a, 'Instance', 1) [0])
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8210 self.assertEqual(series, GetModified(a, 'Series', 1) [0])
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8211 self.assertEqual(study, GetModified(a, 'Study', 1) [0])
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8212 self.assertEqual(patient, GetModified(a, 'Patient', 1) [0])
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8213
411 8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8214 b = DoPost(_REMOTE, '/tools/bulk-anonymize', {
410 d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8215 'Resources' : [ instance ]
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8216 })
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8217
411 8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8218 self.assertNotEqual(instance, GetModified(b, 'Instance', 1) [0])
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8219 self.assertNotEqual(series, GetModified(b, 'Series', 1) [0])
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8220 self.assertNotEqual(study, GetModified(b, 'Study', 1) [0])
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8221 self.assertNotEqual(patient, GetModified(b, 'Patient', 1) [0])
410 d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8222
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8223 self.assertEqual(3, len(DoGet(_REMOTE, '/instances')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8224 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8225 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8226 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
411 8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8227
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8228 DoPost(_REMOTE, '/tools/bulk-delete', {
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8229 'Resources' : GetModified(b, 'Patient', 1) + GetModified(a, 'Instance', 1)
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8230 })
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8231
410 d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8232 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID']
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8233 knee2 = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') ['ID']
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8234 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID']
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8235
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8236 self.assertEqual(4, len(DoGet(_REMOTE, '/instances')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8237 self.assertEqual(4, len(DoGet(_REMOTE, '/series')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8238 self.assertEqual(3, len(DoGet(_REMOTE, '/studies')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8239 self.assertEqual(3, len(DoGet(_REMOTE, '/patients')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8240
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8241 a = DoPost(_REMOTE, '/tools/bulk-modify', {
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8242 'Resources' : [ knee1, brainix ]
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8243 })
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8244
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8245 self.assertEqual(6, len(DoGet(_REMOTE, '/instances')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8246 self.assertEqual(4, len(DoGet(_REMOTE, '/series')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8247 self.assertEqual(3, len(DoGet(_REMOTE, '/studies')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8248 self.assertEqual(3, len(DoGet(_REMOTE, '/patients')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8249
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8250 for i in GetModified(a, 'Instance', 2):
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8251 self.assertTrue(not i in [ instance, knee1, knee2, brainix ])
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8252 self.assertTrue(DoGet(_REMOTE, '/instances/%s/metadata/ModifiedFrom' % i) in [ knee1, brainix ])
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8253
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8254 b = GetModified(a, 'Series', 2)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8255 self.assertTrue(DoGet(_REMOTE, '/instances/%s/series' % knee1) ['ID'] in b)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8256 self.assertTrue(DoGet(_REMOTE, '/instances/%s/series' % brainix) ['ID'] in b)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8257 self.assertFalse(DoGet(_REMOTE, '/instances/%s/series' % knee2) ['ID'] in b)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8258 self.assertFalse(DoGet(_REMOTE, '/instances/%s/series' % instance) ['ID'] in b)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8259
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8260 b = GetModified(a, 'Study', 2)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8261 self.assertTrue(DoGet(_REMOTE, '/instances/%s/study' % knee1) ['ID'] in b)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8262 self.assertTrue(DoGet(_REMOTE, '/instances/%s/study' % brainix) ['ID'] in b)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8263 self.assertTrue(DoGet(_REMOTE, '/instances/%s/study' % knee2) ['ID'] in b)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8264 self.assertFalse(DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID'] in b)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8265
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8266 b = GetModified(a, 'Patient', 2)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8267 self.assertTrue(DoGet(_REMOTE, '/instances/%s/patient' % knee1) ['ID'] in b)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8268 self.assertTrue(DoGet(_REMOTE, '/instances/%s/patient' % brainix) ['ID'] in b)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8269 self.assertTrue(DoGet(_REMOTE, '/instances/%s/patient' % knee2) ['ID'] in b)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8270 self.assertFalse(DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID'] in b)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8271
411 8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8272 DoPost(_REMOTE, '/tools/bulk-delete', {
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8273 'Resources' : GetModified(a, 'Instance', 2)
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8274 })
410 d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8275
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8276 sourceInstances = DoGet(_REMOTE, '/instances')
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8277 sourceSeries = DoGet(_REMOTE, '/series')
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8278 sourceStudies = DoGet(_REMOTE, '/studies')
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8279 sourcePatients = DoGet(_REMOTE, '/patients')
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8280 self.assertEqual(4, len(sourceInstances))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8281 self.assertEqual(4, len(sourceSeries))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8282 self.assertEqual(3, len(sourceStudies))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8283 self.assertEqual(3, len(sourcePatients))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8284
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8285 a = DoPost(_REMOTE, '/tools/bulk-anonymize', {
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8286 'Resources' : [ knee1, brainix ]
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8287 })
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8288
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8289 self.assertEqual(6, len(DoGet(_REMOTE, '/instances')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8290 self.assertEqual(6, len(DoGet(_REMOTE, '/series')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8291 self.assertEqual(5, len(DoGet(_REMOTE, '/studies')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8292 self.assertEqual(5, len(DoGet(_REMOTE, '/patients')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8293
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8294 for i in GetModified(a, 'Instance', 2):
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8295 self.assertFalse(i in sourceInstances)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8296 self.assertTrue(DoGet(_REMOTE, '/instances/%s/metadata/AnonymizedFrom' % i) in [ knee1, brainix ])
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8297
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8298 for i in GetModified(a, 'Series', 2):
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8299 self.assertFalse(i in sourceSeries)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8300 self.assertTrue(DoGet(_REMOTE, '/series/%s/metadata/AnonymizedFrom' % i) in sourceSeries)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8301
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8302 for i in GetModified(a, 'Study', 2):
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8303 self.assertFalse(i in sourceStudies)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8304 self.assertTrue(DoGet(_REMOTE, '/studies/%s/metadata/AnonymizedFrom' % i) in sourceStudies)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8305
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8306 for i in GetModified(a, 'Patient', 2):
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8307 self.assertFalse(i in sourcePatients)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8308 self.assertTrue(DoGet(_REMOTE, '/patients/%s/metadata/AnonymizedFrom' % i) in sourcePatients)
411 8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8309
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8310 DoPost(_REMOTE, '/tools/bulk-delete', {
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8311 'Resources' : GetModified(a, 'Patient', 2)
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8312 })
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8313
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8314 self.assertEqual(4, len(DoGet(_REMOTE, '/instances')))
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8315 self.assertEqual(4, len(DoGet(_REMOTE, '/series')))
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8316 self.assertEqual(3, len(DoGet(_REMOTE, '/studies')))
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8317 self.assertEqual(3, len(DoGet(_REMOTE, '/patients')))
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8318
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8319 DoPost(_REMOTE, '/tools/bulk-delete', {
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8320 'Resources' : [ instance,
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8321 DoGet(_REMOTE, '/instances/%s/patient' % knee1) ['ID'],
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8322 DoGet(_REMOTE, '/instances/%s/series' % brainix) ['ID'] ]
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8323 })
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8324
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8325 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8326 self.assertEqual(0, len(DoGet(_REMOTE, '/series')))
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8327 self.assertEqual(0, len(DoGet(_REMOTE, '/studies')))
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8328 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
412 cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8329
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8330
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8331 def test_dicom_to_json_format(self):
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8332 # Test new output formats for DICOM tags introduced in 1.9.4
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8333 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8334 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID']
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8335 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8336 series = DoGet(_REMOTE, '/instances/%s/series' % instance) ['ID']
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8337
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8338 self.assertEqual('KNIX', DoGet(_REMOTE, '/instances/%s/tags' % instance) ['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8339 self.assertEqual('KNIX', DoGet(_REMOTE, '/instances/%s/tags?simplify' % instance) ['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8340 self.assertEqual('KNIX', DoGet(_REMOTE, '/instances/%s/tags?short' % instance) ['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8341 self.assertEqual('PatientName', DoGet(_REMOTE, '/instances/%s/tags?full' % instance) ['0010,0010']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8342 self.assertEqual('KNIX', DoGet(_REMOTE, '/instances/%s/tags?full' % instance) ['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8343 self.assertEqual('String', DoGet(_REMOTE, '/instances/%s/tags?full' % instance) ['0010,0010']['Type'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8344
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8345 # Test "GetInstanceHeader()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8346 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header' % instance) ['0002,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8347 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header?simplify' % instance) ['TransferSyntaxUID'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8348 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header?short' % instance) ['0002,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8349 self.assertEqual('TransferSyntaxUID', DoGet(_REMOTE, '/instances/%s/header?full' % instance) ['0002,0010']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8350 self.assertEqual('1.2.840.10008.1.2.4.70', DoGet(_REMOTE, '/instances/%s/header?full' % instance) ['0002,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8351 self.assertEqual('String', DoGet(_REMOTE, '/instances/%s/header?full' % instance) ['0002,0010']['Type'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8352
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8353 # Test "ListResources()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8354 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients?expand') [0]['MainDicomTags']['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8355 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients?expand&short') [0]['MainDicomTags']['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8356 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients?expand&full') [0]['MainDicomTags']['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8357 self.assertEqual('PatientName', DoGet(_REMOTE, '/patients?expand&full') [0]['MainDicomTags']['0010,0010']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8358
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8359 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies?expand') [0]['PatientMainDicomTags']['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8360 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies?expand&short') [0]['PatientMainDicomTags']['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8361 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies?expand&full') [0]['PatientMainDicomTags']['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8362 self.assertEqual('PatientName', DoGet(_REMOTE, '/studies?expand&full') [0]['PatientMainDicomTags']['0010,0010']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8363
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8364 self.assertEqual('20070101', DoGet(_REMOTE, '/studies?expand') [0]['MainDicomTags']['StudyDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8365 self.assertEqual('20070101', DoGet(_REMOTE, '/studies?expand&short') [0]['MainDicomTags']['0008,0020'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8366 self.assertEqual('20070101', DoGet(_REMOTE, '/studies?expand&full') [0]['MainDicomTags']['0008,0020']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8367 self.assertEqual('StudyDate', DoGet(_REMOTE, '/studies?expand&full') [0]['MainDicomTags']['0008,0020']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8368
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8369 self.assertEqual('20070101', DoGet(_REMOTE, '/series?expand') [0]['MainDicomTags']['SeriesDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8370 self.assertEqual('20070101', DoGet(_REMOTE, '/series?expand&short') [0]['MainDicomTags']['0008,0021'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8371 self.assertEqual('20070101', DoGet(_REMOTE, '/series?expand&full') [0]['MainDicomTags']['0008,0021']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8372 self.assertEqual('SeriesDate', DoGet(_REMOTE, '/series?expand&full') [0]['MainDicomTags']['0008,0021']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8373
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8374 self.assertEqual('20070101', DoGet(_REMOTE, '/instances?expand') [0]['MainDicomTags']['InstanceCreationDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8375 self.assertEqual('20070101', DoGet(_REMOTE, '/instances?expand&short') [0]['MainDicomTags']['0008,0012'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8376 self.assertEqual('20070101', DoGet(_REMOTE, '/instances?expand&full') [0]['MainDicomTags']['0008,0012']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8377 self.assertEqual('InstanceCreationDate', DoGet(_REMOTE, '/instances?expand&full') [0]['MainDicomTags']['0008,0012']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8378
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8379 # Test "GetSingleResource()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8380 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients/%s' % patient) ['MainDicomTags']['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8381 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients/%s?short' % patient) ['MainDicomTags']['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8382 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients/%s?full' % patient) ['MainDicomTags']['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8383 self.assertEqual('PatientName', DoGet(_REMOTE, '/patients/%s?full' % patient) ['MainDicomTags']['0010,0010']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8384
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8385 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s' % study) ['PatientMainDicomTags']['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8386 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s?short' % study) ['PatientMainDicomTags']['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8387 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s?full' % study) ['PatientMainDicomTags']['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8388 self.assertEqual('PatientName', DoGet(_REMOTE, '/studies/%s?full' % study) ['PatientMainDicomTags']['0010,0010']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8389
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8390 self.assertEqual('20070101', DoGet(_REMOTE, '/studies/%s' % study) ['MainDicomTags']['StudyDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8391 self.assertEqual('20070101', DoGet(_REMOTE, '/studies/%s?short' % study) ['MainDicomTags']['0008,0020'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8392 self.assertEqual('20070101', DoGet(_REMOTE, '/studies/%s?full' % study) ['MainDicomTags']['0008,0020']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8393 self.assertEqual('StudyDate', DoGet(_REMOTE, '/studies/%s?full' % study) ['MainDicomTags']['0008,0020']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8394
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8395 self.assertEqual('20070101', DoGet(_REMOTE, '/series/%s' % series) ['MainDicomTags']['SeriesDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8396 self.assertEqual('20070101', DoGet(_REMOTE, '/series/%s?short' % series) ['MainDicomTags']['0008,0021'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8397 self.assertEqual('20070101', DoGet(_REMOTE, '/series/%s?full' % series) ['MainDicomTags']['0008,0021']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8398 self.assertEqual('SeriesDate', DoGet(_REMOTE, '/series/%s?full' % series) ['MainDicomTags']['0008,0021']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8399
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8400 self.assertEqual('20070101', DoGet(_REMOTE, '/instances/%s' % instance) ['MainDicomTags']['InstanceCreationDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8401 self.assertEqual('20070101', DoGet(_REMOTE, '/instances/%s?short' % instance) ['MainDicomTags']['0008,0012'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8402 self.assertEqual('20070101', DoGet(_REMOTE, '/instances/%s?full' % instance) ['MainDicomTags']['0008,0012']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8403 self.assertEqual('InstanceCreationDate', DoGet(_REMOTE, '/instances/%s?full' % instance) ['MainDicomTags']['0008,0012']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8404
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8405 # Test "Find()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8406 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', 'Query' : {}, 'Expand' : True })
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8407 self.assertEqual('20070101', a[0]['MainDicomTags']['StudyDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8408 self.assertEqual('KNIX', a[0]['PatientMainDicomTags']['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8409
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8410 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', 'Query' : {}, 'Expand' : True, 'Short' : True })
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8411 self.assertEqual('20070101', a[0]['MainDicomTags']['0008,0020'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8412 self.assertEqual('KNIX', a[0]['PatientMainDicomTags']['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8413
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8414 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', 'Query' : {}, 'Expand' : True, 'Full' : True })
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8415 self.assertEqual('20070101', a[0]['MainDicomTags']['0008,0020']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8416 self.assertEqual('KNIX', a[0]['PatientMainDicomTags']['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8417 self.assertEqual('StudyDate', a[0]['MainDicomTags']['0008,0020']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8418 self.assertEqual('PatientName', a[0]['PatientMainDicomTags']['0010,0010']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8419
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8420 # Test "GetChildResources()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8421 self.assertEqual('20070101', DoGet(_REMOTE, '/patients/%s/studies' % patient) [0]['MainDicomTags']['StudyDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8422 self.assertEqual('20070101', DoGet(_REMOTE, '/patients/%s/studies?short' % patient) [0]['MainDicomTags']['0008,0020'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8423 self.assertEqual('20070101', DoGet(_REMOTE, '/patients/%s/studies?full' % patient) [0]['MainDicomTags']['0008,0020']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8424 self.assertEqual('StudyDate', DoGet(_REMOTE, '/patients/%s/studies?full' % patient) [0]['MainDicomTags']['0008,0020']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8425
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8426 self.assertEqual('20070101', DoGet(_REMOTE, '/patients/%s/series' % patient) [0]['MainDicomTags']['SeriesDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8427 self.assertEqual('20070101', DoGet(_REMOTE, '/patients/%s/series?short' % patient) [0]['MainDicomTags']['0008,0021'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8428 self.assertEqual('20070101', DoGet(_REMOTE, '/patients/%s/series?full' % patient) [0]['MainDicomTags']['0008,0021']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8429 self.assertEqual('SeriesDate', DoGet(_REMOTE, '/patients/%s/series?full' % patient) [0]['MainDicomTags']['0008,0021']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8430
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8431 self.assertEqual('20070101', DoGet(_REMOTE, '/patients/%s/instances' % patient) [0]['MainDicomTags']['InstanceCreationDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8432 self.assertEqual('20070101', DoGet(_REMOTE, '/patients/%s/instances?short' % patient) [0]['MainDicomTags']['0008,0012'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8433 self.assertEqual('20070101', DoGet(_REMOTE, '/patients/%s/instances?full' % patient) [0]['MainDicomTags']['0008,0012']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8434 self.assertEqual('InstanceCreationDate', DoGet(_REMOTE, '/patients/%s/instances?full' % patient) [0]['MainDicomTags']['0008,0012']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8435
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8436 self.assertEqual('20070101', DoGet(_REMOTE, '/studies/%s/series' % study) [0]['MainDicomTags']['SeriesDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8437 self.assertEqual('20070101', DoGet(_REMOTE, '/studies/%s/series?short' % study) [0]['MainDicomTags']['0008,0021'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8438 self.assertEqual('20070101', DoGet(_REMOTE, '/studies/%s/series?full' % study) [0]['MainDicomTags']['0008,0021']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8439 self.assertEqual('SeriesDate', DoGet(_REMOTE, '/studies/%s/series?full' % study) [0]['MainDicomTags']['0008,0021']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8440
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8441 self.assertEqual('20070101', DoGet(_REMOTE, '/studies/%s/instances' % study) [0]['MainDicomTags']['InstanceCreationDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8442 self.assertEqual('20070101', DoGet(_REMOTE, '/studies/%s/instances?short' % study) [0]['MainDicomTags']['0008,0012'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8443 self.assertEqual('20070101', DoGet(_REMOTE, '/studies/%s/instances?full' % study) [0]['MainDicomTags']['0008,0012']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8444 self.assertEqual('InstanceCreationDate', DoGet(_REMOTE, '/studies/%s/instances?full' % study) [0]['MainDicomTags']['0008,0012']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8445
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8446 self.assertEqual('20070101', DoGet(_REMOTE, '/series/%s/instances' % series) [0]['MainDicomTags']['InstanceCreationDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8447 self.assertEqual('20070101', DoGet(_REMOTE, '/series/%s/instances?short' % series) [0]['MainDicomTags']['0008,0012'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8448 self.assertEqual('20070101', DoGet(_REMOTE, '/series/%s/instances?full' % series) [0]['MainDicomTags']['0008,0012']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8449 self.assertEqual('InstanceCreationDate', DoGet(_REMOTE, '/series/%s/instances?full' % series) [0]['MainDicomTags']['0008,0012']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8450
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8451 # Test "GetParentResource()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8452 self.assertEqual('KNIX', DoGet(_REMOTE, '/instances/%s/patient' % instance) ['MainDicomTags']['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8453 self.assertEqual('KNIX', DoGet(_REMOTE, '/instances/%s/patient?short' % instance) ['MainDicomTags']['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8454 self.assertEqual('KNIX', DoGet(_REMOTE, '/instances/%s/patient?full' % instance) ['MainDicomTags']['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8455 self.assertEqual('PatientName', DoGet(_REMOTE, '/instances/%s/patient?full' % instance) ['MainDicomTags']['0010,0010']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8456
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8457 self.assertEqual('20070101', DoGet(_REMOTE, '/instances/%s/study' % instance) ['MainDicomTags']['StudyDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8458 self.assertEqual('20070101', DoGet(_REMOTE, '/instances/%s/study?short' % instance) ['MainDicomTags']['0008,0020'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8459 self.assertEqual('20070101', DoGet(_REMOTE, '/instances/%s/study?full' % instance) ['MainDicomTags']['0008,0020']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8460 self.assertEqual('StudyDate', DoGet(_REMOTE, '/instances/%s/study?full' % instance) ['MainDicomTags']['0008,0020']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8461
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8462 self.assertEqual('20070101', DoGet(_REMOTE, '/instances/%s/series' % instance) ['MainDicomTags']['SeriesDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8463 self.assertEqual('20070101', DoGet(_REMOTE, '/instances/%s/series?short' % instance) ['MainDicomTags']['0008,0021'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8464 self.assertEqual('20070101', DoGet(_REMOTE, '/instances/%s/series?full' % instance) ['MainDicomTags']['0008,0021']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8465 self.assertEqual('SeriesDate', DoGet(_REMOTE, '/instances/%s/series?full' % instance) ['MainDicomTags']['0008,0021']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8466
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8467 self.assertEqual('KNIX', DoGet(_REMOTE, '/series/%s/patient' % series) ['MainDicomTags']['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8468 self.assertEqual('KNIX', DoGet(_REMOTE, '/series/%s/patient?short' % series) ['MainDicomTags']['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8469 self.assertEqual('KNIX', DoGet(_REMOTE, '/series/%s/patient?full' % series) ['MainDicomTags']['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8470 self.assertEqual('PatientName', DoGet(_REMOTE, '/series/%s/patient?full' % series) ['MainDicomTags']['0010,0010']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8471
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8472 self.assertEqual('20070101', DoGet(_REMOTE, '/series/%s/study' % series) ['MainDicomTags']['StudyDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8473 self.assertEqual('20070101', DoGet(_REMOTE, '/series/%s/study?short' % series) ['MainDicomTags']['0008,0020'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8474 self.assertEqual('20070101', DoGet(_REMOTE, '/series/%s/study?full' % series) ['MainDicomTags']['0008,0020']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8475 self.assertEqual('StudyDate', DoGet(_REMOTE, '/series/%s/study?full' % series) ['MainDicomTags']['0008,0020']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8476
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8477 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s/patient' % study) ['MainDicomTags']['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8478 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s/patient?short' % study) ['MainDicomTags']['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8479 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s/patient?full' % study) ['MainDicomTags']['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8480 self.assertEqual('PatientName', DoGet(_REMOTE, '/studies/%s/patient?full' % study) ['MainDicomTags']['0010,0010']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8481
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8482 # Test "GetChildInstancesTags()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8483 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % patient) [instance]['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8484 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients/%s/instances-tags?short' % patient) [instance]['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8485 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients/%s/instances-tags' % patient) [instance]['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8486 self.assertEqual('PatientName', DoGet(_REMOTE, '/patients/%s/instances-tags' % patient) [instance]['0010,0010']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8487
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8488 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s/instances-tags?simplify' % study) [instance]['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8489 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s/instances-tags?short' % study) [instance]['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8490 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s/instances-tags' % study) [instance]['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8491 self.assertEqual('PatientName', DoGet(_REMOTE, '/studies/%s/instances-tags' % study) [instance]['0010,0010']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8492
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8493 self.assertEqual('KNIX', DoGet(_REMOTE, '/series/%s/instances-tags?simplify' % series) [instance]['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8494 self.assertEqual('KNIX', DoGet(_REMOTE, '/series/%s/instances-tags?short' % series) [instance]['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8495 self.assertEqual('KNIX', DoGet(_REMOTE, '/series/%s/instances-tags' % series) [instance]['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8496 self.assertEqual('PatientName', DoGet(_REMOTE, '/series/%s/instances-tags' % series) [instance]['0010,0010']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8497
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8498 # Test "GetSharedTags()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8499 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % patient) ['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8500 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients/%s/shared-tags?short' % patient) ['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8501 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients/%s/shared-tags' % patient) ['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8502 self.assertEqual('PatientName', DoGet(_REMOTE, '/patients/%s/shared-tags' % patient) ['0010,0010']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8503
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8504 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s/shared-tags?simplify' % study) ['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8505 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s/shared-tags?short' % study) ['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8506 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s/shared-tags' % study) ['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8507 self.assertEqual('PatientName', DoGet(_REMOTE, '/studies/%s/shared-tags' % study) ['0010,0010']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8508
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8509 self.assertEqual('KNIX', DoGet(_REMOTE, '/series/%s/shared-tags?simplify' % series) ['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8510 self.assertEqual('KNIX', DoGet(_REMOTE, '/series/%s/shared-tags?short' % series) ['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8511 self.assertEqual('KNIX', DoGet(_REMOTE, '/series/%s/shared-tags' % series) ['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8512 self.assertEqual('PatientName', DoGet(_REMOTE, '/series/%s/shared-tags' % series) ['0010,0010']['Name'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8513
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8514 # Test "GetModule()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8515 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients/%s/module' % patient) ['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8516 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients/%s/module?simplify' % patient) ['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8517 self.assertEqual('KNIX', DoGet(_REMOTE, '/patients/%s/module?short' % patient) ['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8518
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8519 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s/module-patient' % study) ['0010,0010']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8520 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s/module-patient?simplify' % study) ['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8521 self.assertEqual('KNIX', DoGet(_REMOTE, '/studies/%s/module-patient?short' % study) ['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8522
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8523 self.assertEqual('Knee (R)', DoGet(_REMOTE, '/studies/%s/module' % study) ['0008,1030']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8524 self.assertEqual('Knee (R)', DoGet(_REMOTE, '/studies/%s/module?simplify' % study) ['StudyDescription'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8525 self.assertEqual('Knee (R)', DoGet(_REMOTE, '/studies/%s/module?short' % study) ['0008,1030'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8526
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8527 self.assertEqual('AX. FSE PD', DoGet(_REMOTE, '/series/%s/module' % series) ['0008,103e']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8528 self.assertEqual('AX. FSE PD', DoGet(_REMOTE, '/series/%s/module?simplify' % series) ['SeriesDescription'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8529 self.assertEqual('AX. FSE PD', DoGet(_REMOTE, '/series/%s/module?short' % series) ['0008,103e'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8530
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8531 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109',
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8532 DoGet(_REMOTE, '/instances/%s/module' % instance) ['0008,0018']['Value'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8533 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109',
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8534 DoGet(_REMOTE, '/instances/%s/module?simplify' % instance) ['SOPInstanceUID'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8535 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109',
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8536 DoGet(_REMOTE, '/instances/%s/module?short' % instance) ['0008,0018'])
413 b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8537
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8538 # Test "ListQueryAnswers()" in "OrthancRestModalities.cpp"
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8539 a = DoPost(_REMOTE, '/modalities/self/query', { 'Level' : 'Study',
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8540 'Query' : { 'PatientID' : '*' }}) ['ID']
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8541
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8542 self.assertEqual(1, len(DoGet(_REMOTE, '/queries/%s/answers' % a)))
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8543 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers?expand' % a) [0]['0010,0020']['Value'])
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8544 self.assertEqual('PatientID', DoGet(_REMOTE, '/queries/%s/answers?expand' % a) [0]['0010,0020']['Name'])
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8545 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a) [0]['PatientID'])
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8546 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers?expand&short' % a) [0]['0010,0020'])
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8547
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8548 # Test "GetQueryOneAnswer()" in "OrthancRestModalities.cpp"
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8549 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers/0/content' % a) ['0010,0020']['Value'])
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8550 self.assertEqual('PatientID', DoGet(_REMOTE, '/queries/%s/answers/0/content' % a) ['0010,0020']['Name'])
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8551 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers/0/content?simplify' % a) ['PatientID'])
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8552 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers/0/content?short' % a) ['0010,0020'])
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8553
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8554 # Test "GetQueryArguments()" in "OrthancRestModalities.cpp"
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8555 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query' % a) ['0010,0020']['Value'])
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8556 self.assertEqual('PatientID', DoGet(_REMOTE, '/queries/%s/query' % a) ['0010,0020']['Name'])
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8557 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query?simplify' % a) ['PatientID'])
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8558 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query?short' % a) ['0010,0020'])
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8559
414 a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8560 # Test "BulkContent()" in "OrthancRestResources.cpp"
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8561 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ patient, study, series, instance ] })
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8562 self.assertEqual(4, len(a))
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8563 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['PatientID'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8564 self.assertEqual('Knee (R)', a[1]['MainDicomTags']['StudyDescription'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8565 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['PatientName'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8566 self.assertEqual('AX. FSE PD', a[2]['MainDicomTags']['SeriesDescription'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8567 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109',
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8568 a[3]['MainDicomTags']['SOPInstanceUID'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8569
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8570 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ patient, study, series, instance ],
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8571 'Short': True })
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8572 self.assertEqual(4, len(a))
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8573 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['0010,0020'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8574 self.assertEqual('Knee (R)', a[1]['MainDicomTags']['0008,1030'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8575 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['0010,0010'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8576 self.assertEqual('AX. FSE PD', a[2]['MainDicomTags']['0008,103e'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8577 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109',
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8578 a[3]['MainDicomTags']['0008,0018'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8579
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8580 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ patient, study, series, instance ],
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8581 'Full': True })
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8582 self.assertEqual(4, len(a))
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8583 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['0010,0020']['Value'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8584 self.assertEqual('PatientID', a[0]['MainDicomTags']['0010,0020']['Name'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8585 self.assertEqual('Knee (R)', a[1]['MainDicomTags']['0008,1030']['Value'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8586 self.assertEqual('StudyDescription', a[1]['MainDicomTags']['0008,1030']['Name'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8587 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['0010,0010']['Value'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8588 self.assertEqual('PatientName', a[1]['PatientMainDicomTags']['0010,0010']['Name'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8589 self.assertEqual('AX. FSE PD', a[2]['MainDicomTags']['0008,103e']['Value'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8590 self.assertEqual('SeriesDescription', a[2]['MainDicomTags']['0008,103e']['Name'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8591 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109',
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8592 a[3]['MainDicomTags']['0008,0018']['Value'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8593 self.assertEqual('SOPInstanceUID', a[3]['MainDicomTags']['0008,0018']['Name'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8594
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8595
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8596 def test_bulk_content(self):
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8597 # New in Orthanc 1.9.4
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8598 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID']
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8599 knee2 = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') ['ID']
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8600 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID']
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8601
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8602 brainixHierarchy = [
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8603 DoGet(_REMOTE, '/instances/%s/patient' % brainix) ['ID'],
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8604 DoGet(_REMOTE, '/instances/%s/study' % brainix) ['ID'],
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8605 DoGet(_REMOTE, '/instances/%s/series' % brainix) ['ID'],
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8606 brainix,
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8607 ]
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8608
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8609 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : brainixHierarchy })
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8610 self.assertEqual(4, len(a))
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8611 b = map(lambda x: x['ID'], a)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8612 for i in range(4):
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8613 self.assertEqual(brainixHierarchy[i], b[i])
418 8a3d67a40083 test "Metadata" in "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 417 diff changeset	8614 self.assertTrue('Metadata' in a[i])
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8615
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8616 for (level, index) in [
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8617 ('Patient', 0),
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8618 ('Study', 1),
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8619 ('Series', 2),
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8620 ('Instance', 3),
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8621 ]:
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8622 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : brainixHierarchy,
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8623 'Level' : level })
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8624 self.assertEqual(1, len(a))
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8625 self.assertEqual(level, a[0]['Type'])
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8626 self.assertEqual(brainixHierarchy[index], a[0]['ID'])
418 8a3d67a40083 test "Metadata" in "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 417 diff changeset	8627 self.assertTrue('Metadata' in a[0])
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8628
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8629 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ brainix ],
418 8a3d67a40083 test "Metadata" in "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 417 diff changeset	8630 'Level' : level,
8a3d67a40083 test "Metadata" in "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 417 diff changeset	8631 'Metadata' : False })
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8632 self.assertEqual(1, len(a))
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8633 self.assertEqual(level, a[0]['Type'])
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8634 self.assertEqual(brainixHierarchy[index], a[0]['ID'])
418 8a3d67a40083 test "Metadata" in "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 417 diff changeset	8635 self.assertFalse('Metadata' in a[0])
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8636
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8637 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, knee2, brainix ] })
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8638 self.assertEqual(3, len(a))
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8639 for item in a:
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8640 self.assertEqual('Instance', item['Type'])
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8641 b = map(lambda x: x['ID'], a)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8642 self.assertTrue(knee1 in b)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8643 self.assertTrue(knee2 in b)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8644 self.assertTrue(brainix in b)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8645
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8646 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, knee2 ],
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8647 'Level' : 'Series' })
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8648 self.assertEqual(2, len(a))
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8649 for item in a:
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8650 self.assertEqual('Series', item['Type'])
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8651 b = map(lambda x: x['ID'], a)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8652 self.assertTrue(DoGet(_REMOTE, '/instances/%s' % knee1) ['ParentSeries'] in b)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8653 self.assertTrue(DoGet(_REMOTE, '/instances/%s' % knee2) ['ParentSeries'] in b)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8654
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8655 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, knee2 ],
418 8a3d67a40083 test "Metadata" in "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 417 diff changeset	8656 'Level' : 'Study',
8a3d67a40083 test "Metadata" in "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 417 diff changeset	8657 'Metadata' : False })
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8658 self.assertEqual(1, len(a))
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8659 self.assertEqual(DoGet(_REMOTE, '/instances/%s/study' % knee1) ['ID'], a[0]['ID'])
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8660 self.assertEqual('Study', a[0]['Type'])
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8661 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName'])
418 8a3d67a40083 test "Metadata" in "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 417 diff changeset	8662 self.assertFalse('Metadata' in a[0])
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8663
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8664 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, knee2 ],
418 8a3d67a40083 test "Metadata" in "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 417 diff changeset	8665 'Level' : 'Patient',
8a3d67a40083 test "Metadata" in "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 417 diff changeset	8666 'Metadata' : True })
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8667 self.assertEqual(1, len(a))
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8668 self.assertEqual(DoGet(_REMOTE, '/instances/%s/patient' % knee1) ['ID'], a[0]['ID'])
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8669 self.assertEqual('Patient', a[0]['Type'])
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8670 self.assertEqual('KNEE', a[0]['MainDicomTags']['PatientName'])
418 8a3d67a40083 test "Metadata" in "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 417 diff changeset	8671 self.assertTrue('Metadata' in a[0])
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	8672 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	8673 self.assertEqual(2, len(a[0]['Metadata']))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	8674 self.assertTrue('MainDicomTagsSignature' in a[0]['Metadata'])
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	8675 else:
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	8676 self.assertEqual(1, len(a[0]['Metadata']))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	8677 self.assertTrue('LastUpdate' in a[0]['Metadata'])
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8678
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8679 for level in [ 'Instance', 'Series', 'Study', 'Patient' ]:
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8680 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, brainix ],
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8681 'Level' : level })
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8682 self.assertEqual(2, len(a))
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8683 for item in a:
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8684 self.assertEqual(level, item['Type'])
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8685 b = map(lambda x: x['ID'], a)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8686 if level == 'Instance':
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8687 self.assertTrue(knee1 in b)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8688 self.assertTrue(brainix in b)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8689 else:
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8690 self.assertTrue(DoGet(_REMOTE, '/instances/%s/%s' % (knee1, level.lower())) ['ID'] in b)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8691 self.assertTrue(DoGet(_REMOTE, '/instances/%s/%s' % (brainix, level.lower())) ['ID'] in b)
416 80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8692
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8693
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8694 def test_split_instances(self):
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8695 # New in 1.9.4
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8696 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID']
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8697 knee2 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') ['ID']
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8698 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8699 series = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8700
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8701 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8702 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8703 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8704
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8705 instances = DoGet(_REMOTE, '/instances')
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8706 self.assertEqual(2, len(instances))
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8707 self.assertEqual('1', DoGet(_REMOTE, '/instances/%s/tags?simplify' % knee1) ['InstanceNumber'])
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8708 self.assertEqual('2', DoGet(_REMOTE, '/instances/%s/tags?simplify' % knee2) ['InstanceNumber'])
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8709 for i in [ knee1, knee2 ]:
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8710 self.assertEqual(series, DoGet(_REMOTE, '/instances/%s/series' % i) ['ID'])
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8711 self.assertEqual(study, DoGet(_REMOTE, '/instances/%s/study' % i) ['ID'])
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8712
417 a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8713 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, {
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8714 'KeepSource' : False
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8715 })) # Neither "Instances", nor "Series"
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8716
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8717 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, {
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8718 'KeepSource' : False,
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8719 'Instances' : [ ],
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8720 'Series' : [ ]
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8721 })) # Empty "Instances" and "Series"
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8722
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8723 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, {
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8724 'Instances' : [ 'nope' ],
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8725 'KeepSource' : False
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8726 }))
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8727
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8728 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, {
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8729 'Series' : [ 'nope' ],
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8730 'KeepSource' : False
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8731 }))
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8732
416 80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8733 result = DoPost(_REMOTE, '/studies/%s/split' % study, {
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8734 'Instances' : [ knee1 ],
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8735 'KeepSource' : False
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8736 })
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8737
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8738 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8739 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8740 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8741
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8742 instances = DoGet(_REMOTE, '/instances')
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8743 self.assertEqual(2, len(instances))
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8744
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8745 self.assertFalse(knee1 in instances)
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8746 self.assertTrue(knee2 in instances)
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8747 instances.remove(knee2)
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8748 self.assertEqual(series, DoGet(_REMOTE, '/instances/%s/series' % knee2) ['ID'])
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8749 self.assertEqual(study, DoGet(_REMOTE, '/instances/%s/study' % knee2) ['ID'])
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8750 self.assertNotEqual(series, DoGet(_REMOTE, '/instances/%s/series' % instances[0]) ['ID'])
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8751 self.assertNotEqual(study, DoGet(_REMOTE, '/instances/%s/study' % instances[0]) ['ID'])
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8752 self.assertEqual('1', DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0]) ['InstanceNumber'])
419 6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8753
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8754
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8755 def test_merge_instances(self):
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8756 # New in Orthanc 1.9.4
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8757 knee = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID']
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8758 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID']
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8759 brainixStudy = DoGet(_REMOTE, '/instances/%s/study' % brainix) ['ID']
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8760
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8761 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8762 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8763 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8764 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8765
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8766 instances = DoGet(_REMOTE, '/instances')
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8767 self.assertEqual(2, len(instances))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8768 self.assertTrue(brainix in instances)
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8769 self.assertTrue(knee in instances)
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8770
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8771 result = DoPost(_REMOTE, '/studies/%s/merge' % brainixStudy, {
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8772 'Resources' : [ knee ]
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8773 })
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8774
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8775 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8776 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8777 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8778 self.assertEqual(brainixStudy, DoGet(_REMOTE, '/studies')[0])
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8779
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8780 instances = DoGet(_REMOTE, '/instances')
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8781 self.assertEqual(2, len(instances))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8782 self.assertTrue(brainix in instances)
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8783 self.assertFalse(knee in instances)
423 cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8784
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8785
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8786 def test_query_retrieve_format(self):
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8787 # New in Orthanc 1.9.5
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8788 # https://groups.google.com/g/orthanc-users/c/1KC4d-0K8s0/m/hfYYz1-tAgAJ
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8789 i = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID']
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8790 study = DoGet(_REMOTE, '/instances/%s/study' % i) ['MainDicomTags']['StudyInstanceUID']
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8791
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8792 a = DoPost(_REMOTE, '/modalities/self/query', {
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8793 'Level' : 'Study',
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8794 'Query' : {}
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8795 })
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8796
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8797 b = DoGet(_REMOTE, a['Path'] + '/answers')
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8798 self.assertEqual(1, len(b))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8799 self.assertEqual('0', b[0])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8800
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8801 b = DoGet(_REMOTE, a['Path'] + '/answers?expand')
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8802 self.assertEqual(1, len(b))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8803 self.assertEqual(6, len(b[0]))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8804 self.assertEqual('ISO_IR 100', b[0]['0008,0005']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8805 self.assertEqual('SpecificCharacterSet', b[0]['0008,0005']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8806 self.assertEqual('A10003245599', b[0]['0008,0050']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8807 self.assertEqual('AccessionNumber', b[0]['0008,0050']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8808 self.assertEqual('STUDY', b[0]['0008,0052']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8809 self.assertEqual('QueryRetrieveLevel', b[0]['0008,0052']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8810 self.assertEqual('ORTHANC', b[0]['0008,0054']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8811 self.assertEqual('RetrieveAETitle', b[0]['0008,0054']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8812 self.assertEqual('887', b[0]['0010,0020']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8813 self.assertEqual('PatientID', b[0]['0010,0020']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8814 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', b[0]['0020,000d']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8815 self.assertEqual('StudyInstanceUID', b[0]['0020,000d']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8816
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8817 for (key, value) in b[0].items():
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8818 self.assertEqual('String', value['Type'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8819
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8820 self.assertEqual(json.dumps(b[0]),
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8821 json.dumps(DoGet(_REMOTE, a['Path'] + '/answers/0/content')))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8822
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8823 # What is below this point didn't work on Orthanc <= 1.9.3
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8824
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8825 b = DoGet(_REMOTE, a['Path'] + '/answers?expand&short')
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8826 self.assertEqual(1, len(b))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8827 self.assertEqual(6, len(b[0]))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8828 self.assertEqual('ISO_IR 100', b[0]['0008,0005'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8829 self.assertEqual('A10003245599', b[0]['0008,0050'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8830 self.assertEqual('STUDY', b[0]['0008,0052'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8831 self.assertEqual('ORTHANC', b[0]['0008,0054'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8832 self.assertEqual('887', b[0]['0010,0020'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8833 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', b[0]['0020,000d'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8834 self.assertEqual(json.dumps(b[0]),
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8835 json.dumps(DoGet(_REMOTE, a['Path'] + '/answers/0/content?short')))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8836
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8837 b = DoGet(_REMOTE, a['Path'] + '/answers?expand&simplify')
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8838 self.assertEqual(1, len(b))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8839 self.assertEqual(6, len(b[0]))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8840 self.assertEqual('ISO_IR 100', b[0]['SpecificCharacterSet'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8841 self.assertEqual('A10003245599', b[0]['AccessionNumber'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8842 self.assertEqual('STUDY', b[0]['QueryRetrieveLevel'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8843 self.assertEqual('ORTHANC', b[0]['RetrieveAETitle'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8844 self.assertEqual('887', b[0]['PatientID'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8845 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', b[0]['StudyInstanceUID'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8846 self.assertEqual(json.dumps(b[0]),
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8847 json.dumps(DoGet(_REMOTE, a['Path'] + '/answers/0/content?simplify')))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8848
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8849 b = DoPost(_REMOTE, '/queries/%s/retrieve' % a['ID'], {})
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8850 self.assertEqual('REST API', b['Description'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8851 self.assertEqual('ORTHANC', b['LocalAet'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8852 self.assertEqual('ORTHANC', b['RemoteAet'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8853 self.assertEqual(1, len(b['Query']))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8854 self.assertEqual(4, len(b['Query'][0]))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8855 self.assertEqual('A10003245599', b['Query'][0]['0008,0050'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8856 self.assertEqual('STUDY', b['Query'][0]['0008,0052'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8857 self.assertEqual('887', b['Query'][0]['0010,0020'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8858 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', b['Query'][0]['0020,000d'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8859
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8860 # What is below this point didn't work on Orthanc <= 1.9.4
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8861
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8862 b = DoPost(_REMOTE, '/queries/%s/retrieve' % a['ID'], { 'Full' : True })
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8863 self.assertEqual('REST API', b['Description'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8864 self.assertEqual('ORTHANC', b['LocalAet'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8865 self.assertEqual('ORTHANC', b['RemoteAet'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8866 self.assertEqual(1, len(b['Query']))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8867 self.assertEqual(4, len(b['Query'][0]))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8868 self.assertEqual('A10003245599', b['Query'][0]['0008,0050']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8869 self.assertEqual('STUDY', b['Query'][0]['0008,0052']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8870 self.assertEqual('887', b['Query'][0]['0010,0020']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8871 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', b['Query'][0]['0020,000d']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8872 self.assertEqual('AccessionNumber', b['Query'][0]['0008,0050']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8873 self.assertEqual('QueryRetrieveLevel', b['Query'][0]['0008,0052']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8874 self.assertEqual('PatientID', b['Query'][0]['0010,0020']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8875 self.assertEqual('StudyInstanceUID', b['Query'][0]['0020,000d']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8876
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8877 b = DoPost(_REMOTE, '/queries/%s/retrieve' % a['ID'], { 'Simplify' : True })
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8878 self.assertEqual('REST API', b['Description'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8879 self.assertEqual('ORTHANC', b['LocalAet'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8880 self.assertEqual('ORTHANC', b['RemoteAet'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8881 self.assertEqual(1, len(b['Query']))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8882 self.assertEqual(4, len(b['Query'][0]))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8883 self.assertEqual('A10003245599', b['Query'][0]['AccessionNumber'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8884 self.assertEqual('STUDY', b['Query'][0]['QueryRetrieveLevel'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8885 self.assertEqual('887', b['Query'][0]['PatientID'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8886 self.assertEqual('2.16.840.1.113669.632.20.121711.10000160881', b['Query'][0]['StudyInstanceUID'])
424 934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8887
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8888
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8889 def test_anonymize_nested(self):
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8890 # New in Orthanc 1.9.5
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8891
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8892 tags = {
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8893 'MappingResourceIdentificationSequence' : [
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8894 {
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8895 # Test "DicomModification::RelationshipsVisitor::GetDefaultAction()"
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8896 '0009,1002' : 'ABCD', # Private tag not registered in dictionary
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8897 '0016,0071' : '-12', # "GPS Latitude" whose VR is DS in "removals_"
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8898 '0034,0005' : '13', # VR is OB, and in "clearings_" (only in DCMTK 3.6.2)
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8899
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8900 # Test "DicomModification::RelationshipsVisitor::VisitString()"
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8901 'StudyDescription' : 'Hello', # Removed
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8902 'StudyDate' : '20210705', # Cleared
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8903 '0009,1001' : '-1234', # Private tag whose VR is DS
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8904
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8905 # Test anonymization of nested sequences
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8906 'ReferencedStudySequence' : [
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8907 {
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8908 'PatientID' : 'HELLO'
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8909 }
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8910 ],
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8911
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8912 # Non-anonymized tags
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8913 'CodeMeaning' : 'MEANING1',
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8914 'EquivalentCodeSequence' : [
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8915 {
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8916 'CodeMeaning' : 'MEANING2',
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8917 }
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8918 ],
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8919 }
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8920 ],
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8921 }
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8922
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8923 a = DoPost(_REMOTE, '/tools/create-dicom',
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8924 json.dumps({
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8925 'Tags' : tags,
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8926 'PrivateCreator' : 'Lunit',
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8927 })) ['ID']
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8928
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8929 study = DoGet(_REMOTE, '/instances/%s/study' % a) ['ID']
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8930 b = DoPost(_REMOTE, '/studies/%s/anonymize' % study, {}) ['ID']
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8931 c = DoGet(_REMOTE, '/studies/%s/instances' % b)
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8932 self.assertEqual(1, len(c))
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8933
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8934 tags1 = DoGet(_REMOTE, '/instances/%s/tags?short' % a)
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8935 tags2 = DoGet(_REMOTE, '/instances/%s/tags?short' % c[0]['ID'])
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8936
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8937 # Only "StudyDate" must be present in
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8938 # "MappingResourceIdentificationSequence" after anonymization
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8939 self.assertEqual(1, len(tags1['0008,0124']))
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8940 self.assertEqual(1, len(tags2['0008,0124']))
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8941 self.assertEqual(9, len(tags1['0008,0124'][0]))
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8942 self.assertEqual(3, len(tags2['0008,0124'][0]))
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8943 self.assertEqual('', tags2['0008,0124'][0]['0008,0020'])
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8944 self.assertEqual('MEANING1', tags2['0008,0124'][0]['0008,0104'])
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8945 self.assertEqual('MEANING2', tags2['0008,0124'][0]['0008,0121'][0]['0008,0104'])
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8946
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8947 self.assertTrue('0008,1110' in tags1['0008,0124'][0])
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8948 self.assertFalse('0008,1110' in tags2['0008,0124'][0])
427 77455e156112 integration test for issue 200 Sebastien Jodogne <s.jodogne@gmail.com> parents: 424 diff changeset	8949
77455e156112 integration test for issue 200 Sebastien Jodogne <s.jodogne@gmail.com> parents: 424 diff changeset	8950
77455e156112 integration test for issue 200 Sebastien Jodogne <s.jodogne@gmail.com> parents: 424 diff changeset	8951 def test_issue_200(self):
77455e156112 integration test for issue 200 Sebastien Jodogne <s.jodogne@gmail.com> parents: 424 diff changeset	8952 # https://groups.google.com/g/orthanc-users/c/9CTLsL-JqDw/m/2I0xgyYHBAAJ
589 47b87c87213b new tests for GET /tools/create-archive Alain Mazy <am@osimis.io> parents: 588 diff changeset	8953 # https://bugs.orthanc-server.com/show_bug.cgi?id=200
428 d68dabf3d784 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	8954 self.assertEqual(0, len(DoGet(_REMOTE, '/changes') ['Changes']))
d68dabf3d784 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	8955 self.assertEqual(0, len(DoGet(_REMOTE, '/changes?last') ['Changes']))
429 f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8956 u = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
427 77455e156112 integration test for issue 200 Sebastien Jodogne <s.jodogne@gmail.com> parents: 424 diff changeset	8957
77455e156112 integration test for issue 200 Sebastien Jodogne <s.jodogne@gmail.com> parents: 424 diff changeset	8958 for change in DoGet(_REMOTE, '/changes') ['Changes']:
77455e156112 integration test for issue 200 Sebastien Jodogne <s.jodogne@gmail.com> parents: 424 diff changeset	8959 self.assertTrue(re.match('[0-9]{8}T[0-9]{6}', change['Date']))
77455e156112 integration test for issue 200 Sebastien Jodogne <s.jodogne@gmail.com> parents: 424 diff changeset	8960 self.assertTrue(re.match('[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}', change['ID']))
428 d68dabf3d784 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	8961
d68dabf3d784 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	8962 last = DoGet(_REMOTE, '/changes?last') ['Changes']
d68dabf3d784 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	8963 self.assertEqual(1, len(last))
d68dabf3d784 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	8964 self.assertTrue(re.match('[0-9]{8}T[0-9]{6}', last[0]['Date']))
d68dabf3d784 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	8965 self.assertTrue(re.match('[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}', last[0]['ID']))
429 f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8966
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8967 self.assertEqual(0, len(DoGet(_REMOTE, '/exports') ['Exports']))
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8968 self.assertEqual(0, len(DoGet(_REMOTE, '/exports?last') ['Exports']))
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8969 DoPost(_REMOTE, '/modalities/self/store', [ u ])
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8970
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8971 for change in DoGet(_REMOTE, '/exports') ['Exports']:
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8972 self.assertTrue(re.match('[0-9]{8}T[0-9]{6}', change['Date']))
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8973 self.assertTrue(re.match('[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}', change['ID']))
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8974
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8975 last = DoGet(_REMOTE, '/exports?last') ['Exports']
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8976 self.assertEqual(1, len(last))
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8977 self.assertEqual('ozp00SjY2xG', last[0]['PatientID'])
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8978 self.assertEqual('self', last[0]['RemoteModality'])
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8979 self.assertEqual('Instance', last[0]['ResourceType'])
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8980 self.assertEqual('/instances/%s' % last[0]['ID'], last[0]['Path'])
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8981 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', last[0]['StudyInstanceUID'])
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8982 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', last[0]['SeriesInstanceUID'])
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8983 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', last[0]['SOPInstanceUID'])
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8984 self.assertTrue(re.match('[0-9]{8}T[0-9]{6}', last[0]['Date']))
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8985 self.assertTrue(re.match('[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}', last[0]['ID']))
431 e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8986
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8987
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8988 def test_upload_dicomdir_archive(self):
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8989 # This test fails on Orthanc <= 1.9.6
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8990 # https://groups.google.com/g/orthanc-users/c/sgBU89o4nhU/m/kbRAYiQUAAAJ
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8991
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8992 # Create a ZIP archive with a DICOMDIR
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8993 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8994 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8995 media = DoGet(_REMOTE, '/studies/%s/media' % study)
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8996 DoDelete(_REMOTE, '/instances/%s' % instance)
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8997
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8998 result = DoPost(_REMOTE, '/instances', media)
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8999 self.assertEqual(1, len(result))
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	9000 self.assertEqual(instance, result[0]['ID'])
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	9001 self.assertEqual('Success', result[0]['Status'])
432 f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9002
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9003
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9004 def test_modify_keep_source(self):
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9005 # https://groups.google.com/g/orthanc-users/c/1lvlBTs2WUY/m/HmYsc2CPBQAJ
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9006 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9007 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9008 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9009
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9010 a = DoPost(_REMOTE, '/studies/%s/anonymize' % study, {}) ['ID']
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9011 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9012 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9013 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9014
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9015 a = DoPost(_REMOTE, '/studies/%s/anonymize' % study, { 'KeepSource' : True }) ['ID']
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9016 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9017 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9018 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9019
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9020 a = DoPost(_REMOTE, '/studies/%s/anonymize' % study, { 'KeepSource' : False }) ['ID']
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9021 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9022 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9023 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9024
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9025 UploadInstance(_REMOTE, 'DummyCT.dcm')
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9026 a = DoPost(_REMOTE, '/studies/%s/modify' % study, { 'Replace' : { } }) ['ID']
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9027 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9028 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9029 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9030
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9031 a = DoPost(_REMOTE, '/studies/%s/modify' % study, { 'KeepSource' : True }) ['ID']
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9032 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9033 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9034 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9035
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9036 a = DoPost(_REMOTE, '/studies/%s/modify' % study, { 'KeepSource' : False }) ['ID']
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9037 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9038 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9039 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9040
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9041 def GetStudy(a):
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9042 b = filter(lambda x: x['Type'] == 'Study', a['Resources'])
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9043 if len(b) == 1:
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9044 return b[0]['ID']
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9045 else:
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9046 raise Exception()
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9047
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9048 UploadInstance(_REMOTE, 'DummyCT.dcm')
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9049 a = GetStudy(DoPost(_REMOTE, '/tools/bulk-anonymize', { 'Resources' : [ study ]}))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9050 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9051 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9052 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9053
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9054 a = GetStudy(DoPost(_REMOTE, '/tools/bulk-anonymize', { 'Resources' : [ study ], 'KeepSource' : True}))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9055 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9056 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9057 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9058
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9059 a = GetStudy(DoPost(_REMOTE, '/tools/bulk-anonymize', { 'Resources' : [ study ], 'KeepSource' : False}))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9060 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9061 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9062 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9063
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9064 UploadInstance(_REMOTE, 'DummyCT.dcm')
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9065 a = GetStudy(DoPost(_REMOTE, '/tools/bulk-modify', { 'Resources' : [ study ], 'Replace' : { }}))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9066 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9067 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9068 # No more studies, because "bulk-modify" was not given a
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9069 # level, so the modified instance belongs to the same study as
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9070 # the original instance
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9071 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9072
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9073 # The following fails on Orthanc <= 1.9.6 because "Level" was
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9074 # introduced in 1.9.7
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9075
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9076 UploadInstance(_REMOTE, 'DummyCT.dcm')
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9077 a = GetStudy(DoPost(_REMOTE, '/tools/bulk-modify', { 'Level' : 'Study', 'Resources' : [ study ], 'Replace' : { }}))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9078 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9079 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9080 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9081
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9082 a = GetStudy(DoPost(_REMOTE, '/tools/bulk-modify', { 'Level' : 'Study', 'Resources' : [ study ], 'KeepSource' : True}))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9083 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9084 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9085 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9086
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9087 a = GetStudy(DoPost(_REMOTE, '/tools/bulk-modify', { 'Level' : 'Study', 'Resources' : [ study ], 'KeepSource' : False}))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9088 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9089 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	9090 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
433 cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9091
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9092
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9093 def test_multiframe_windowing(self):
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9094 # Fixed in Orthanc 1.9.7
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9095 a = UploadInstance(_REMOTE, 'MultiframeWindowing.dcm') ['ID']
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9096
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9097 im = GetImage(_REMOTE, '/instances/%s/frames/0/rendered?window-center=127&window-width=256' % a)
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9098 self.assertEqual(0x00, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9099 self.assertEqual(0x10, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9100 self.assertEqual(0x20, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9101 self.assertEqual(0x30, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9102
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9103 # Center the window on value "16 == 0x10", thus it has the
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9104 # mid-level value (i.e. 127)
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9105 im = GetImage(_REMOTE, '/instances/%s/frames/0/rendered?window-center=16&window-width=128' % a)
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9106 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9107 self.assertEqual(127, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9108 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9109 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9110
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9111 # Window center and window width are burned in FrameVOILUTSequence for frame 0
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9112 im = GetImage(_REMOTE, '/instances/%s/frames/0/rendered' % a)
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9113 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9114 self.assertEqual(127, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9115 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9116 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9117
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9118 im = GetImage(_REMOTE, '/instances/%s/frames/1/rendered?window-center=127&window-width=256' % a)
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9119 self.assertEqual(100, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9120 self.assertEqual(116, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9121 self.assertEqual(132, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9122 self.assertEqual(148, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9123
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9124 im = GetImage(_REMOTE, '/instances/%s/frames/2/rendered?window-center=127&window-width=256' % a)
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9125 self.assertEqual(0, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9126 self.assertEqual(32, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9127 self.assertEqual(64, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9128 self.assertEqual(96, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9129
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9130 im = GetImage(_REMOTE, '/instances/%s/frames/3/rendered?window-center=127&window-width=256' % a)
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9131 self.assertEqual(100, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9132 self.assertEqual(132, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9133 self.assertEqual(164, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9134 self.assertEqual(196, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9135
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9136 im = GetImage(_REMOTE, '/instances/%s/frames/0/rendered?window-center=16&window-width=128' % a)
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9137 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9138 self.assertEqual(127, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9139 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9140 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	9141
436 9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9142
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9143 def test_dicom_seg(self):
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9144 # This test fails in Orthanc <= 1.9.7
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9145 a = UploadInstance(_REMOTE, 'DicomSeg.dcm') ['ID']
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9146
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9147 self.assertEqual(96, len(DoGet(_REMOTE, '/instances/%s/frames' % a)))
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9148 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/96/preview' % a))
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9149
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9150 nonEmptyFrames = [ 11, 12, 13, 14, 15, 16, 39, 40, 42, 43, 44, 45,
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9151 46, 47, 48, 49, 75, 76, 77, 78, 79, 80, 81 ]
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9152
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9153 for i in range(96):
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9154 im = GetImage(_REMOTE, '/instances/%s/frames/%d/preview' % (a, i))
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9155 self.assertEqual('L', im.mode)
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9156 self.assertEqual(256, im.size[0])
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9157 self.assertEqual(256, im.size[1])
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9158
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9159 e = im.getextrema()
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9160 self.assertEqual(0, e[0])
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9161
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9162 if e[1] == 0:
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9163 self.assertFalse(i in nonEmptyFrames)
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9164 else:
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9165 self.assertTrue(i in nonEmptyFrames)
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9166
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9167 im1 = GetImage(_REMOTE, '/instances/%s/frames/44/preview' % a)
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9168
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9169 # Generated by "dcm2pnm +F 45 DicomSeg.dcm DicomSeg-Frame45.pgm"
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9170 im2 = Image.open(GetDatabasePath('DicomSeg-Frame45.pgm'))
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9171 im2 = im2.point(lambda p: 255 if p == 128 else 0)
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9172
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	9173 self.assertTrue(ImageChops.difference(im1, im2).getbbox() is None)
440 3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9174
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9175
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9176 def test_numpy(self):
448 63f475995400 Orthanc 1.9.8 is now known as Orthanc 1.10.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 447 diff changeset	9177 # New in Orthanc 1.10.0
440 3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9178 a = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9179 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm')
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9180 b = UploadInstance(_REMOTE, 'DicomSeg.dcm') ['ID']
441 21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9181 d = UploadInstance(_REMOTE, 'Issue124.dcm') ['ID']
440 3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9182
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9183 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/frames/0/numpy' % a)))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9184 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9185 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9186 self.assertEqual((288, 288, 1), c.shape)
441 21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9187 self.assertAlmostEqual(0, c.min())
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9188 self.assertAlmostEqual(536, c.max())
440 3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9189
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9190 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/frames/0/numpy?rescale=0' % a)))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9191 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9192 self.assertEqual(numpy.uint16, c.dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9193 self.assertEqual((288, 288, 1), c.shape)
441 21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9194 self.assertEqual(0, c.min())
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9195 self.assertEqual(536, c.max())
440 3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9196
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9197 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/numpy?rescale=1&compress=false' % a)))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9198 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9199 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9200 self.assertEqual((1, 288, 288, 1), c.shape)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9201
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9202 series = DoGet(_REMOTE, '/instances/%s/series' % a)['ID']
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9203 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/series/%s/numpy?rescale=true&compress=0' % series)))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9204 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9205 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9206 self.assertEqual((2, 288, 288, 1), c.shape)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9207
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9208 series = DoGet(_REMOTE, '/instances/%s/series' % a)['ID']
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9209 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/series/%s/numpy?rescale=1' % series)))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9210 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9211 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9212 self.assertEqual((2, 288, 288, 1), c.shape)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9213
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9214 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/numpy?compress' % a)))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9215 self.assertTrue(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9216 self.assertEqual(1, len(c.files))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9217 self.assertEqual(numpy.float32, c['arr_0'].dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9218 self.assertEqual((1, 288, 288, 1), c['arr_0'].shape)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9219
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9220 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/frames/0/numpy' % b)))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9221 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9222 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9223 self.assertEqual((256, 256, 1), c.shape)
441 21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9224 self.assertAlmostEqual(0, c.min())
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9225 self.assertAlmostEqual(0, c.max())
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9226
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9227 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/frames/14/numpy' % b)))
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9228 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9229 self.assertEqual(numpy.float32, c.dtype)
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9230 self.assertEqual((256, 256, 1), c.shape)
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9231 self.assertAlmostEqual(0, c.min())
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9232 self.assertAlmostEqual(255, c.max())
440 3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9233
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9234 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/numpy' % b)))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9235 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9236 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9237 self.assertEqual((96, 256, 256, 1), c.shape)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9238
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9239 series = DoGet(_REMOTE, '/instances/%s/series' % b)['ID']
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9240 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/series/%s/numpy' % series)))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9241 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9242 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	9243 self.assertEqual((96, 256, 256, 1), c.shape)
441 21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9244
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9245 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/frames/0/numpy' % d)))
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9246 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9247 self.assertEqual(numpy.float32, c.dtype)
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9248 self.assertEqual((512, 512, 1), c.shape)
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9249 self.assertAlmostEqual(-3024, c.min()) # RescaleIntercept equals -1024 in this image
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9250 self.assertAlmostEqual(2374, c.max())
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9251
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9252 c = numpy.load(io.BytesIO(DoGet(_REMOTE, '/instances/%s/frames/0/numpy?rescale=0' % d)))
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9253 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9254 self.assertEqual(numpy.int16, c.dtype)
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9255 self.assertEqual((512, 512, 1), c.shape)
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9256 self.assertEqual(-2000, c.min())
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9257 self.assertEqual(3398, c.max())
442 af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9258
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9259
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9260 def test_find_patient_name_with_brackets_and_star(self):
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9261 u = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID']
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9262
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9263 modified = DoPost(_REMOTE, '/instances/%s/modify' % u, json.dumps({
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9264 "Replace" : {
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9265 "PatientName" : "MyName[*]",
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9266 "PatientID": "test_brackets"
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9267 },
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9268 "Force": True
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9269 }),
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9270 'application/json')
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9271
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9272 m = DoPost(_REMOTE, '/instances', modified, 'application/dicom')['ID']
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9273
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9274 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9275 'Query' : { 'PatientName' : 'MyName[*]' }})
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9276 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9277
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9278 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9279 'Query' : { 'PatientName' : 'MyName[*]' }})
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9280 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9281
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9282 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9283 'Query' : { 'PatientName' : 'MyName*' }})
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9284 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9285
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9286 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9287 'Query' : { 'PatientName' : 'MyName*' }})
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9288 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9289
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9290 def test_find_patient_name_with_brackets_only(self):
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9291 u = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID']
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9292
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9293 modified = DoPost(_REMOTE, '/instances/%s/modify' % u, json.dumps({
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9294 "Replace" : {
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9295 "PatientName" : "MyName2[]",
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9296 "PatientID": "test_brackets2"
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9297 },
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9298 "Force": True
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9299 }),
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9300 'application/json')
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9301
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9302 m = DoPost(_REMOTE, '/instances', modified, 'application/dicom')['ID']
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9303
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9304 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9305 'Query' : { 'PatientName' : 'MyName2[*]' }})
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9306 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9307
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9308 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9309 'Query' : { 'PatientName' : 'MyName2[*]' }})
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9310 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9311
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9312 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9313 'Query' : { 'PatientName' : 'MyName2*' }})
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9314 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9315
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9316 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9317 'Query' : { 'PatientName' : 'MyName2*' }})
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9318 self.assertEqual(1, len(a))
455 f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9319
f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9320
452 45dd181b0f17 added test for requestedTags in tools/find + list-resources Alain Mazy <am@osimis.io> parents: 451 diff changeset	9321 def test_rest_find_requested_tags(self):
486 6144ef431512 new tests for sequences in ExtraMainDicomTags Alain Mazy <am@osimis.io> parents: 482 diff changeset	9322 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1): # RequestedTags introduced in 1.11.0 but Sequences allowed since 1.11.1
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9323
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9324 # Upload instances
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9325 for i in range(2):
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9326 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9327
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9328 # Patient level
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9329 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9330 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9331 'Query' : { 'PatientName' : 'BRAINIX' },
486 6144ef431512 new tests for sequences in ExtraMainDicomTags Alain Mazy <am@osimis.io> parents: 482 diff changeset	9332 'RequestedTags' : [ 'PatientName', 'PatientID', 'PatientSex', 'PatientBirthDate'],
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9333 'Expand': True
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9334 })
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9335 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9336 self.assertIn('PatientName', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9337 self.assertIn('PatientID', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9338 self.assertIn('PatientSex', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9339 self.assertIn('PatientBirthDate', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9340
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9341 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9342 self.assertEqual('5Yp0E', a[0]['RequestedTags']['PatientID'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9343 self.assertEqual('0000', a[0]['RequestedTags']['PatientSex'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9344 self.assertEqual('19490301', a[0]['RequestedTags']['PatientBirthDate'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9345
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9346 # Study level, request patient tags too
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9347 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9348 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9349 'Query' : { 'PatientName' : 'BRAINIX' },
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9350 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID'],
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9351 'Expand': True
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9352 })
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9353 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9354 self.assertIn('PatientName', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9355 self.assertIn('StudyInstanceUID', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9356
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9357 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9358 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9359
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9360
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9361 # Series level, request patient and study tags too
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9362 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9363 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9364 'Query' : { 'PatientName' : 'BRAINIX' },
486 6144ef431512 new tests for sequences in ExtraMainDicomTags Alain Mazy <am@osimis.io> parents: 482 diff changeset	9365 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SeriesInstanceUID', 'RequestAttributesSequence'],
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9366 'Expand': True
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9367 })
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9368 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9369 self.assertIn('PatientName', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9370 self.assertIn('StudyInstanceUID', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9371 self.assertIn('SeriesInstanceUID', a[0]['RequestedTags'])
486 6144ef431512 new tests for sequences in ExtraMainDicomTags Alain Mazy <am@osimis.io> parents: 482 diff changeset	9372 self.assertIn('RequestAttributesSequence', a[0]['RequestedTags'])
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9373
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9374 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9375 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9376 self.assertEqual('1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497', a[0]['RequestedTags']['SeriesInstanceUID'])
486 6144ef431512 new tests for sequences in ExtraMainDicomTags Alain Mazy <am@osimis.io> parents: 482 diff changeset	9377 self.assertEqual('A10029316690', a[0]['RequestedTags']['RequestAttributesSequence'][0]['RequestedProcedureID'])
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9378
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9379
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9380 # Instance level, request patient, study and series tags too, include tags that are not part of the main dicom tags
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9381 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9382 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9383 'Query' : { 'PatientName' : 'BRAINIX' },
486 6144ef431512 new tests for sequences in ExtraMainDicomTags Alain Mazy <am@osimis.io> parents: 482 diff changeset	9384 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'PhotometricInterpretation', 'RequestAttributesSequence'],
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9385 'Expand': True
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9386 })
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9387 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9388 self.assertIn('PatientName', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9389 self.assertIn('StudyInstanceUID', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9390 self.assertIn('SeriesInstanceUID', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9391 self.assertIn('PhotometricInterpretation', a[0]['RequestedTags'])
486 6144ef431512 new tests for sequences in ExtraMainDicomTags Alain Mazy <am@osimis.io> parents: 482 diff changeset	9392 self.assertIn('RequestAttributesSequence', a[0]['RequestedTags'])
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9393
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9394 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9395 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9396 self.assertEqual('1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114285654497', a[0]['RequestedTags']['SeriesInstanceUID'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9397 self.assertEqual('MONOCHROME2', a[0]['RequestedTags']['PhotometricInterpretation'])
486 6144ef431512 new tests for sequences in ExtraMainDicomTags Alain Mazy <am@osimis.io> parents: 482 diff changeset	9398 self.assertEqual('A10029316690', a[0]['RequestedTags']['RequestAttributesSequence'][0]['RequestedProcedureID'])
452 45dd181b0f17 added test for requestedTags in tools/find + list-resources Alain Mazy <am@osimis.io> parents: 451 diff changeset	9399
45dd181b0f17 added test for requestedTags in tools/find + list-resources Alain Mazy <am@osimis.io> parents: 451 diff changeset	9400
453 46ae8fb09254 test computed tags for tools/find and list-resources Alain Mazy <am@osimis.io> parents: 452 diff changeset	9401 def test_rest_find_requested_tags_computed_tags(self):
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9402 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9403 # Upload instances
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9404 for i in range(2):
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9405 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9406
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9407
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9408 # Patient level
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9409 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9410 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9411 'Query' : { 'PatientName' : 'BRAINIX' },
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9412 'RequestedTags' : [ 'PatientName', 'NumberOfPatientRelatedStudies', 'NumberOfPatientRelatedSeries', 'NumberOfPatientRelatedInstances'],
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9413 'Expand': True
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9414 })
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9415 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9416
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9417 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9418 self.assertEqual('1', a[0]['RequestedTags']['NumberOfPatientRelatedStudies'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9419 self.assertEqual('1', a[0]['RequestedTags']['NumberOfPatientRelatedSeries'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9420 self.assertEqual('2', a[0]['RequestedTags']['NumberOfPatientRelatedInstances'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9421
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9422 # Study level
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9423 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9424 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9425 'Query' : { 'PatientName' : 'BRAINIX' },
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9426 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'ModalitiesInStudy', 'SOPClassesInStudy', 'NumberOfStudyRelatedInstances', 'NumberOfStudyRelatedSeries'],
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9427 'Expand': True
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9428 })
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9429 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9430
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9431 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9432 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9433 self.assertEqual('MR', a[0]['RequestedTags']['ModalitiesInStudy'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9434 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', a[0]['RequestedTags']['SOPClassesInStudy'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9435 self.assertEqual('2', a[0]['RequestedTags']['NumberOfStudyRelatedInstances'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9436 self.assertEqual('1', a[0]['RequestedTags']['NumberOfStudyRelatedSeries'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9437
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9438 # Series level
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9439 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9440 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9441 'Query' : { 'PatientName' : 'BRAINIX' },
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9442 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'NumberOfSeriesRelatedInstances'],
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9443 'Expand': True
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9444 })
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9445 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9446
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9447 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9448 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9449 self.assertEqual('2', a[0]['RequestedTags']['NumberOfSeriesRelatedInstances'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9450
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9451 # Instance level
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9452 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9453 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9454 'Query' : { 'PatientName' : 'BRAINIX' },
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9455 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SOPInstanceUID', 'InstanceAvailability'],
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9456 'Expand': True
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9457 })
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9458 self.assertEqual(2, len(a))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9459
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9460 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9461 self.assertEqual('2.16.840.1.113669.632.20.1211.10000357775', a[0]['RequestedTags']['StudyInstanceUID'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9462 self.assertEqual('ONLINE', a[0]['RequestedTags']['InstanceAvailability'])
456 0d7c0bbe6c90 fix Alain Mazy <am@osimis.io> parents: 454 diff changeset	9463
452 45dd181b0f17 added test for requestedTags in tools/find + list-resources Alain Mazy <am@osimis.io> parents: 451 diff changeset	9464 def test_list_resources_requested_tags(self):
45dd181b0f17 added test for requestedTags in tools/find + list-resources Alain Mazy <am@osimis.io> parents: 451 diff changeset	9465
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9466 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9467 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9468 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9469 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9470
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9471 # list series and request tags that are not in the default main dicom tags
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9472 a = DoGet(_REMOTE, '/studies/%s/series?expand&simplify&requestedTags=PatientName;Modality;SeriesInstanceUID;MRAcquisitionType' % study)
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9473
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9474 self.assertEqual('2D', a[0]['RequestedTags']['MRAcquisitionType'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9475 self.assertEqual('MR', a[0]['RequestedTags']['Modality'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9476 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9477 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', a[0]['RequestedTags']['SeriesInstanceUID'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9478
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9479 # list studies and request patient and studies tags
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9480 a = DoGet(_REMOTE, '/patients/%s/studies?expand&simplify&requestedTags=PatientName;StudyInstanceUID' % patient)
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9481
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9482 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', a[0]['RequestedTags']['StudyInstanceUID'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9483 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9484
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9485
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9486 # list instances and request patient, studies and series tags including tags that are not in main dicom tags
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9487 a = DoGet(_REMOTE, '/patients/%s/instances?expand&simplify&requestedTags=PatientName;StudyInstanceUID;SeriesInstanceUID;SOPInstanceUID;Rows;Columns;InstanceAvailability' % patient)
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9488
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9489 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', a[0]['RequestedTags']['StudyInstanceUID'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9490 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', a[0]['RequestedTags']['SeriesInstanceUID'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9491 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', a[0]['RequestedTags']['SOPInstanceUID'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9492 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9493 self.assertEqual('512', a[0]['RequestedTags']['Rows'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9494 self.assertEqual('512', a[0]['RequestedTags']['Columns'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9495 self.assertEqual('ONLINE', a[0]['RequestedTags']['InstanceAvailability'])
452 45dd181b0f17 added test for requestedTags in tools/find + list-resources Alain Mazy <am@osimis.io> parents: 451 diff changeset	9496
453 46ae8fb09254 test computed tags for tools/find and list-resources Alain Mazy <am@osimis.io> parents: 452 diff changeset	9497
46ae8fb09254 test computed tags for tools/find and list-resources Alain Mazy <am@osimis.io> parents: 452 diff changeset	9498 def test_list_resources_requested_tags_study_computed_tags(self):
452 45dd181b0f17 added test for requestedTags in tools/find + list-resources Alain Mazy <am@osimis.io> parents: 451 diff changeset	9499
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9500 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9501 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9502 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9503 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9504
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9505 # list studies and request patient and studies tags, including ModalitiesInStudy
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9506 a = DoGet(_REMOTE, '/patients/%s/studies?expand&simplify&requestedTags=PatientName;StudyInstanceUID;ModalitiesInStudy;SOPClassesInStudy;NumberOfStudyRelatedInstances;NumberOfStudyRelatedSeries' % patient)
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9507
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9508 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', a[0]['RequestedTags']['StudyInstanceUID'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9509 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9510 self.assertEqual('MR', a[0]['RequestedTags']['ModalitiesInStudy'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9511 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', a[0]['RequestedTags']['SOPClassesInStudy'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9512 self.assertEqual('1', a[0]['RequestedTags']['NumberOfStudyRelatedInstances'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9513 self.assertEqual('1', a[0]['RequestedTags']['NumberOfStudyRelatedSeries'])
453 46ae8fb09254 test computed tags for tools/find and list-resources Alain Mazy <am@osimis.io> parents: 452 diff changeset	9514
46ae8fb09254 test computed tags for tools/find and list-resources Alain Mazy <am@osimis.io> parents: 452 diff changeset	9515
46ae8fb09254 test computed tags for tools/find and list-resources Alain Mazy <am@osimis.io> parents: 452 diff changeset	9516 def test_list_resources_requested_tags_series_computed_tags(self):
46ae8fb09254 test computed tags for tools/find and list-resources Alain Mazy <am@osimis.io> parents: 452 diff changeset	9517
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9518 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9519 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9520 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9521 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9522
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9523 # list studies and request patient and studies tags, including ModalitiesInStudy
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9524 a = DoGet(_REMOTE, '/studies/%s/series?expand&simplify&requestedTags=PatientName;SeriesInstanceUID;NumberOfSeriesRelatedInstances' % study)
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9525
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9526 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', a[0]['RequestedTags']['SeriesInstanceUID'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9527 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9528 self.assertEqual('1', a[0]['RequestedTags']['NumberOfSeriesRelatedInstances'])
453 46ae8fb09254 test computed tags for tools/find and list-resources Alain Mazy <am@osimis.io> parents: 452 diff changeset	9529
455 f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9530 def test_dicomweb_jpeg2k_implicit(self):
f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9531 # This is a file encoded using 1.2.840.10008.1.2.4.90 transfer
457 8121c8aab919 typo Sebastien Jodogne <s.jodogne@gmail.com> parents: 455 diff changeset	9532 # syntax, in which most DICOM tags have the "UN" value
455 f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9533 # representation. Support introduced in Orthanc 1.10.1.
f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9534 # https://groups.google.com/g/orthanc-users/c/86fobx3ZyoM/m/KBG17un6AQAJ
f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9535 a = UploadInstance(_REMOTE, '2022-03-08-RicSmi.dcm') ['ID']
f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9536 b = DoGet(_REMOTE, '/instances/%s/file' % a,
f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9537 headers = { 'Accept' : 'application/dicom+json' })
f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9538 self.assertEqual(b['0020000D']['Value'][0], '1.2.276.0.7230010.3.1.2.2358427580.3460.1646695830.793')
f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9539 self.assertEqual(b['0020000E']['Value'][0], '1.2.276.0.7230010.3.1.3.2358427580.3460.1646695830.794')
488 e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9540
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9541 def test_create_png16RBGA(self):
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9542 with open(GetDatabasePath('Png16RBGATest.png'), 'rb') as f:
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9543 png = f.read()
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9544
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9545 i = DoPost(_REMOTE, '/tools/create-dicom',
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9546 json.dumps({
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9547 'PatientName' : 'Jodogne',
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9548 'Modality' : 'CT',
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9549 'SOPClassUID' : '1.2.840.10008.5.1.4.1.1.1',
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9550 'PixelData' : 'data:image/png;base64,' + base64.b64encode(png)
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9551 }))
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9552
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9553 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip())
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9554 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip())
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9555
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9556 png = GetImage(_REMOTE, '/instances/%s/preview' % i['ID'])
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9557 self.assertEqual((32, 32), png.size)
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9558
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9559 png = GetImage(_REMOTE, '/instances/%s/rendered' % i['ID'])
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9560 self.assertEqual((32, 32), png.size)
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9561
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9562 j = DoGet(_REMOTE, i['Path'])
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9563 self.assertEqual('Instance', j['Type'])
e904b2282b0e Added support for RGBA64 images in tools/create-dicom and /preview (Contribution from James Manners - Pliny) Alain Mazy <am@osimis.io> parents: 486 diff changeset	9564 self.assertEqual(j['ID'], i['ID'])
501 1b1bb8621021 /store: allows overriding CalledAet, Host, Port Alain Mazy <am@osimis.io> parents: 500 diff changeset	9565
1b1bb8621021 /store: allows overriding CalledAet, Host, Port Alain Mazy <am@osimis.io> parents: 500 diff changeset	9566 def test_storescu_custom_host_ip_port(self):
510 fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9567 if IsOrthancVersionAbove(_REMOTE, 1, 11, 3):
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9568 DropOrthanc(_LOCAL)
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9569 DropOrthanc(_REMOTE)
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9570
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9571 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9572
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9573 # upload to self -> orthanctest shall not receive any content
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9574 DoPost(_REMOTE, '/modalities/self/store', {
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9575 'Resources' : [ a['ID']]
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9576 })
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9577 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9578
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9579 # upload to self by overriding it with config from orthanctest -> orthanctest shall receive the content
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9580 c = DoGet(_REMOTE, '/modalities/orthanctest/configuration')
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9581 DoPost(_REMOTE, '/modalities/self/store', {
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9582 'LocalAet' : 'YOP',
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9583 'CalledAet' : c['AET'],
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9584 'Port' : c['Port'],
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9585 'Host' : c['Host'],
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9586 'Resources' : [ a['ID']]
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9587 })
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9588
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9589 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9590
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9591 DropOrthanc(_REMOTE)
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9592 DropOrthanc(_LOCAL)
503 138d5efd4407 added test_rle_planar_configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 502 diff changeset	9593
138d5efd4407 added test_rle_planar_configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 502 diff changeset	9594 def test_rle_planar_configuration(self):
531 8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9595 if IsOrthancVersionAbove(_REMOTE, 1, 11, 2):
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9596 # https://groups.google.com/g/orthanc-users/c/CSVWfRasSR0/m/y1XDRXVnAgAJ
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9597 a = UploadInstance(_REMOTE, '2022-11-14-RLEPlanarConfiguration.dcm') ['ID']
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9598 uri = '/instances/%s/preview' % a
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9599 im = GetImage(_REMOTE, uri)
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9600 self.assertEqual('RGB', im.mode)
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9601 self.assertEqual(1475, im.size[0])
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9602 self.assertEqual(1475, im.size[1])
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9603 self.assertEqual('c684b0050dc2523041240bf2d26dc85e', ComputeMD5(DoGet(_REMOTE, uri)))
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9604
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9605 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9606 a = UploadInstance(_REMOTE, '2023-04-21-RLEPlanarConfigurationYBR_FULL.dcm') ['ID']
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9607 uri = '/instances/%s/preview' % a
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9608 im = GetImage(_REMOTE, uri)
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9609 self.assertEqual('RGB', im.mode)
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9610 self.assertEqual(1260, im.size[0])
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9611 self.assertEqual(910, im.size[1])
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9612 self.assertEqual('07a3ea7ea08d54362f744cc5945e8743', ComputeMD5(DoGet(_REMOTE, uri)))
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9613
512 e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	9614
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	9615 def test_rest_api_write_to_file_system(self):
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	9616 if IsOrthancVersionAbove(_REMOTE, 1, 12, 0):
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	9617 a = UploadInstance(_REMOTE, '2022-11-14-RLEPlanarConfiguration.dcm') ['ID']
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	9618 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances/%s/export' % a, '/tmp/test.dcm'))
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9619
515 5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9620 def test_overwrite_generates_stable_study(self):
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9621
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9622 # This test makes sure there are no regression wrt StableStudy when uploading instances in Orthanc
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9623 # The current behaviour (tested from 1.5.7 to 1.12.0) is
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9624 # If you upload 2 instances with a delay > StableAge, you get 2 StableStudy events and they are both listed in /changes
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9625 # If you upload twice the same instance with a delay > StableAge, you get 2 StableStudy events but only the last one is listed in /changes, the first one is deleted
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9626 # If you upload an instance and a modified version of this instance with a delay > StableAge, you get 2 StableStudy events but only the last one is listed in /changes, the first one is deleted
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9627
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9628
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9629 def GetAllStableStudyChangesIds(studyId, timeout):
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9630 # try to be as fast as possible -> stop as soon as we've found a StableStudy event that appeared after we started monitoring
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9631 fromSeq = DoGet(_REMOTE, '/changes')["Last"]
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9632
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9633 endTime = time.time() + timeout
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9634 newStableStudyFound = False
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9635 while not newStableStudyFound and time.time() < endTime:
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9636 time.sleep(0.1)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9637 changes = DoGet(_REMOTE, '/changes')
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9638 stableStudyChangesIds = []
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9639
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9640 for change in changes["Changes"]:
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9641 if change["ChangeType"] == "StableStudy" and studyId == change["ID"]:
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9642 stableStudyChangesIds.append(change["Seq"])
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9643 if change["Seq"] > fromSeq:
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9644 newStableStudyFound = True
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9645
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9646 return stableStudyChangesIds
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9647
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9648 if True:
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9649 DropOrthanc(_REMOTE)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9650 upload1 = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm')
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9651 # StableAge is set to 1, expect a StableStudy within 4 seconds
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9652 changes1 = GetAllStableStudyChangesIds(upload1["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9653 self.assertEqual(1, len(changes1))
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9654
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9655 # upload the same instance again and check a new change has been generated with a new id, the first change has been deleted
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9656 upload1b = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm')
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9657 changes1b = GetAllStableStudyChangesIds(upload1b["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9658 self.assertEqual(1, len(changes1b))
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9659 self.assertNotEqual(changes1[0], changes1b[0])
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9660
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9661 if True:
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9662 DropOrthanc(_REMOTE)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9663 upload1 = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm')
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9664 # StableAge is set to 1, expect a StableStudy within 4 seconds
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9665 changes1 = GetAllStableStudyChangesIds(upload1["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9666 self.assertEqual(1, len(changes1))
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9667
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9668 # reupload a modified instance in the same study and check a new change has been generated with a new id, the first change has been deleted
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9669 modified = DoPost(_REMOTE, '/instances/%s/modify' % upload1["ID"],
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9670 json.dumps({
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9671 "Replace" : {
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9672 "InstitutionName" : "hello",
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9673 "SOPInstanceUID": "1.2.840.113619.2.176.2025.1499492.7040.1171286241.705"
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9674 },
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9675 "Force": True
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9676 }),
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9677 'application/json')
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9678 upload1b = DoPost(_REMOTE, '/instances', modified, 'application/dicom')
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9679 changes1b = GetAllStableStudyChangesIds(upload1b["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9680 self.assertEqual(upload1["ParentStudy"], upload1b["ParentStudy"])
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9681 self.assertEqual(1, len(changes1b))
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9682 self.assertNotEqual(changes1[0], changes1b[0])
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9683
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9684
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9685 if True:
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9686 DropOrthanc(_REMOTE)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9687 upload1 = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm')
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9688 # StableAge is set to 1, expect a StableStudy within 4 seconds
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9689 changes1 = GetAllStableStudyChangesIds(upload1["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9690 self.assertEqual(1, len(changes1))
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9691
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9692 # upload a new instance in the same study and check a second StableStudy change has been generated with a new id
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9693 upload2 = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0003.dcm')
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9694 changes2 = GetAllStableStudyChangesIds(upload2["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9695 self.assertEqual(upload1["ParentStudy"], upload2["ParentStudy"])
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9696 self.assertEqual(2, len(changes2))
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9697 self.assertEqual(changes1[0], changes2[0])
516 3a8e4de5aff7 merge Alain Mazy <am@osimis.io> parents: 515 514 diff changeset	9698
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9699 def test_labels(self):
523 767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9700 def CheckAllLabels(expected):
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9701 actual = DoGet(_REMOTE, '/tools/labels')
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9702 self.assertEqual(len(actual), len(expected))
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9703 for i in expected:
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9704 self.assertTrue(i in actual)
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9705 for i in actual:
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9706 self.assertTrue(i in expected)
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9707
517 692f2956ddab test HasLabels in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 516 diff changeset	9708 if (IsOrthancVersionAbove(_REMOTE, 1, 12, 0) and
692f2956ddab test HasLabels in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 516 diff changeset	9709 DoGet(_REMOTE, '/system') ['HasLabels']):
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9710 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9711 patient = DoGet(_REMOTE, '/instances/%s/patient' % u) ['ID']
5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9712 study = DoGet(_REMOTE, '/instances/%s/study' % u) ['ID']
5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9713 series = DoGet(_REMOTE, '/instances/%s/series' % u) ['ID']
5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9714
5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9715 for base in [ '/instances/%s' % u,
5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9716 '/series/%s' % series,
5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9717 '/studies/%s' % study,
519 b1991073e4d1 test alphanumeric labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 518 diff changeset	9718 '/patients/%s' % patient ]:
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9719
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9720 # no tags by default
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9721 self.assertEqual(0, len(DoGet(_REMOTE, base) ['Labels']))
523 767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9722 CheckAllLabels([])
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9723
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9724 # 404 if requesting a tag that does apply for a resource
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9725 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '%s/labels/hello' % base))
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9726
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9727 # delete a non existing tag does not generate an error
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9728 self.assertEqual('', DoDelete(_REMOTE, '%s/labels/hello' % base))
5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9729 self.assertEqual(0, len(DoGet(_REMOTE, base) ['Labels']))
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9730
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9731 # Not an alphanumeric label -> 400
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9732 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '%s/labels/@' % base))
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9733
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9734 # add a tag
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9735 self.assertEqual('', DoPut(_REMOTE, '%s/labels/hello' % base))
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9736 self.assertEqual(1, len(DoGet(_REMOTE, base) ['Labels']))
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9737 self.assertEqual('hello', DoGet(_REMOTE, base) ['Labels'][0])
523 767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9738 CheckAllLabels([ 'hello' ])
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9739
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9740 # double tagging does not generate any error
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9741 self.assertEqual('', DoPut(_REMOTE, '%s/labels/hello' % base))
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9742 self.assertEqual('', DoGet(_REMOTE, '%s/labels/hello' % base))
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9743 self.assertEqual(1, len(DoGet(_REMOTE, base) ['Labels']))
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9744 self.assertEqual('hello', DoGet(_REMOTE, base) ['Labels'][0])
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9745
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9746 # add a second tag
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9747 self.assertEqual('', DoPut(_REMOTE, '%s/labels/world' % base))
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9748 self.assertEqual('', DoGet(_REMOTE, '%s/labels/world' % base))
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9749 self.assertEqual('', DoGet(_REMOTE, '%s/labels/hello' % base))
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9750 self.assertEqual(2, len(DoGet(_REMOTE, base) ['Labels']))
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9751 self.assertIn(DoGet(_REMOTE, base) ['Labels'][0], ['hello', 'world'])
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9752 self.assertIn(DoGet(_REMOTE, base) ['Labels'][1], ['hello', 'world'])
523 767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9753 CheckAllLabels([ 'hello', 'world' ])
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9754
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9755 # delete the first tag
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9756 self.assertEqual('', DoDelete(_REMOTE, '%s/labels/hello' % base))
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9757 self.assertEqual(1, len(DoGet(_REMOTE, base) ['Labels']))
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9758 self.assertEqual('world', DoGet(_REMOTE, base) ['Labels'][0])
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9759 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '%s/labels/hello' % base))
523 767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9760 CheckAllLabels([ 'world' ])
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9761
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9762 # delete the second tag
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9763 self.assertEqual('', DoDelete(_REMOTE, '%s/labels/world' % base))
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9764 self.assertEqual(0, len(DoGet(_REMOTE, base) ['Labels']))
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9765 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '%s/labels/world' % base))
523 767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9766 CheckAllLabels([ ])
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9767
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9768 # test all valid chars
523 767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9769 VALID = r'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-'
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9770 self.assertEqual('', DoPut(_REMOTE, '%s/labels/%s' % (base, VALID)))
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9771 CheckAllLabels([ VALID ])
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9772 DoDelete(_REMOTE, '%s/labels/%s' % (base, VALID))
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9773 CheckAllLabels([ ])
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9774
517 692f2956ddab test HasLabels in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 516 diff changeset	9775 else:
692f2956ddab test HasLabels in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 516 diff changeset	9776 print("Your database backend doesn't support labels")
518 43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9777
43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9778 def test_find_labels(self):
548 3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9779 def Execute(labels, constraint, query = { }, level='Instance'):
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9780 return DoPost(_REMOTE, '/tools/find', { 'Level' : level,
525 b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9781 'Query' : query,
522 fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9782 'Labels' : labels,
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9783 'LabelsConstraint' : constraint, })
518 43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9784
43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9785 if (IsOrthancVersionAbove(_REMOTE, 1, 12, 0) and
43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9786 DoGet(_REMOTE, '/system') ['HasLabels']):
548 3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9787 u = UploadInstance(_REMOTE, 'DummyCT.dcm')
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9788 studyId = u["ParentStudy"]
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9789 seriesId = u["ParentSeries"]
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9790 patientId = u["ParentPatient"]
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9791 u = u["ID"]
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9792 self.assertEqual(1, len(Execute([ 'a' ], 'None')))
518 43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9793
522 fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9794 # The instance has no label
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9795 self.assertEqual(1, len(Execute([], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9796 self.assertEqual(1, len(Execute([], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9797 self.assertEqual(1, len(Execute([], 'None')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9798 self.assertEqual(0, len(Execute([ 'a' ], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9799 self.assertEqual(0, len(Execute([ 'a' ], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9800 self.assertEqual(1, len(Execute([ 'a' ], 'None')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9801 self.assertEqual(0, len(Execute([ 'b' ], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9802 self.assertEqual(0, len(Execute([ 'b' ], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9803 self.assertEqual(1, len(Execute([ 'b' ], 'None')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9804 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9805 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9806 self.assertEqual(1, len(Execute([ 'a', 'b' ], 'None')))
518 43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9807
43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9808 DoPut(_REMOTE, '/instances/%s/labels/a' % u)
522 fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9809 # The instance has label "a"
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9810 self.assertEqual(1, len(Execute([], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9811 self.assertEqual(1, len(Execute([], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9812 self.assertEqual(1, len(Execute([], 'None')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9813 self.assertEqual(1, len(Execute([ 'a' ], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9814 self.assertEqual(1, len(Execute([ 'a' ], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9815 self.assertEqual(0, len(Execute([ 'a' ], 'None')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9816 self.assertEqual(0, len(Execute([ 'b' ], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9817 self.assertEqual(0, len(Execute([ 'b' ], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9818 self.assertEqual(1, len(Execute([ 'b' ], 'None')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9819 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9820 self.assertEqual(1, len(Execute([ 'a', 'b' ], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9821 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'None')))
518 43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9822
525 b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9823 self.assertEqual(0, len(Execute([ 'a' ], 'All', { 'PatientID' : 'nope' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9824 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'PatientID' : '' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9825 self.assertEqual(0, len(Execute([ 'a' ], 'All', { 'StudyInstanceUID' : 'nope' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9826 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'StudyInstanceUID' : '' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9827 self.assertEqual(0, len(Execute([ 'a' ], 'All', { 'SeriesInstanceUID' : 'nope' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9828 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'SeriesInstanceUID' : '' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9829 self.assertEqual(0, len(Execute([ 'a' ], 'All', { 'SOPInstanceUID' : 'nope' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9830 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'SOPInstanceUID' : '' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9831
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9832 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'PatientID' : 'ozp00SjY2xG' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9833
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9834 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'StudyInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9835 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'SeriesInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9836 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'SOPInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9837 self.assertEqual(1, len(Execute([ 'a' ], 'All', {
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9838 'PatientID' : 'ozp00SjY2xG',
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9839 'StudyInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390',
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9840 'SeriesInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394',
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9841 'SOPInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109',
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9842 })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9843
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9844 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'PatientID' : 'nope' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9845 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'PatientID' : '' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9846 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'StudyInstanceUID' : 'nope' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9847 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'StudyInstanceUID' : '' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9848 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SeriesInstanceUID' : 'nope' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9849 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SeriesInstanceUID' : '' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9850 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SOPInstanceUID' : 'nope' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9851 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SOPInstanceUID' : '' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9852
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9853 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'PatientID' : 'ozp00SjY2xG' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9854 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'StudyInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9855 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SeriesInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9856 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SOPInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9857 self.assertEqual(0, len(Execute([ 'b' ], 'All', {
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9858 'PatientID' : 'ozp00SjY2xG',
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9859 'StudyInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390',
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9860 'SeriesInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394',
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9861 'SOPInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109',
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9862 })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9863
518 43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9864 DoPut(_REMOTE, '/instances/%s/labels/b' % u)
522 fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9865 # The instance has labels "a" and "b"
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9866 self.assertEqual(1, len(Execute([], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9867 self.assertEqual(1, len(Execute([], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9868 self.assertEqual(1, len(Execute([], 'None')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9869 self.assertEqual(1, len(Execute([ 'a' ], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9870 self.assertEqual(1, len(Execute([ 'a' ], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9871 self.assertEqual(0, len(Execute([ 'a' ], 'None')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9872 self.assertEqual(1, len(Execute([ 'b' ], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9873 self.assertEqual(1, len(Execute([ 'b' ], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9874 self.assertEqual(0, len(Execute([ 'b' ], 'None')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9875 self.assertEqual(1, len(Execute([ 'a', 'b' ], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9876 self.assertEqual(1, len(Execute([ 'a', 'b' ], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9877 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'None')))
524 0699890b9961 more tests for label Alain Mazy <am@osimis.io> parents: 523 diff changeset	9878 self.assertEqual(0, len(Execute([ 'b', 'c' ], 'All')))
0699890b9961 more tests for label Alain Mazy <am@osimis.io> parents: 523 diff changeset	9879 self.assertEqual(1, len(Execute([ 'b', 'c' ], 'Any')))
0699890b9961 more tests for label Alain Mazy <am@osimis.io> parents: 523 diff changeset	9880 self.assertEqual(0, len(Execute([ 'b', 'c' ], 'None')))
0699890b9961 more tests for label Alain Mazy <am@osimis.io> parents: 523 diff changeset	9881 self.assertEqual(0, len(Execute([ 'c', 'd' ], 'All')))
0699890b9961 more tests for label Alain Mazy <am@osimis.io> parents: 523 diff changeset	9882 self.assertEqual(0, len(Execute([ 'c', 'd' ], 'Any')))
0699890b9961 more tests for label Alain Mazy <am@osimis.io> parents: 523 diff changeset	9883 self.assertEqual(1, len(Execute([ 'c', 'c' ], 'None')))
518 43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9884
43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9885 DoDelete(_REMOTE, '/instances/%s/labels/a' % u)
522 fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9886 # The instance has label "b"
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9887 self.assertEqual(1, len(Execute([], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9888 self.assertEqual(1, len(Execute([], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9889 self.assertEqual(1, len(Execute([], 'None')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9890 self.assertEqual(0, len(Execute([ 'a' ], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9891 self.assertEqual(0, len(Execute([ 'a' ], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9892 self.assertEqual(1, len(Execute([ 'a' ], 'None')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9893 self.assertEqual(1, len(Execute([ 'b' ], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9894 self.assertEqual(1, len(Execute([ 'b' ], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9895 self.assertEqual(0, len(Execute([ 'b' ], 'None')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9896 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9897 self.assertEqual(1, len(Execute([ 'a', 'b' ], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9898 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'None')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9899
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9900 DoDelete(_REMOTE, '/instances/%s/labels/b' % u)
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9901 # The instance has no more label
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9902 self.assertEqual(1, len(Execute([], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9903 self.assertEqual(1, len(Execute([], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9904 self.assertEqual(1, len(Execute([], 'None')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9905 self.assertEqual(0, len(Execute([ 'a' ], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9906 self.assertEqual(0, len(Execute([ 'a' ], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9907 self.assertEqual(1, len(Execute([ 'a' ], 'None')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9908 self.assertEqual(0, len(Execute([ 'b' ], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9909 self.assertEqual(0, len(Execute([ 'b' ], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9910 self.assertEqual(1, len(Execute([ 'b' ], 'None')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9911 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9912 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9913 self.assertEqual(1, len(Execute([ 'a', 'b' ], 'None')))
548 3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9914
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9915
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9916 # tests at series levels (make sure to test only with series levels and with multiple levels)
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9917 DoPut(_REMOTE, '/series/%s/labels/b' % seriesId)
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9918 self.assertEqual(1, len(Execute([ 'a' ], 'None', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9919 'SeriesInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9920 }, 'Series')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9921 self.assertEqual(0, len(Execute([ 'a' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9922 'SeriesInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9923 }, 'Series')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9924 self.assertEqual(1, len(Execute([ 'b' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9925 'SeriesInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9926 }, 'Series')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9927 self.assertEqual(1, len(Execute([ 'b' ], 'All', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9928 'SeriesInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9929 }, 'Series')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9930 self.assertEqual(1, len(Execute([ 'a' ], 'None', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9931 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9932 }, 'Series')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9933 self.assertEqual(0, len(Execute([ 'a' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9934 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9935 }, 'Series')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9936 self.assertEqual(1, len(Execute([ 'b' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9937 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9938 }, 'Series')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9939 self.assertEqual(1, len(Execute([ 'b' ], 'All', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9940 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9941 }, 'Series')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9942
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9943 # tests at study levels (make sure to test only with study levels and with multiple levels)
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9944 DoPut(_REMOTE, '/studies/%s/labels/b' % studyId)
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9945 self.assertEqual(1, len(Execute([ 'a' ], 'None', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9946 'StudyInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9947 }, 'Study')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9948 self.assertEqual(0, len(Execute([ 'a' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9949 'StudyInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9950 }, 'Study')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9951 self.assertEqual(1, len(Execute([ 'b' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9952 'StudyInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9953 }, 'Study')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9954 self.assertEqual(1, len(Execute([ 'b' ], 'All', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9955 'StudyInstanceUID' : '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9956 }, 'Study')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9957 self.assertEqual(1, len(Execute([ 'a' ], 'None', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9958 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9959 }, 'Study')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9960 self.assertEqual(0, len(Execute([ 'a' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9961 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9962 }, 'Study')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9963 self.assertEqual(1, len(Execute([ 'b' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9964 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9965 }, 'Study')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9966 self.assertEqual(1, len(Execute([ 'b' ], 'All', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9967 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9968 }, 'Study')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9969
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9970 # tests at patient levels
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9971 DoPut(_REMOTE, '/patients/%s/labels/b' % patientId)
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9972 self.assertEqual(1, len(Execute([ 'a' ], 'None', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9973 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9974 }, 'Patient')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9975 self.assertEqual(0, len(Execute([ 'a' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9976 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9977 }, 'Patient')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9978 self.assertEqual(1, len(Execute([ 'b' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9979 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9980 }, 'Patient')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9981 self.assertEqual(1, len(Execute([ 'b' ], 'All', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9982 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9983 }, 'Patient')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9984
518 43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9985 else:
43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9986 print("Your database backend doesn't support labels")
527 86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9987
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9988
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9989 def test_numeric_metadata(self):
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9990 if IsOrthancVersionAbove(_REMOTE, 1, 12, 0):
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9991 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9992 study = DoGet(_REMOTE, '/instances/%s/study' % instance)['ID']
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9993
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9994 m = DoGet(_REMOTE, '/studies/%s/metadata' % study)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9995 self.assertEqual(2, len(m))
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9996 self.assertTrue('LastUpdate' in m)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9997 self.assertTrue('MainDicomTagsSignature' in m)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9998 lastUpdate = DoGet(_REMOTE, '/studies/%s/metadata/%s' % (study, 'LastUpdate'))
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9999 signature = DoGet(_REMOTE, '/studies/%s/metadata/%s' % (study, 'MainDicomTagsSignature'))
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10000
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10001 m = DoGet(_REMOTE, '/studies/%s/metadata?numeric' % study)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10002 self.assertEqual(2, len(m))
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10003 self.assertTrue(7 in m) # MetadataType_LastUpdate
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10004 self.assertTrue(15 in m) # MetadataType_MainDicomTagsSignature
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10005 self.assertEqual(lastUpdate, DoGet(_REMOTE, '/studies/%s/metadata/%d' % (study, 7)))
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10006 self.assertEqual(signature, DoGet(_REMOTE, '/studies/%s/metadata/%d' % (study, 15)))
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10007
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10008 m = DoGet(_REMOTE, '/studies/%s/metadata?expand' % study)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10009 self.assertEqual(2, len(m))
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10010 self.assertTrue('LastUpdate' in m)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10011 self.assertTrue('MainDicomTagsSignature' in m)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10012 self.assertEqual(lastUpdate, m['LastUpdate'])
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10013 self.assertEqual(signature, m['MainDicomTagsSignature'])
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10014
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10015 m = DoGet(_REMOTE, '/studies/%s/metadata?expand&numeric' % study)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10016 self.assertEqual(2, len(m))
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10017 self.assertTrue('7' in m)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10018 self.assertTrue('15' in m)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10019 self.assertEqual(lastUpdate, m['7'])
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	10020 self.assertEqual(signature, m['15'])
535 31f70bfd86a7 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 533 diff changeset	10021
584 c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10022 def test_expand(self):
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10023 # test new expand options introduced in 1.12.2
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10024 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2):
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10025 r = UploadInstance(_REMOTE, 'DummyCT.dcm')
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10026 instanceId = r['ID']
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10027 seriesId = r['ParentSeries']
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10028 studyId = r['ParentStudy']
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10029
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10030 self.assertEqual(DoGet(_REMOTE, '/instances?expand'), DoGet(_REMOTE, '/instances?expand=true'))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10031 self.assertEqual(DoGet(_REMOTE, '/instances'), DoGet(_REMOTE, '/instances?expand=false'))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10032
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10033 self.assertEqual(DoGet(_REMOTE, '/series?expand'), DoGet(_REMOTE, '/series?expand=true'))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10034 self.assertEqual(DoGet(_REMOTE, '/series'), DoGet(_REMOTE, '/series?expand=false'))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10035
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10036 self.assertEqual(DoGet(_REMOTE, '/studies?expand'), DoGet(_REMOTE, '/studies?expand=true'))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10037 self.assertEqual(DoGet(_REMOTE, '/studies'), DoGet(_REMOTE, '/studies?expand=false'))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10038
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10039 r = DoGet(_REMOTE, '/studies/%s/instances?expand=true' % studyId)
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10040 self.assertEqual(1, len(r))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10041 self.assertIn('MainDicomTags', r[0])
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10042
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10043 r = DoGet(_REMOTE, '/studies/%s/instances?expand=false' % studyId)
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10044 self.assertEqual(1, len(r))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10045 self.assertIn('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', r[0])
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10046
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10047 self.assertEqual(DoGet(_REMOTE, '/studies/%s/instances?expand' % studyId), DoGet(_REMOTE, '/studies/%s/instances?expand=true' % studyId))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10048 self.assertEqual(DoGet(_REMOTE, '/studies/%s/instances' % studyId), DoGet(_REMOTE, '/studies/%s/instances?expand=true' % studyId))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10049
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10050 r = DoGet(_REMOTE, '/studies/%s/series?expand=true' % studyId)
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10051 self.assertEqual(1, len(r))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10052 self.assertIn('MainDicomTags', r[0])
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10053
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10054 r = DoGet(_REMOTE, '/studies/%s/series?expand=false' % studyId)
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10055 self.assertEqual(1, len(r))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10056 self.assertIn('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', r[0])
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10057
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10058 self.assertEqual(DoGet(_REMOTE, '/studies/%s/series?expand' % studyId), DoGet(_REMOTE, '/studies/%s/series?expand=true' % studyId))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10059 self.assertEqual(DoGet(_REMOTE, '/studies/%s/series' % studyId), DoGet(_REMOTE, '/studies/%s/series?expand=true' % studyId))
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10060
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10061
c4f4b0bc908b new tests for new expand GET arguments Alain Mazy <am@osimis.io> parents: 583 diff changeset	10062
535 31f70bfd86a7 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 533 diff changeset	10063 def test_add_attachment_to_non_existing_resource(self):
31f70bfd86a7 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 533 diff changeset	10064 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1): # till 1.12.0, it returned a 200
31f70bfd86a7 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 533 diff changeset	10065 (headers, body) = DoPutRaw(_REMOTE, '/instances/11111111-11111111-11111111-11111111-11111111/attachments/1025', 'hello')
31f70bfd86a7 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 533 diff changeset	10066 self.assertEqual('404', headers['status'])
538 7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10067
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10068 def test_delete_updates_parents_last_update_metadata(self):
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10069 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10070 i = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10071 j = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0002.dcm')
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10072
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10073 #instanceLastUpdate1 = DoGet(_REMOTE, '/instances/%s/metadata/LastUpdate' % i['ID'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10074 seriesLastUpdate1 = DoGet(_REMOTE, '/series/%s/metadata/LastUpdate' % i['ParentSeries'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10075 studyLastUpdate1 = DoGet(_REMOTE, '/studies/%s/metadata/LastUpdate' % i['ParentStudy'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10076 patientLastUpdate1 = DoGet(_REMOTE, '/patients/%s/metadata/LastUpdate' % i['ParentPatient'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10077
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10078 time.sleep(1.01)
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10079 DoDelete(_REMOTE, '/instances/%s' % j['ID'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10080
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10081 #instanceLastUpdate2 = DoGet(_REMOTE, '/instances/%s/metadata/LastUpdate' % i['ID'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10082 seriesLastUpdate2 = DoGet(_REMOTE, '/series/%s/metadata/LastUpdate' % i['ParentSeries'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10083 studyLastUpdate2 = DoGet(_REMOTE, '/studies/%s/metadata/LastUpdate' % i['ParentStudy'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10084 patientLastUpdate2 = DoGet(_REMOTE, '/patients/%s/metadata/LastUpdate' % i['ParentPatient'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10085
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10086 #self.assertEqual(instanceLastUpdate1, instanceLastUpdate2)
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10087 self.assertNotEqual(seriesLastUpdate1, seriesLastUpdate2)
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10088 self.assertNotEqual(studyLastUpdate1, studyLastUpdate2)
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10089 self.assertNotEqual(patientLastUpdate1, patientLastUpdate2)
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	10090
554 ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10091 def test_pixel_data_vr(self):
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10092 def Check(path, hasPixelData, hasMetadata, expectedVR):
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10093 i = UploadInstance(_REMOTE, path) ['ID']
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10094 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i)
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10095 if hasMetadata:
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10096 self.assertTrue('PixelDataVR' in m)
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10097 self.assertEqual(expectedVR, m['PixelDataVR'])
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10098 else:
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10099 self.assertFalse('PixelDataVR' in m)
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10100
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10101 if hasPixelData:
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10102 self.assertTrue('PixelDataOffset' in m)
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10103 j = DoGet(_REMOTE, '/instances/%s/file?expand' % i, headers = {
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10104 'Accept': 'application/dicom+json'
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10105 })
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10106 self.assertEqual(expectedVR, j['7FE00010']['vr'])
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10107
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10108 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10109 # File without pixel data
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10110 Check('MarekLatin2.dcm', False, False, None)
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10111
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10112 # Those files are badly formatted, and should be 'OB'
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10113 # according to the DICOM standard => medata is present
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10114 Check('Issue143.dcm', True, True, 'OW') # Little Endian Explicit, 8bpp
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10115 Check('KarstenHilbertRF.dcm', True, True, 'OW') # Little Endian Explicit, 8bpp
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10116 Check('PilatesArgenturGEUltrasoundOsiriX.dcm', True, True, 'OW') # Little Endian Explicit, 8bpp
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10117
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10118 # Those files are formatted as expected
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10119 Check('ColorTestMalaterre.dcm', True, False, 'OW') # Implicit Little Endian, 8bpp
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10120 Check('Issue94.dcm', True, False, 'OW') # Implicit Little Endian, 16bpp
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10121 Check('TransferSyntaxes/1.2.840.10008.1.2.1.dcm', True, False, 'OB') # Explicit Little Endian, 8bpp
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10122 Check('Phenix/IM-0001-0001.dcm', True, False, 'OW') # Explicit Little Endian, 16bpp
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10123 Check('TransferSyntaxes/1.2.840.10008.1.2.2.dcm', True, False, 'OB') # Explicit Big Endian, 8bpp
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10124 Check('TransferSyntaxes/1.2.840.10008.1.2.4.50.dcm', True, False, 'OB') # JPEG
ede184638961 added test_pixel_data_vr Sebastien Jodogne <s.jodogne@gmail.com> parents: 548 diff changeset	10125 Check('Knee/T1/IM-0001-0001.dcm', True, False, 'OB') # JPEG2k
565 855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10126
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10127 def test_encapsulate_stl(self):
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10128 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10129 stl = b'Hello, world'
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10130
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10131 i = DoPost(_REMOTE, '/tools/create-dicom', json.dumps({
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10132 'Content' : 'data:model/stl;base64,%s' % base64.b64encode(stl).decode(),
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10133 'Force' : True,
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10134 'Tags' : {
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10135 'PatientName' : 'Jodogne'
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10136 }
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10137 })) ['ID']
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10138
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10139 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10140 self.assertEqual('Jodogne', tags['PatientName'])
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10141 self.assertEqual('M3D', tags['Modality'])
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10142 self.assertEqual('model/stl', tags['MIMETypeOfEncapsulatedDocument'])
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10143 self.assertEqual('1.2.840.10008.5.1.4.1.1.104.3', tags['SOPClassUID'])
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10144
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10145 i = DoPost(_REMOTE, '/tools/create-dicom', json.dumps({
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10146 'Content' : 'data:model/mtl;base64,%s' % base64.b64encode(stl).decode(),
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10147 'Tags' : {}
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10148 })) ['ID']
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10149
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10150 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10151 self.assertFalse('PatientName' in tags)
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10152 self.assertEqual('M3D', tags['Modality'])
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10153 self.assertEqual('model/mtl', tags['MIMETypeOfEncapsulatedDocument'])
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10154 self.assertEqual('1.2.840.10008.5.1.4.1.1.104.5', tags['SOPClassUID'])
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10155
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10156 i = DoPost(_REMOTE, '/tools/create-dicom', json.dumps({
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10157 'Content' : 'data:model/obj;base64,%s' % base64.b64encode(stl).decode(),
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10158 'Tags' : {}
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10159 })) ['ID']
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10160
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10161 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10162 self.assertFalse('PatientName' in tags)
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10163 self.assertEqual('M3D', tags['Modality'])
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10164 self.assertEqual('model/obj', tags['MIMETypeOfEncapsulatedDocument'])
855c3720902a added test_encapsulate_stl Sebastien Jodogne <s.jodogne@gmail.com> parents: 557 diff changeset	10165 self.assertEqual('1.2.840.10008.5.1.4.1.1.104.4', tags['SOPClassUID'])
591 3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10166
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10167
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10168 def test_error_codes_content_type(self):
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10169
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10170 # from 1.12.2, check that a ContentType header is included in errors with an error description (ex: 404)
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10171 (headers, body) = DoGetRaw(_REMOTE, '/rnm94%3Cscript%3Ealert(1)%3C/script%3Ejdtkc/explorer.html')
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10172 self.assertEqual('404', headers['status'])
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10173
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10174 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2):
595 b6c1f0c9ca15 fix test_error_codes_content_type Sebastien Jodogne <s.jodogne@gmail.com> parents: 591 diff changeset	10175 self.assertEqual('text/plain', headers['content-type'])
591 3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10176
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10177 (headers, body) = DoPutRaw(_REMOTE, '/system', 'hello')
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10178 self.assertEqual('405', headers['status'])
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10179 # when there is no body, there is no content-type
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10180 self.assertNotIn('content-type', headers)
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10181
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10182 # responses with bodies contain x-content-type-options
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10183 if IsOrthancVersionAbove(_REMOTE, 1, 12, 2):
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10184 (headers, body) = DoGetRaw(_REMOTE, '/system')
3cb7c6162c77 new test for XSS Alain Mazy <am@osimis.io> parents: 589 diff changeset	10185 self.assertIn('nosniff', headers['x-content-type-options'])
603 75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10186
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10187 def test_modify_with_labels(self):
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10188
606 0700fe8e2b78 skip test Alain Mazy <am@osimis.io> parents: 605 diff changeset	10189 if DoGet(_REMOTE, '/system')['ApiVersion'] < 23 or not DoGet(_REMOTE, '/system')['HasLabels']:
0700fe8e2b78 skip test Alain Mazy <am@osimis.io> parents: 605 diff changeset	10190 return
0700fe8e2b78 skip test Alain Mazy <am@osimis.io> parents: 605 diff changeset	10191
603 75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10192 def UploadAndLabel(testId):
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10193 DropOrthanc(_REMOTE)
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10194
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10195 u = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10196 studyId = u["ParentStudy"]
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10197 seriesId = u["ParentSeries"]
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10198 patientId = u["ParentPatient"]
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10199 instanceId = u["ID"]
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10200
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10201 if testId == 2: # multi instance study
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10202 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10203 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10204 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm')
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10205
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10206 # add a label to the study before modification
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10207 DoPut(_REMOTE, '/patients/%s/labels/label-patient' % patientId)
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10208 DoPut(_REMOTE, '/studies/%s/labels/label-study' % studyId)
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10209 DoPut(_REMOTE, '/series/%s/labels/label-series' % seriesId)
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10210 DoPut(_REMOTE, '/instances/%s/labels/label-instance' % instanceId)
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10211
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10212 originalPatient = DoGet(_REMOTE, '/patients/%s' % patientId)
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10213 self.assertEqual(1, len(originalPatient["Labels"]))
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10214 self.assertIn('label-patient', originalPatient["Labels"])
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10215
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10216 originalStudy = DoGet(_REMOTE, '/studies/%s' % studyId)
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10217 self.assertEqual(1, len(originalStudy["Labels"]))
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10218 self.assertIn('label-study', originalStudy["Labels"])
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10219
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10220 originalSeries = DoGet(_REMOTE, '/series/%s' % seriesId)
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10221 self.assertEqual(1, len(originalSeries["Labels"]))
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10222 self.assertIn('label-series', originalSeries["Labels"])
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10223
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10224 originalInstance = DoGet(_REMOTE, '/instances/%s' % instanceId)
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10225 self.assertEqual(1, len(originalInstance["Labels"]))
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10226 self.assertIn('label-instance', originalInstance["Labels"])
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10227
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10228 return originalPatient, originalStudy, originalSeries, originalInstance
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10229
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10230
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10231 for testId in range(1, 2): #test with a single instance study and a multi instance study
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10232
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10233 originalPatient, originalStudy, originalSeries, originalInstance = UploadAndLabel(testId)
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10234
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10235 # modify a study in place with no label field in the payload (default behavior before 1.12.3)
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10236 DoPost(_REMOTE, '/studies/%s/modify' % originalStudy['ID'], {
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10237 'Keep' : ['StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID'],
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10238 'Replace' : {
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10239 'PatientName': 'modified'
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10240 },
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10241 'Force': True
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10242 })
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10243
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10244 # with no options, all resources lose their labels during the modification
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10245 modifiedStudy = DoGet(_REMOTE, '/studies/%s' % originalStudy['ID'])
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10246 self.assertEqual(0, len(modifiedStudy["Labels"]))
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10247 self.assertEqual('modified', modifiedStudy["PatientMainDicomTags"]["PatientName"])
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10248
605 76e5f75249ca fix Alain Mazy <am@osimis.io> parents: 604 diff changeset	10249 if IsOrthancVersionAbove(_REMOTE, 1, 12, 3) and DoGet(_REMOTE, '/system')['ApiVersion'] >= 23 and DoGet(_REMOTE, '/system')['HasLabels']:
603 75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10250 for testId in range(1, 2): #test with a single instance study and a multi instance study
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10251
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10252 originalPatient, originalStudy, originalSeries, originalInstance = UploadAndLabel(testId)
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10253
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10254 # modify a study in place with no label field in the payload (default behavior before 1.12.3)
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10255 DoPost(_REMOTE, '/studies/%s/modify' % originalStudy['ID'], {
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10256 'Keep' : ['StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID'],
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10257 'Replace' : {
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10258 'PatientName': 'modified2'
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10259 },
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10260 'Force': True,
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10261 'KeepLabels': True
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10262 })
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10263
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10264 # now, each resource level shall have kept its labels
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10265
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10266 modifiedInstance = DoGet(_REMOTE, '/instances/%s' % originalInstance['ID'])
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10267 self.assertEqual(1, len(modifiedInstance["Labels"]))
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10268 self.assertIn('label-instance', modifiedInstance["Labels"])
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10269
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10270 modifiedSeries = DoGet(_REMOTE, '/series/%s' % originalSeries['ID'])
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10271 self.assertEqual(1, len(modifiedSeries["Labels"]))
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10272 self.assertIn('label-series', modifiedSeries["Labels"])
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10273
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10274 modifiedStudy = DoGet(_REMOTE, '/studies/%s' % originalStudy['ID'])
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10275 self.assertEqual(1, len(modifiedStudy["Labels"]))
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10276 self.assertIn('label-study', modifiedStudy["Labels"])
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10277 self.assertEqual('modified2', modifiedStudy["PatientMainDicomTags"]["PatientName"])
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10278
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10279 modifiedPatient = DoGet(_REMOTE, '/patients/%s' % originalPatient['ID'])
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10280 self.assertEqual(1, len(modifiedPatient["Labels"]))
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10281 self.assertIn('label-patient', modifiedPatient["Labels"])
75244cf58a6d new test for KeepLabels Alain Mazy <am@osimis.io> parents: 595 diff changeset	10282
626 9c295b8dac00 C-find group length Alain Mazy <am@osimis.io> parents: 606 diff changeset	10283 def test_findscu_group_length(self):
9c295b8dac00 C-find group length Alain Mazy <am@osimis.io> parents: 606 diff changeset	10284 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm')
9c295b8dac00 C-find group length Alain Mazy <am@osimis.io> parents: 606 diff changeset	10285 UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0001.dcm')
9c295b8dac00 C-find group length Alain Mazy <am@osimis.io> parents: 606 diff changeset	10286 UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0002.dcm')
9c295b8dac00 C-find group length Alain Mazy <am@osimis.io> parents: 606 diff changeset	10287
9c295b8dac00 C-find group length Alain Mazy <am@osimis.io> parents: 606 diff changeset	10288 i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', '0008,0000=22' ]) # GE like C-Find that includes group-length
9c295b8dac00 C-find group length Alain Mazy <am@osimis.io> parents: 606 diff changeset	10289 # print(i)
9c295b8dac00 C-find group length Alain Mazy <am@osimis.io> parents: 606 diff changeset	10290 s = re.findall('$0008,0000$.?\[(.?)\]', i)
9c295b8dac00 C-find group length Alain Mazy <am@osimis.io> parents: 606 diff changeset	10291 self.assertEqual(0, len(s))
646 0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10292
652 dfd42a6c13fa added test_tags_after_pixel_data Sebastien Jodogne <s.jodogne@gmail.com> parents: 649 diff changeset	10293
dfd42a6c13fa added test_tags_after_pixel_data Sebastien Jodogne <s.jodogne@gmail.com> parents: 649 diff changeset	10294 def test_tags_after_pixel_data(self):
653 fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10295 if IsOrthancVersionAbove(_REMOTE, 1, 12, 4):
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10296 # https://discourse.orthanc-server.org/t/private-tags-with-group-7fe0-are-not-provided-via-rest-api/4744
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10297 u = UploadInstance(_REMOTE, '2024-05-30-GuillemVela.dcm') ['ID']
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10298
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10299 a = DoGet(_REMOTE, '/instances/%s/tags' % u)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10300 self.assertFalse('8e05,1000' in a)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10301
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10302 a = DoGet(_REMOTE, '/instances/%s/tags?whole' % u)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10303 self.assertTrue('8e05,1000' in a)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10304 self.assertEqual('XEOS_Attributes', a['8e05,0010']['Value'])
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10305 self.assertEqual('acquisition', a['8e05,1000']['Value'])
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10306 self.assertEqual('specimen', a['8e05,1001']['Value'])
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10307
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10308 a = DoGet(_REMOTE, '/instances/%s/tags?full' % u)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10309 self.assertFalse('8e05,1000' in a)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10310
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10311 a = DoGet(_REMOTE, '/instances/%s/tags?full&whole' % u)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10312 self.assertTrue('8e05,1000' in a)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10313 self.assertEqual('XEOS_Attributes', a['8e05,0010']['Value'])
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10314 self.assertEqual('acquisition', a['8e05,1000']['Value'])
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10315 self.assertEqual('specimen', a['8e05,1001']['Value'])
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10316
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10317 a = DoGet(_REMOTE, '/instances/%s/tags?short' % u)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10318 self.assertFalse('8e05,1000' in a)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10319
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10320 a = DoGet(_REMOTE, '/instances/%s/tags?short&whole' % u)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10321 self.assertTrue('8e05,1000' in a)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10322 self.assertEqual('XEOS_Attributes', a['8e05,0010'])
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10323 self.assertEqual('acquisition', a['8e05,1000'])
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10324 self.assertEqual('specimen', a['8e05,1001'])
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10325
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10326 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % u)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10327 self.assertFalse('Unknown Tag & Data' in a)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10328
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10329 a = DoGet(_REMOTE, '/instances/%s/tags?simplify&whole' % u)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10330 self.assertTrue('Unknown Tag & Data' in a)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10331
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10332 a = DoGet(_REMOTE, '/instances/%s/simplified-tags' % u)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10333 self.assertFalse('Unknown Tag & Data' in a)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10334
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10335 a = DoGet(_REMOTE, '/instances/%s/simplified-tags?whole' % u)
fdd90df1e8ff fix test version Alain Mazy <am@orthanc.team> parents: 652 diff changeset	10336 self.assertTrue('Unknown Tag & Data' in a)
652 dfd42a6c13fa added test_tags_after_pixel_data Sebastien Jodogne <s.jodogne@gmail.com> parents: 649 diff changeset	10337
dfd42a6c13fa added test_tags_after_pixel_data Sebastien Jodogne <s.jodogne@gmail.com> parents: 649 diff changeset	10338
646 0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10339 def test_requested_tags(self):
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10340 u = UploadInstance(_REMOTE, 'DummyCT.dcm')
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10341
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10342 def CheckPatientContent(patient):
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10343 self.assertEqual(u['ParentPatient'], patient['ID'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10344 self.assertEqual('Patient', patient['Type'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10345 self.assertFalse(patient['IsStable'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10346 self.assertEqual(0, len(patient['Labels']))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10347 self.assertTrue('LastUpdate' in patient)
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10348 self.assertEqual(2, len(patient['MainDicomTags']))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10349 self.assertEqual('ozp00SjY2xG', patient['MainDicomTags']['PatientID'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10350 self.assertEqual('KNIX', patient['MainDicomTags']['PatientName'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10351 self.assertEqual(1, len(patient['Studies']))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10352 self.assertEqual(u['ParentStudy'], patient['Studies'][0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10353
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10354 def CheckStudyContent(study):
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10355 self.assertEqual(u['ParentStudy'], study['ID'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10356 self.assertEqual(u['ParentPatient'], study['ParentPatient'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10357 self.assertEqual('Study', study['Type'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10358 self.assertFalse(study['IsStable'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10359 self.assertEqual(0, len(study['Labels']))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10360 self.assertTrue('LastUpdate' in study)
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10361 self.assertEqual(7, len(study['MainDicomTags']))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10362 self.assertEqual('0ECJ52puWpVIjTuhnBA0um', study['MainDicomTags']['InstitutionName'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10363 self.assertEqual('1', study['MainDicomTags']['ReferringPhysicianName'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10364 self.assertEqual('20070101', study['MainDicomTags']['StudyDate'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10365 self.assertEqual('Knee (R)', study['MainDicomTags']['StudyDescription'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10366 self.assertEqual('1', study['MainDicomTags']['StudyID'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10367 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390', study['MainDicomTags']['StudyInstanceUID'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10368 self.assertEqual('120000.000000', study['MainDicomTags']['StudyTime'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10369 self.assertEqual(2, len(study['PatientMainDicomTags']))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10370 self.assertEqual('ozp00SjY2xG', study['PatientMainDicomTags']['PatientID'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10371 self.assertEqual('KNIX', study['PatientMainDicomTags']['PatientName'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10372 self.assertEqual(1, len(study['Series']))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10373 self.assertEqual(u['ParentSeries'], study['Series'][0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10374
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10375 def CheckSeriesContent(series):
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10376 self.assertEqual(None, series['ExpectedNumberOfInstances'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10377 self.assertEqual('Unknown', series['Status'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10378 self.assertEqual(u['ParentSeries'], series['ID'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10379 self.assertEqual(u['ParentStudy'], series['ParentStudy'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10380 self.assertEqual('Series', series['Type'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10381 self.assertFalse(series['IsStable'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10382 self.assertEqual(0, len(series['Labels']))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10383 self.assertTrue('LastUpdate' in series)
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10384 self.assertEqual(13, len(series['MainDicomTags']))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10385 self.assertEqual('0', series['MainDicomTags']['CardiacNumberOfImages'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10386 self.assertEqual('0.999841\\0.000366209\\0.0178227\\-0.000427244\\0.999995\\0.00326545', series['MainDicomTags']['ImageOrientationPatient'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10387 self.assertEqual('24', series['MainDicomTags']['ImagesInAcquisition'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10388 self.assertEqual('GE MEDICAL SYSTEMS', series['MainDicomTags']['Manufacturer'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10389 self.assertEqual('MR', series['MainDicomTags']['Modality'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10390 self.assertEqual('ca', series['MainDicomTags']['OperatorsName'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10391 self.assertEqual('324-58-2995/6', series['MainDicomTags']['ProtocolName'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10392 self.assertEqual('20070101', series['MainDicomTags']['SeriesDate'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10393 self.assertEqual('AX. FSE PD', series['MainDicomTags']['SeriesDescription'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10394 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394', series['MainDicomTags']['SeriesInstanceUID'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10395 self.assertEqual('5', series['MainDicomTags']['SeriesNumber'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10396 self.assertEqual('120000.000000', series['MainDicomTags']['SeriesTime'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10397 self.assertEqual('TWINOW', series['MainDicomTags']['StationName'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10398 self.assertEqual(1, len(series['Instances']))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10399 self.assertEqual(u['ID'], series['Instances'][0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10400
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10401 def CheckInstanceContent(instance):
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10402 self.assertEqual(2472, instance['FileSize'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10403 self.assertTrue('FileUuid' in instance)
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10404 self.assertEqual(u['ID'], instance['ID'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10405 self.assertEqual(u['ParentSeries'], instance['ParentSeries'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10406 self.assertEqual('Instance', instance['Type'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10407 self.assertEqual(1, instance['IndexInSeries'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10408 self.assertEqual(0, len(instance['Labels']))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10409 self.assertEqual(7, len(instance['MainDicomTags']))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10410 self.assertEqual('1', instance['MainDicomTags']['AcquisitionNumber'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10411 self.assertEqual('0.999841\\0.000366209\\0.0178227\\-0.000427244\\0.999995\\0.00326545', instance['MainDicomTags']['ImageOrientationPatient'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10412 self.assertEqual('-149.033\\-118.499\\-61.0464', instance['MainDicomTags']['ImagePositionPatient'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10413 self.assertEqual('20070101', instance['MainDicomTags']['InstanceCreationDate'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10414 self.assertEqual('120000.000000', instance['MainDicomTags']['InstanceCreationTime'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10415 self.assertEqual('1', instance['MainDicomTags']['InstanceNumber'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10416 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109', instance['MainDicomTags']['SOPInstanceUID'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10417
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10418 def CheckRequestedTags(resource):
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10419 self.assertEqual(6, len(resource['RequestedTags']))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10420 self.assertEqual('ozp00SjY2xG', resource['RequestedTags']['PatientID'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10421 self.assertEqual('Knee (R)', resource['RequestedTags']['StudyDescription'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10422 self.assertEqual('AX. FSE PD', resource['RequestedTags']['SeriesDescription'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10423 self.assertEqual('1.2.840.10008.5.1.4.1.1.4', resource['RequestedTags']['SOPClassUID'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10424 self.assertEqual('2800', resource['RequestedTags']['RepetitionTime'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10425 self.assertEqual(3, len(resource['RequestedTags']['DerivationCodeSequence'][0]))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10426 self.assertEqual('121327', resource['RequestedTags']['DerivationCodeSequence'][0]['CodeValue'])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10427
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10428 requestedTags = 'PatientID;StudyDescription;SeriesDescription;SOPClassUID;RepetitionTime;DerivationCodeSequence'
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10429
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10430 a = DoGet(_REMOTE, '/patients?expand')
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10431 self.assertEqual(1, len(a))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10432 self.assertEqual(7, len(a[0]))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10433 CheckPatientContent(a[0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10434 self.assertFalse('RequestedTags' in a[0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10435
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10436 a = DoGet(_REMOTE, '/patients?expand&requestedTags=%s' % requestedTags)
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10437 self.assertEqual(1, len(a))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10438 self.assertEqual(8, len(a[0]))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10439 CheckPatientContent(a[0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10440 CheckRequestedTags(a[0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10441
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10442 a = DoGet(_REMOTE, '/studies?expand')
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10443 self.assertEqual(1, len(a))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10444 self.assertEqual(9, len(a[0]))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10445 CheckStudyContent(a[0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10446 self.assertFalse('RequestedTags' in a[0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10447
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10448 a = DoGet(_REMOTE, '/studies?expand&requestedTags=%s' % requestedTags)
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10449 self.assertEqual(1, len(a))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10450 self.assertEqual(10, len(a[0]))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10451 CheckStudyContent(a[0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10452 CheckRequestedTags(a[0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10453
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10454 a = DoGet(_REMOTE, '/series?expand')
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10455 self.assertEqual(1, len(a))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10456 self.assertEqual(10, len(a[0]))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10457 CheckSeriesContent(a[0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10458 self.assertFalse('RequestedTags' in a[0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10459
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10460 a = DoGet(_REMOTE, '/series?expand&requestedTags=%s' % requestedTags)
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10461 self.assertEqual(1, len(a))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10462 self.assertEqual(11, len(a[0]))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10463 CheckSeriesContent(a[0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10464 CheckRequestedTags(a[0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10465
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10466 a = DoGet(_REMOTE, '/instances?expand')
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10467 self.assertEqual(1, len(a))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10468 self.assertEqual(8, len(a[0]))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10469 CheckInstanceContent(a[0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10470 self.assertFalse('RequestedTags' in a[0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10471
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10472 a = DoGet(_REMOTE, '/instances?expand&requestedTags=%s' % requestedTags)
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10473 self.assertEqual(1, len(a))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10474 self.assertEqual(9, len(a[0]))
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10475 CheckInstanceContent(a[0])
0daf680aa3cc added test_requested_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 640 diff changeset	10476 CheckRequestedTags(a[0])
647 5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10477
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10478 a = DoGet(_REMOTE, '/patients/%s' % u['ParentPatient'])
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10479 self.assertEqual(7, len(a))
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10480 CheckPatientContent(a)
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10481 self.assertFalse('RequestedTags' in a)
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10482
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10483 a = DoGet(_REMOTE, '/patients/%s?requestedTags=%s' % (u['ParentPatient'], requestedTags))
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10484 self.assertEqual(8, len(a))
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10485 CheckPatientContent(a)
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10486 CheckRequestedTags(a)
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10487
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10488 a = DoGet(_REMOTE, '/studies/%s' % u['ParentStudy'])
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10489 self.assertEqual(9, len(a))
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10490 CheckStudyContent(a)
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10491 self.assertFalse('RequestedTags' in a)
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10492
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10493 a = DoGet(_REMOTE, '/studies/%s?requestedTags=%s' % (u['ParentStudy'], requestedTags))
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10494 self.assertEqual(10, len(a))
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10495 CheckStudyContent(a)
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10496 CheckRequestedTags(a)
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10497
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10498 a = DoGet(_REMOTE, '/series/%s' % u['ParentSeries'])
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10499 self.assertEqual(10, len(a))
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10500 CheckSeriesContent(a)
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10501 self.assertFalse('RequestedTags' in a)
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10502
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10503 a = DoGet(_REMOTE, '/series/%s?requestedTags=%s' % (u['ParentSeries'], requestedTags))
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10504 self.assertEqual(11, len(a))
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10505 CheckSeriesContent(a)
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10506 CheckRequestedTags(a)
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10507
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10508 a = DoGet(_REMOTE, '/instances/%s' % u['ID'])
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10509 self.assertEqual(8, len(a))
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10510 CheckInstanceContent(a)
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10511 self.assertFalse('RequestedTags' in a)
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10512
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10513 a = DoGet(_REMOTE, '/instances/%s?requestedTags=%s' % (u['ID'], requestedTags))
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10514 self.assertEqual(9, len(a))
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10515 CheckInstanceContent(a)
5ee7be1be006 test expansion of single resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	10516 CheckRequestedTags(a)
661 763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10517
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10518
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10519 def test_computed_tags(self):
662 b31aa560210d note Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	10520 # curl 'http://alice:orthanctest@localhost:8042/patients/0946fcb6-cf12ab43-bad958c1-bf057ad5-0fc6f54c?requested-tags=0020,1200;0020,1202;0020,1204'
b31aa560210d note Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	10521 # curl 'http://alice:orthanctest@localhost:8042/studies/6c65289b-db2fcb71-7eaf73f4-8e12470c-a4d6d7cf?requested-tags=0008,0061;0008,0062;0020,1206;0020,1208'
b31aa560210d note Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	10522 # curl 'http://alice:orthanctest@localhost:8042/series/318603c5-03e8cffc-a82b6ee1-3ccd3c1e-18d7e3bb?requested-tags=0020,1209'
b31aa560210d note Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	10523 # curl 'http://alice:orthanctest@localhost:8042/instances/ee693caa-9786a685-4f0f9fb0-4411cc8b-988f5574?requested-tags=0008,0056'
b31aa560210d note Sebastien Jodogne <s.jodogne@gmail.com> parents: 661 diff changeset	10524
661 763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10525 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm')
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10526 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0002.dcm')
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10527 UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0001.dcm')
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10528 UploadInstance(_REMOTE, 'Comunix/Pet/IM-0001-0002.dcm')
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10529
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10530 instance = 'ee693caa-9786a685-4f0f9fb0-4411cc8b-988f5574'
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10531 series = '318603c5-03e8cffc-a82b6ee1-3ccd3c1e-18d7e3bb'
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10532 study = '6c65289b-db2fcb71-7eaf73f4-8e12470c-a4d6d7cf'
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10533 patient = '0946fcb6-cf12ab43-bad958c1-bf057ad5-0fc6f54c'
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10534
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10535 a = DoGet(_REMOTE, '/instances/%s?requested-tags=0008,0056' % instance)
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10536 self.assertEqual(1, len(a['RequestedTags']))
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10537 self.assertEqual('ONLINE', a['RequestedTags']['InstanceAvailability'])
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10538
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10539 a = DoGet(_REMOTE, '/series/%s?requested-tags=0020,1209' % series)
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10540 self.assertEqual(1, len(a['RequestedTags']))
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10541 self.assertEqual(2, int(a['RequestedTags']['NumberOfSeriesRelatedInstances']))
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10542
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10543 a = DoGet(_REMOTE, '/studies/%s?requested-tags=0008,0061;0008,0062;0020,1206;0020,1208' % study)
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10544 self.assertEqual(4, len(a['RequestedTags']))
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10545 self.assertEqual('CT\\PT', a['RequestedTags']['ModalitiesInStudy'])
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10546 self.assertEqual('1.2.840.10008.5.1.4.1.1.128\\1.2.840.10008.5.1.4.1.1.2', a['RequestedTags']['SOPClassesInStudy'])
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10547 self.assertEqual(2, int(a['RequestedTags']['NumberOfStudyRelatedSeries']))
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10548 self.assertEqual(4, int(a['RequestedTags']['NumberOfStudyRelatedInstances']))
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10549
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10550 a = DoGet(_REMOTE, '/patients/%s?requested-tags=0020,1200;0020,1202;0020,1204' % patient)
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10551 self.assertEqual(3, len(a['RequestedTags']))
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10552 self.assertEqual(1, int(a['RequestedTags']['NumberOfPatientRelatedStudies']))
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10553 self.assertEqual(2, int(a['RequestedTags']['NumberOfPatientRelatedSeries']))
763e2ccbd0df added test_computed_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 653 diff changeset	10554 self.assertEqual(4, int(a['RequestedTags']['NumberOfPatientRelatedInstances']))
663 7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10555
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10556 def test_computed_tags_and_patient_comments(self):
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10557 UploadInstance(_REMOTE, 'WithEmptyPatientComments.dcm')
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10558
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10559 # without requesting PatientComments, we get the computed tags
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10560 i = CallFindScu([ '-k', 'PatientID=WITH_COMMENTS', '-k', 'QueryRetrieveLevel=Study', '-k', 'ModalitiesInStudy', '-k', 'NumberOfStudyRelatedSeries', '-k', 'NumberOfStudyRelatedInstances' ])
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10561 modalitiesInStudy = re.findall('$0008,0061$.?\[(.?)\]', i)
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10562 self.assertEqual(1, len(modalitiesInStudy))
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10563 self.assertEqual('CT', modalitiesInStudy[0])
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10564
664 854640df43d3 fix version Alain Mazy <am@orthanc.team> parents: 663 diff changeset	10565 if IsOrthancVersionAbove(_REMOTE, 1, 12, 5):
663 7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10566 # when requesting PatientComments, with 1.12.4, we did not get the computed tags
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10567 i = CallFindScu([ '-k', 'PatientID=WITH_COMMENTS', '-k', 'QueryRetrieveLevel=Study', '-k', 'ModalitiesInStudy', '-k', 'NumberOfStudyRelatedSeries', '-k', 'NumberOfStudyRelatedInstances', '-k', 'PatientComments' ])
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10568 modalitiesInStudy = re.findall('$0008,0061$.?\[(.?)\]', i)
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10569 self.assertEqual(1, len(modalitiesInStudy))
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10570 self.assertEqual('CT', modalitiesInStudy[0])
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10571 numberOfStudyRelatedSeries = re.findall('$0020,1206$.?\[(.?)\]', i)
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10572 self.assertEqual(1, len(numberOfStudyRelatedSeries))
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10573 self.assertEqual(1, int(numberOfStudyRelatedSeries[0]))
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10574 numberOfStudyRelatedInstances = re.findall('$0020,1208$.?\[(.?)\]', i)
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10575 self.assertEqual(1, len(numberOfStudyRelatedInstances))
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10576 self.assertEqual(1, int(numberOfStudyRelatedInstances[0]))
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10577
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10578 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10579 'Expand': True,
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10580 'Query' : { 'PatientID' : 'WITH_COMMENTS'},
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10581 'RequestedTags': ['ModalitiesInStudy', 'NumberOfStudyRelatedSeries', 'NumberOfStudyRelatedInstances', 'PatientComments']})
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10582
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10583 self.assertEqual(4, len(a[0]['RequestedTags'].keys()))
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10584 self.assertEqual(1, int(a[0]['RequestedTags']['NumberOfStudyRelatedSeries']))
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10585 self.assertEqual(1, int(a[0]['RequestedTags']['NumberOfStudyRelatedInstances']))
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10586 self.assertEqual('CT', a[0]['RequestedTags']['ModalitiesInStudy'])
7a6996b9b9ee added specific c-find test Alain Mazy <am@orthanc.team> parents: 662 diff changeset	10587 self.assertEqual('', a[0]['RequestedTags']['PatientComments'])

Mercurial > hg > orthanc-tests

annotate Tests/Tests.py @ 675:c8c4bebf18b8