orthanc-tests: Tests/Tests.py annotate

annotate Tests/Tests.py @ 551:c8d2775f0d02

added test_issue_216 for DICOMweb

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 23 Jun 2023 19:17:03 +0200
parents	3933237d1958
children	ede184638961 739cad709a8c

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
511 933fe1bbce4f upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 510 diff changeset	8 # Copyright (C) 2017-2023 Osimis S.A., Belgium
933fe1bbce4f upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 510 diff changeset	9 # Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 #
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 # This program is free software: you can redistribute it and/or
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 # modify it under the terms of the GNU General Public License as
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 # published by the Free Software Foundation, either version 3 of the
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 # License, or (at your option) any later version.
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 #
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 # This program is distributed in the hope that it will be useful, but
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 # WITHOUT ANY WARRANTY; without even the implied warranty of
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 # General Public License for more details.
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 #
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 # You should have received a copy of the GNU General Public License
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 # along with this program. If not, see <http://www.gnu.org/licenses/>.
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24
202 f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	25 import base64
290 b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	26 import bz2
202 f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	27 import copy
440 3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	28 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	29 import numpy
202 f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	30 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	31 import shutil
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	32 import tempfile
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33 import unittest
515 5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	34 import time
529 53cf0e3ad007 get DCMDICPATH from env Alain Mazy <am@osimis.io> parents: 527 diff changeset	35 import os
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
11 c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	37 from PIL import ImageChops
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 from Toolbox import *
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	39 from xml.dom import minidom
312 e12c8434aa1e print date Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	40 from datetime import datetime
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	41
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42 _LOCAL = None
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43 _REMOTE = None
306 da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	44 _DOCKER = False
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	45
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 def SetOrthancParameters(local, remote, withinDocker):
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	48 global _LOCAL, _REMOTE, _DOCKER
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 _LOCAL = local
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 _REMOTE = remote
306 da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	51 _DOCKER = withinDocker
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	52
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	53
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	54 def ExtractDicomTags(rawDicom, tags):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	55 with tempfile.NamedTemporaryFile(delete = True) as f:
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	56 f.write(rawDicom)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	57 f.flush()
45 a8cc12e9b268 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 44 diff changeset	58 data = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ])
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	59
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	60 result = []
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	61 for tag in tags:
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	62 match = re.search('<element[^>]+name="%s">([^>]*)</element>' % tag, data)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	63 if match == None:
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	64 result.append('')
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	65 else:
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	66 result.append(match.group(1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	67
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	68 return result
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	69
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	70
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	71 def CompareLists(a, b):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	72 if len(a) != len(b):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	73 return False
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	74
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	75 for i in range(len(a)):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	76 d = a[i] - b[i]
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	77 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	78 return False
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	79
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	80 return True
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	81
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	82
80 8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	83 def CompareTags(a, b, tagsToIgnore):
8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	84 for i in tagsToIgnore:
8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	85 if i in a:
8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	86 del a[i]
8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	87 if i in b:
8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	88 del b[i]
8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	89
123 ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	90 if a.keys() == b.keys():
ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	91 return True
ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	92 else:
ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	93 print('Mismatch in tags: %s' % str(set(a.keys()) ^ set(b.keys())))
ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	94 return False
80 8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	95
8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	96
71 48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	97 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	98 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	99 '-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	100 _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	101 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	102 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	103
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	104
142 6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	105 def GetMoveScuCommand():
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	106 return [
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	107 FindExecutable('movescu'),
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	108 '--move', _LOCAL['DicomAet'], # Target AET (i.e. storescp)
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	109 '--call', _REMOTE['DicomAet'], # Called AET (i.e. Orthanc)
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	110 '--aetitle', _LOCAL['DicomAet'], # Calling AET (i.e. storescp)
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	111 _REMOTE['Server'],
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	112 str(_REMOTE['DicomPort'])
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	113 ]
6d2bfbbd0c2d reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 141 diff changeset	114
231 4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	115
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	116 def IsDicomUntilPixelDataStored(orthanc):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	117 # 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	118 # "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	119
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	120 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	121 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	122 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	123 if a != 0x03a0:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	124 raise Exception('Internal error')
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	125
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	126 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	127 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	128 raise Exception('Internal error')
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	129
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	130 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	131
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	132 if len(a) == 1:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	133 return False
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	134 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	135 return True
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	136 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	137 raise Exception('Internal error')
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	138
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	139 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	140 return False
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	141
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	142
54 c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	143 def CallMoveScu(args):
231 4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	144 try:
4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	145 subprocess.check_call(GetMoveScuCommand() + args,
318 bac7cc80f240 dicomweb: test_wado_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 315 diff changeset	146 stderr = subprocess.PIPE)
231 4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	147 except subprocess.CalledProcessError as e:
4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	148 # 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	149 # 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	150 # 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	151 # DICOM instances.
4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	152 # 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	153 if e.returncode != 69:
4087505ddfe3 catching error codes of movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 220 diff changeset	154 raise e
54 c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	155
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	156
51 264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	157 def GenerateTestSequence():
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	158 return [
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	159 {
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	160 'StudyDescription': 'Hello^',
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	161 'ReferencedStudySequence' : [
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	162 {
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	163 'StudyDescription': 'Toto',
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	164 },
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 'StudyDescription': 'Tata',
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	167 },
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 'StudyDescription': 'Sébastien^',
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	172 'StudyDate' : '19700202',
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	173 }
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
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	177 class Orthanc(unittest.TestCase):
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	178 def setUp(self):
83 3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 81 diff changeset	179 if (sys.version_info >= (3, 0)):
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 81 diff changeset	180 # Remove annoying warnings about unclosed socket in Python 3
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 81 diff changeset	181 import warnings
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 81 diff changeset	182 warnings.simplefilter("ignore", ResourceWarning)
3f2170efa8d2 patches for python3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 81 diff changeset	183
508 ae493446336a fix tests for missing archives Alain Mazy <am@osimis.io> parents: 507 diff changeset	184 print('running : %s' % self.id())
ae493446336a fix tests for missing archives Alain Mazy <am@osimis.io> parents: 507 diff changeset	185
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	186 DropOrthanc(_LOCAL)
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	187 DropOrthanc(_REMOTE)
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	188 UninstallLuaCallbacks(_REMOTE)
423 cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	189
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	190 # Reset stuff possibly set by some integration tests
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	191 DoPut(_REMOTE, '/tools/default-encoding', 'Latin1')
515 5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	192 if IsOrthancVersionAbove(_REMOTE, 1, 9, 0):
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	193 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	194 DoPut(_REMOTE, '/tools/unknown-sop-class-accepted', '0')
423 cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	195
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	196 for i in [ 'toto', 'tata' ]:
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	197 if i in DoGet(_REMOTE, '/modalities'):
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	198 DoDelete(_REMOTE, '/modalities/%s' % i)
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	199 if i in DoGet(_REMOTE, '/peers'):
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	200 DoDelete(_REMOTE, '/peers/%s' % i)
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	201
312 e12c8434aa1e print date Sebastien Jodogne <s.jodogne@gmail.com> parents: 311 diff changeset	202 #print("%s: In test %s" % (datetime.now(), self._testMethodName))
44 ffa542cce638 Toolbox.FindExecutable() Sebastien Jodogne <s.jodogne@gmail.com> parents: 43 diff changeset	203
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	204 def AssertSameImages(self, truth, url):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	205 im = GetImage(_REMOTE, url)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	206 self.assertTrue(CompareLists(truth, im.getdata()))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	207
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209 def test_system(self):
177 ef6b791c6d62 fix version checks am@osimis.io parents: 176 diff changeset	210 self.assertTrue('Version' in DoGet(_REMOTE, '/system'))
ef6b791c6d62 fix version checks am@osimis.io parents: 176 diff changeset	211 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
ef6b791c6d62 fix version checks am@osimis.io parents: 176 diff changeset	212 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
ef6b791c6d62 fix version checks am@osimis.io parents: 176 diff changeset	213
512 e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	214 systemInfo = DoGet(_REMOTE, '/system')
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	215
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	216 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
512 e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	217 self.assertIn("MainDicomTags", systemInfo)
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	218 self.assertIn("Patient", systemInfo["MainDicomTags"])
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	219 self.assertIn("Study", systemInfo["MainDicomTags"])
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	220 self.assertIn("Series", systemInfo["MainDicomTags"])
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	221 self.assertIn("Instance", systemInfo["MainDicomTags"])
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	222
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	223 if IsOrthancVersionAbove(_REMOTE, 1, 12, 0):
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	224 self.assertIn("UserMetadata", systemInfo)
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	225 self.assertEqual(1098, systemInfo['UserMetadata']['my-metadata'] )
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	226
177 ef6b791c6d62 fix version checks am@osimis.io parents: 176 diff changeset	227 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	228 print("Skipping version checks since you're currently in mainline")
177 ef6b791c6d62 fix version checks am@osimis.io parents: 176 diff changeset	229 return
ef6b791c6d62 fix version checks am@osimis.io parents: 176 diff changeset	230
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	231 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	232 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	233 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	234 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	235 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	236 self.assertFalse(IsOrthancVersionAbove(_LOCAL, 1, 8, 6))
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237
456 0d7c0bbe6c90 fix Alain Mazy <am@osimis.io> parents: 454 diff changeset	238
512 e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	239
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 def test_upload(self):
173 ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	241 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	242 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	243
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	244 sizeDummyCT = 2472
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	245 sizeOverwrite = 2476
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	246 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d'
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	247
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	248 # 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	249 u = UploadInstance(_REMOTE, 'DummyCT.dcm')
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	250 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	251 self.assertEqual(instance, u['ID'])
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 self.assertEqual('Success', u['Status'])
173 ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	253
183 76747a374aff test Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	254 if True:
76747a374aff test Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	255 # New test for Orthanc 1.4.3
76747a374aff test Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	256 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', u['ParentSeries'])
76747a374aff test Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	257 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', u['ParentStudy'])
76747a374aff test Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	258 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', u['ParentPatient'])
76747a374aff test Sebastien Jodogne <s.jodogne@gmail.com> parents: 182 diff changeset	259
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	260 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	261 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	262 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	263 j = 0
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	264 else:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	265 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	266 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	267
09ebdee8eda2 added test for /attachments/../info Alain Mazy <am@osimis.io> parents: 443 diff changeset	268 if IsOrthancVersionAbove(_REMOTE, 1, 10, 0):
09ebdee8eda2 added test for /attachments/../info Alain Mazy <am@osimis.io> parents: 443 diff changeset	269 attachmentInfo = DoGet(_REMOTE, '/instances/%s/attachments/dicom/info' % instance)
447 72be948dfe5c fix test_upload Sebastien Jodogne <s.jodogne@gmail.com> parents: 446 diff changeset	270
72be948dfe5c fix test_upload Sebastien Jodogne <s.jodogne@gmail.com> parents: 446 diff changeset	271 if isCompressed:
72be948dfe5c fix test_upload Sebastien Jodogne <s.jodogne@gmail.com> parents: 446 diff changeset	272 self.assertGreater(sizeDummyCT, attachmentInfo['CompressedSize'])
72be948dfe5c fix test_upload Sebastien Jodogne <s.jodogne@gmail.com> parents: 446 diff changeset	273 else:
72be948dfe5c fix test_upload Sebastien Jodogne <s.jodogne@gmail.com> parents: 446 diff changeset	274 self.assertEqual(sizeDummyCT, attachmentInfo['CompressedSize'])
72be948dfe5c fix test_upload Sebastien Jodogne <s.jodogne@gmail.com> parents: 446 diff changeset	275
445 09ebdee8eda2 added test for /attachments/../info Alain Mazy <am@osimis.io> parents: 443 diff changeset	276 self.assertEqual(sizeDummyCT, attachmentInfo['UncompressedSize'])
09ebdee8eda2 added test for /attachments/../info Alain Mazy <am@osimis.io> parents: 443 diff changeset	277 self.assertIn('Uuid', attachmentInfo)
09ebdee8eda2 added test for /attachments/../info Alain Mazy <am@osimis.io> parents: 443 diff changeset	278 self.assertEqual(1, attachmentInfo['ContentType'])
09ebdee8eda2 added test for /attachments/../info Alain Mazy <am@osimis.io> parents: 443 diff changeset	279
173 ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	280 s = sizeDummyCT + j
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	281
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	282 if isCompressed:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	283 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	284 else:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	285 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	286
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	287 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']))
173 ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	288
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	289 u = UploadInstance(_REMOTE, 'DummyCT.dcm')
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	290 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	291 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	292 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	293 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	294
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	295 if isCompressed:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	296 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	297 else:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	298 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	299
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	300 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']))
173 ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	301
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	302 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % instance)
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	303 self.assertEqual('20070101', i['StudyDate'])
173 ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	304 self.assertEqual('KNIX', i['PatientName'])
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	305
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	306 if IsOrthancVersionAbove(_REMOTE, 1, 4, 2):
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	307 # Overwriting
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	308 self.assertEqual('Success', u['Status'])
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	309 else:
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	310 self.assertEqual('AlreadyStored', u['Status'])
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	311
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	312 u = UploadInstance(_REMOTE, 'DummyCT-overwrite.dcm')
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	313 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	314 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	315 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	316 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	317
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	318 if IsOrthancVersionAbove(_REMOTE, 1, 4, 2):
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	319 # Overwriting
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	320 self.assertEqual('Success', u['Status'])
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	321 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	322 j2 = 0
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	323 else:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	324 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	325 self.assertNotEqual(j, j2)
173 ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	326 s2 = sizeOverwrite + j2
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	327 self.assertNotEqual(s, s2)
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	328 if isCompressed:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	329 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	330 else:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	331 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	332
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	333 self.assertEqual(s2, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']))
173 ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	334 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % instance)
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	335 self.assertEqual('ANOTHER', i['PatientName'])
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	336 else:
ed3db6386587 testing overwrite Sebastien Jodogne <s.jodogne@gmail.com> parents: 154 diff changeset	337 self.assertEqual('AlreadyStored', u['Status'])
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	338 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	339 self.assertEqual(s, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']))
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	340
5 19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	341 def test_upload_2(self):
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	342 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343 instance = DoGet(_REMOTE, '/instances/%s' % i)
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344 self.assertEqual(i, instance['ID'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	345 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7040.1171286242.109',
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346 instance['MainDicomTags']['SOPInstanceUID'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348 series = DoGet(_REMOTE, '/series/%s' % instance['ParentSeries'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.394',
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350 series['MainDicomTags']['SeriesInstanceUID'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 study = DoGet(_REMOTE, '/studies/%s' % series['ParentStudy'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 self.assertEqual('1.2.840.113619.2.176.2025.1499492.7391.1171285944.390',
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 study['MainDicomTags']['StudyInstanceUID'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356 patient = DoGet(_REMOTE, '/patients/%s' % study['ParentPatient'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357 self.assertEqual('ozp00SjY2xG',
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 patient['MainDicomTags']['PatientID'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360 dicom = DoGet(_REMOTE, '/instances/%s/file' % instance['ID'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361 self.assertEqual(2472, len(dicom))
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 self.assertEqual('3e29b869978b6db4886355a2b1132124', ComputeMD5(dicom))
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i)))
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/simplified-tags' % i)['StationName'])
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365 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	366 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	367 self.assertEqual('TWINOW', DoGet(_REMOTE, '/instances/%s/tags?short' % i)['0008,1010'])
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	368
2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	369
5 19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	370 def test_images(self):
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	371 i = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID']
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	372 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/frames' % i)))
3 2dbba2e6aa4b reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	373
5 19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	374 im = GetImage(_REMOTE, '/instances/%s/preview' % i)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	375 self.assertEqual("L", im.mode)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	376 self.assertEqual(512, im.size[0])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	377 self.assertEqual(358, im.size[1])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	378
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	379 im = GetImage(_REMOTE, '/instances/%s/image-uint8' % i)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	380 self.assertEqual("L", im.mode)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	381 self.assertEqual(512, im.size[0])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	382 self.assertEqual(358, im.size[1])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	383
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	384 im = GetImage(_REMOTE, '/instances/%s/image-uint16' % i)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	385 self.assertEqual(512, im.size[0])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	386 self.assertEqual(358, im.size[1])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	387
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	388 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % i)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	389 self.assertEqual("L", im.mode)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	390 self.assertEqual(512, im.size[0])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	391 self.assertEqual(358, im.size[1])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	392
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	393 im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint8' % i)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	394 self.assertEqual("L", im.mode)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	395 self.assertEqual(512, im.size[0])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	396 self.assertEqual(358, im.size[1])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	397
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	398 im = GetImage(_REMOTE, '/instances/%s/frames/0/image-uint16' % i)
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	399 self.assertEqual(512, im.size[0])
19eb87a45685 test_images Sebastien Jodogne <s.jodogne@gmail.com> parents: 3 diff changeset	400 self.assertEqual(358, im.size[1])
64 369e439cdfd6 test access header Sebastien Jodogne <s.jodogne@gmail.com> parents: 63 diff changeset	401
369e439cdfd6 test access header Sebastien Jodogne <s.jodogne@gmail.com> parents: 63 diff changeset	402 # This is Little Endian Explicit
369e439cdfd6 test access header Sebastien Jodogne <s.jodogne@gmail.com> parents: 63 diff changeset	403 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	404
464 216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	405 def test_images_implicit_vr(self):
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	406 if IsOrthancVersionAbove(_REMOTE, 1, 10, 2):
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	407 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	408
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	409 im = GetImage(_REMOTE, '/instances/%s/preview' % i)
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	410 self.assertEqual("RGB", im.mode)
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	411 self.assertEqual(800, im.size[0])
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	412 self.assertEqual(600, im.size[1])
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	413
216231c18c2e added tests for implicit vr preview Alain Mazy <am@osimis.io> parents: 463 diff changeset	414
6 6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	415 def test_hierarchy(self):
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	416 UploadFolder(_REMOTE, 'Brainix/Epi')
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	417 UploadFolder(_REMOTE, 'Brainix/Flair')
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	418 UploadFolder(_REMOTE, 'Knee/T1')
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	419 UploadFolder(_REMOTE, 'Knee/T2')
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	420
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	421 p = DoGet(_REMOTE, '/patients')
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	422 s = DoGet(_REMOTE, '/studies')
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	423 t = DoGet(_REMOTE, '/series')
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	424 self.assertEqual(2, len(p))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	425 self.assertEqual(2, len(s))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	426 self.assertEqual(4, len(t))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	427 self.assertEqual(94, len(DoGet(_REMOTE, '/instances')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	428
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	429 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0'
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	430 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988'
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	431 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8'
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	432 brainixFlair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0'
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	433
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	434 kneePatient = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17'
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	435 kneeStudy = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	436 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	437 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59'
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	438
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	439 self.assertTrue(brainixPatient in p)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	440 self.assertTrue(kneePatient in p)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	441 self.assertTrue(brainixStudy in s)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	442 self.assertTrue(kneeStudy in s)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	443 self.assertTrue(brainixEpi in t)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	444 self.assertTrue(brainixFlair in t)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	445 self.assertTrue(kneeT1 in t)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	446 self.assertTrue(kneeT2 in t)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	447
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	448 self.assertEqual(44, len(DoGet(_REMOTE, '/patients/%s/instances' % brainixPatient)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	449 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/series' % brainixPatient)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	450 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/studies' % brainixPatient)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	451
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	452 self.assertEqual(50, len(DoGet(_REMOTE, '/patients/%s/instances' % kneePatient)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	453 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/series' % kneePatient)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	454 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/studies' % kneePatient)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	455
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	456 self.assertEqual(2, len(DoGet(_REMOTE, '/studies/%s/series' % brainixStudy)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	457 self.assertEqual(44, len(DoGet(_REMOTE, '/studies/%s/instances' % brainixStudy)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	458
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	459 self.assertEqual(2, len(DoGet(_REMOTE, '/studies/%s/series' % kneeStudy)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	460 self.assertEqual(50, len(DoGet(_REMOTE, '/studies/%s/instances' % kneeStudy)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	461
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	462 self.assertEqual(22, len(DoGet(_REMOTE, '/series/%s/instances' % brainixEpi)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	463 self.assertEqual(22, len(DoGet(_REMOTE, '/series/%s/instances' % brainixFlair)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	464 self.assertEqual(24, len(DoGet(_REMOTE, '/series/%s/instances' % kneeT1)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	465 self.assertEqual(26, len(DoGet(_REMOTE, '/series/%s/instances' % kneeT2)))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	466
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	467 for patient in p:
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	468 for study in DoGet(_REMOTE, '/patients/%s/studies' % patient):
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	469 self.assertEqual(patient, study['ParentPatient'])
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	470 for series in DoGet(_REMOTE, '/studies/%s/series' % study['ID']):
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	471 self.assertEqual(study['ID'], series['ParentStudy'])
211 a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	472 self.assertEqual('Unknown', series['Status'])
6 6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	473 for instance in DoGet(_REMOTE, '/series/%s/instances' % series['ID']):
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	474 self.assertEqual(series['ID'], instance['ParentSeries'])
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	475
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	476 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	477 # 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	478 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	479 json.dumps(DoGet(_REMOTE, '/instances/%s/tags' % instance['ID'])))
6 6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	480
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 r = DoDelete(_REMOTE, "/studies/%s" % brainixStudy)['RemainingAncestor']
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	483 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	484 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	485 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	486 self.assertEqual(50, len(DoGet(_REMOTE, '/instances')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	487 self.assertEqual(None, r)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	488
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	489 r = DoDelete(_REMOTE, "/series/%s" % kneeT2)['RemainingAncestor']
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	490 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	491 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	492 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	493 self.assertEqual(24, len(DoGet(_REMOTE, '/instances')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	494 self.assertEqual('Study', r['Type'])
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	495 self.assertEqual(kneeStudy, r['ID'])
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	496
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	497 r = DoDelete(_REMOTE, "/instances/%s" % DoGet(_REMOTE, '/instances')[0])['RemainingAncestor']
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	498 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	499 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	500 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	501 self.assertEqual(23, len(DoGet(_REMOTE, '/instances')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	502 self.assertEqual('Series', r['Type'])
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	503 self.assertEqual(kneeT1, r['ID'])
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	504
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	505 r = DoDelete(_REMOTE, "/patients/%s" % kneePatient)['RemainingAncestor']
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	506 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	507 self.assertEqual(0, len(DoGet(_REMOTE, '/studies')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	508 self.assertEqual(0, len(DoGet(_REMOTE, '/series')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	509 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	510 self.assertEqual(None, r)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	511
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	512 DropOrthanc(_REMOTE)
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	513 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalDiskSize'])
6d645b3011e1 test_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 5 diff changeset	514 self.assertEqual('0', DoGet(_REMOTE, '/statistics')['TotalUncompressedSize'])
7 302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	515
213 eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	516 def test_delete_cascade(self):
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	517 # 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	518
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	519 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	520 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	521 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	522 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	523 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	524 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	525
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	526 DoDelete(_REMOTE, '/instances/%s' % a)
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	527
eba6b8c38eee added a delete_cascade test to reproduce an issue in our MSSQL plugin amazy parents: 211 diff changeset	528 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	529 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	530 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	531 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	532
7 302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	533
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	534 def test_multiframe(self):
7 302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	535 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID']
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	536 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % i)))
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	537
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	538 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % i)
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	539 self.assertEqual("L", im.mode)
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	540 self.assertEqual(512, im.size[0])
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	541 self.assertEqual(512, im.size[1])
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	542
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	543 DoGet(_REMOTE, '/instances/%s/frames/0/image-uint8' % i)
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	544 DoGet(_REMOTE, '/instances/%s/frames/0/image-uint16' % i)
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	545 DoGet(_REMOTE, '/instances/%s/frames/75/preview' % i)
302f06f3bba2 test_multi_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 6 diff changeset	546 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	547 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	548
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	549
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	550 def test_changes(self):
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	551 # Check emptiness
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	552 c = DoGet(_REMOTE, '/changes')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	553 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	554 #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	555 self.assertTrue(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	556 c = DoGet(_REMOTE, '/changes?last')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	557 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	558 #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	559 self.assertTrue(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	560
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	561 # Add 1 instance
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	562 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	563 c = DoGet(_REMOTE, '/changes')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	564 begin = c['Last']
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	565 self.assertEqual(4, len(c['Changes']))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	566 self.assertTrue(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	567 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	568
390 5c2472f008eb Check the order in which the creation events are reported Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	569 # 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	570 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	571 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	572 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	573 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	574
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	575 c = DoGet(_REMOTE, '/changes?last')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	576 self.assertEqual(1, len(c['Changes']))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	577 self.assertEqual(begin, c['Last'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	578 self.assertTrue(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	579 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	580 self.assertEqual(1, len(c['Changes']))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	581 self.assertEqual(begin, c['Last'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	582 self.assertTrue(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	583 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	584 self.assertEqual(1, len(c['Changes']))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	585 self.assertEqual(begin - 1, c['Last'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	586 self.assertFalse(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	587 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	588 self.assertEqual(1, len(c['Changes']))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	589 self.assertEqual(begin - 2, c['Last'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	590 self.assertFalse(c['Done'])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	591
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	592 UploadFolder(_REMOTE, 'Knee/T1')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	593 UploadFolder(_REMOTE, 'Knee/T2')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	594 since = begin
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	595 countPatients = 0
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	596 countStudies = 0
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	597 countSeries = 0
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	598 countInstances = 0
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	599 completed = 0
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	600 while True:
530 937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	601 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	602 since = c['Last']
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	603 for i in c['Changes']:
530 937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	604 # 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	605
937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	606 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	607 countInstances += 1
530 937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	608 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	609 countPatients += 1
530 937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	610 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	611 countStudies += 1
530 937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	612 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	613 countSeries += 1
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	614 if i['ChangeType'] == 'CompletedSeries':
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	615 completed += 1
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	616 self.assertTrue('ID' in i)
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	617 self.assertTrue('Path' in i)
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	618 self.assertTrue('Seq' in i)
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	619 if c['Done']:
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	620 break
530 937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	621 # we count only the events since before the upload of 2 Knee series !
937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	622 self.assertEqual(50, countInstances)
937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	623 self.assertEqual(1, countPatients)
937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	624 self.assertEqual(1, countStudies)
937bee4a2fe3 fix Alain Mazy <am@osimis.io> parents: 529 diff changeset	625 self.assertEqual(2, countSeries)
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	626 self.assertEqual(0, completed)
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	627
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 def test_archive(self):
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	630 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	631 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
192 6ff9d035b26b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	632 knee = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17'
6ff9d035b26b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	633
6ff9d035b26b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	634 z = GetArchive(_REMOTE, '/patients/%s/archive' % knee)
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	635 self.assertEqual(2, len(z.namelist()))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	636
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	637 z = GetArchive(_REMOTE, '/studies/%s/archive' % DoGet(_REMOTE, '/studies')[0])
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()))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	639
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	640 z = GetArchive(_REMOTE, '/series/%s/archive' % DoGet(_REMOTE, '/series')[0])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	641 self.assertEqual(1, len(z.namelist()))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	642
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	643 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
192 6ff9d035b26b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	644 brainix = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0'
6ff9d035b26b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	645
6ff9d035b26b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	646 z = GetArchive(_REMOTE, '/patients/%s/archive' % knee)
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	647 self.assertEqual(2, len(z.namelist()))
192 6ff9d035b26b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	648
6ff9d035b26b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	649 z = PostArchive(_REMOTE, '/tools/create-archive', {
6ff9d035b26b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	650 'Resources' : [ brainix, knee ]
6ff9d035b26b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	651 })
6ff9d035b26b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	652 self.assertEqual(3, len(z.namelist()))
403 e08e15befa0c test sync POST to /archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	653
e08e15befa0c test sync POST to /archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	654 z = PostArchive(_REMOTE, '/patients/%s/archive' % knee, {
e08e15befa0c test sync POST to /archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	655 'Synchronous' : True
e08e15befa0c test sync POST to /archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	656 })
e08e15befa0c test sync POST to /archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 402 diff changeset	657 self.assertEqual(2, len(z.namelist()))
192 6ff9d035b26b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 191 diff changeset	658
8 f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	659
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	660 def test_media_archive(self):
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	661 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	662 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	663
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	664 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	665 self.assertEqual(3, len(z.namelist()))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	666 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	667 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	668 self.assertTrue('DICOMDIR' in z.namelist())
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	669
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	670 try:
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	671 os.remove('/tmp/DICOMDIR')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	672 except:
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	673 # The file does not exist
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	674 pass
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	675
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	676 z.extract('DICOMDIR', '/tmp')
45 a8cc12e9b268 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 44 diff changeset	677 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	678 stderr = subprocess.STDOUT).split('\n')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	679 self.assertEqual(3, len(a))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	680 self.assertTrue(a[0].startswith('Warning'))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	681 self.assertEqual('BasicDirectory', a[1])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	682 self.assertEqual('', a[2])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	683
45 a8cc12e9b268 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 44 diff changeset	684 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	685 stderr = subprocess.STDOUT).split('\n')
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	686 self.assertEqual(1, len(a))
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	687 self.assertEqual('', a[0])
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	688
45 a8cc12e9b268 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 44 diff changeset	689 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	690 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	691 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	692
f8d781d1d267 test_changes, test_archive, test_media_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 7 diff changeset	693 os.remove('/tmp/DICOMDIR')
10 5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	694
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	695
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	696 def test_protection(self):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	697 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	698 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	699 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	700 a = DoGet(_REMOTE, '/patients')[0]
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	701 b = DoGet(_REMOTE, '/patients')[1]
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	702 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	703 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	704 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	705 DoPut(_REMOTE, '/patients/%s/protected' % a, '1', 'text/plain')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	706 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	707 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	708 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	709
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	710
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	711 def test_raw_tags(self):
10 5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	712 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	713
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	714 dicom = DoGet(_REMOTE, '/instances/%s/file' % i)
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	715 self.assertEqual('1a7c56cb02d6e742cc9c856a8ac182e3', ComputeMD5(dicom))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	716
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	717 s = '/instances/%s/content/' % i
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	718
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	719 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, s + '0008-1010').strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	720 self.assertRaises(Exception, lambda: DoGet(_REMOTE, s + '0008-1011'))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	721
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	722 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	723 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	724
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	725 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	726 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	727 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	728 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	729
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	730 for i in DoGet(_REMOTE, '/instances'):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	731 aid = DoGet(_REMOTE, '/instances/%s' % i)['MainDicomTags']['SOPInstanceUID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	732 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	733
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	734
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	735 def test_raw_tags_mdn(self):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	736 # Bug reported by Cyril Paulus
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	737 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	738 self.assertAlmostEqual(0.000027, DoGet(_REMOTE, '/instances/%s/content/7053-1000' % i))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	739
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	740
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	741 def test_modify_instance(self):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	742 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	743 modified = DoPost(_REMOTE, '/instances/%s/modify' % i,
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	744 json.dumps({
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	745 "Replace" : {
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	746 "PatientName" : "hello",
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	747 #"PatientID" : "world"
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	748 },
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	749 "Remove" : [ "StationName" ],
118 a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	750 "RemovePrivateTags" : True
10 5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	751 }),
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	752 'application/json')
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	753 j = DoPost(_REMOTE, '/instances', modified, 'application/dicom')['ID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	754
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	755 self.assertNotEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	756 #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	757 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	758 DoGet(_REMOTE, '/instances/%s/content/6003-1010' % i) # Some private tag
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	759
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	760 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	761 #self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % j).strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	762 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	763 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/6003-1010' % j))
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
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	766 def test_modify_series(self):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	767 # Upload 4 images from the same series
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	768 for i in range(4):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	769 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	770
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	771 origSeries = DoGet(_REMOTE, '/series')[0]
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	772 newSeries = DoPost(_REMOTE, '/series/%s/modify' % origSeries,
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	773 '{"Replace":{"PatientName":"Jodogne"}}',
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	774 'application/json')['ID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	775
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	776 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['ModifiedFrom'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	777 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	778 self.assertEqual(4, len(instances))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	779 for i in instances:
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	780 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	781 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	782 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	783
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	784 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	785 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	786
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	787
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	788 def test_modify_study(self):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	789 # Upload 4 images from the 2 series of the same study
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	790 for i in range(4):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	791 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	792 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	793
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	794 origStudy = DoGet(_REMOTE, '/studies')[0]
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	795 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy,
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	796 '{"Replace":{"PatientName":"Jodogne"}}',
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	797 'application/json')['ID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	798
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	799 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['ModifiedFrom'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	800 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	801 self.assertEqual(2, len(series))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	802 for s in series:
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	803 ss = DoGet(_REMOTE, '/series/%s' % s)['ModifiedFrom']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	804 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	805 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy'])
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 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	808 for i in instances:
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	809 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	810 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	811 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	812
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	813 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	814 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	815
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	816
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	817 def test_anonymize_series(self):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	818 # Upload 4 images from the same series
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	819 for i in range(4):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	820 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	821
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	822 origSeries = DoGet(_REMOTE, '/series')[0]
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	823 newSeries = DoPost(_REMOTE, '/series/%s/anonymize' % origSeries,
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	824 '{}',
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	825 'application/json')['ID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	826
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	827 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['AnonymizedFrom'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	828 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	829 self.assertEqual(4, len(instances))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	830 for i in instances:
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	831 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	832 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	833 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	834
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	835 DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j)
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	836 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	837
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 def test_anonymize_study(self):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	840 # Upload 4 images from the 2 series of the same study
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	841 for i in range(4):
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	842 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	843 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	844
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	845 origStudy = DoGet(_REMOTE, '/studies')[0]
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	846 newStudy = DoPost(_REMOTE,'/studies/%s/anonymize' % origStudy,
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	847 '{"Replace":{"PatientName":"Jodogne"}}',
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	848 'application/json')['ID']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	849
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	850 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['AnonymizedFrom'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	851 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	852 self.assertEqual(2, len(series))
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	853 for s in series:
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	854 ss = DoGet(_REMOTE, '/series/%s' % s)['AnonymizedFrom']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	855 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	856 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	857
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	858 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	859 for i in instances:
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	860 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom']
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	861 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	862 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries'])
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	863
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	864 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip())
5f73008bb873 tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 8 diff changeset	865 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	866
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	867
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	868
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	869 def test_storescu(self):
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	870 # Check emptiness
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	871 e = DoGet(_REMOTE, '/exports')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	872 self.assertEqual(0, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	873 self.assertEqual(0, e['Last'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	874 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	875 e = DoGet(_REMOTE, '/exports?last')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	876 self.assertEqual(0, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	877 self.assertEqual(0, e['Last'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	878 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	879
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	880 # Add 1 instance
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	881 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	882 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	883
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	884 # Export the instance
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	885 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') # instance
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	886 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	887 self.assertEqual(1, len(DoGet(_LOCAL, '/studies')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	888 self.assertEqual(1, len(DoGet(_LOCAL, '/series')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	889 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	890
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	891 e = DoGet(_REMOTE, '/exports')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	892 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	893 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	894 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	895 e = DoGet(_REMOTE, '/exports?limit=1')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	896 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	897 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	898 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	899 e = DoGet(_REMOTE, '/exports?last')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	900 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	901 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	902 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	903 seqInstance = e['Last']
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	904
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	905 # Export the series
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	906 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	907
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	908 e = DoGet(_REMOTE, '/exports')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	909 self.assertEqual(2, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	910 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	911 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	912 seqSeries = e['Last']
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	913 self.assertNotEqual(seqInstance, seqSeries)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	914 e = DoGet(_REMOTE, '/exports?limit=1&since=0')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	915 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	916 self.assertFalse(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	917 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	918 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	919 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	920 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	921 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	922 e = DoGet(_REMOTE, '/exports?last')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	923 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	924 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	925 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	926
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	927 # Export the study
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	928 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	929 seqStudy = DoGet(_REMOTE, '/exports')['Last']
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	930
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	931 # Export the patient
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	932 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	933 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	934 self.assertEqual(1, len(DoGet(_LOCAL, '/studies')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	935 self.assertEqual(1, len(DoGet(_LOCAL, '/series')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	936 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	937
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	938 e = DoGet(_REMOTE, '/exports')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	939 self.assertEqual(4, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	940 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	941 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	942 seqPatient = e['Last']
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	943 self.assertNotEqual(seqInstance, seqSeries)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	944 self.assertNotEqual(seqSeries, seqStudy)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	945 self.assertNotEqual(seqStudy, seqPatient)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	946 self.assertTrue(seqInstance < seqSeries)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	947 self.assertTrue(seqSeries < seqStudy)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	948 self.assertTrue(seqStudy < seqPatient)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	949 e = DoGet(_REMOTE, '/exports?limit=1&since=0')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	950 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	951 self.assertFalse(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	952 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	953 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	954 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	955 self.assertFalse(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	956 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	957 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqSeries))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	958 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	959 self.assertFalse(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	960 self.assertEqual(e['Exports'][-1]['Seq'], seqStudy)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	961 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqStudy))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	962 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	963 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	964 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	965 e = DoGet(_REMOTE, '/exports?last')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	966 self.assertEqual(1, len(e['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	967 self.assertTrue(e['Done'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	968 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	969
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	970
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	971 # Check the content of the logged information
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	972 e = DoGet(_REMOTE, '/exports')['Exports']
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	973
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	974 if 'PatientID' in e[0]:
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	975 # Since Orthanc 0.8.6
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	976 patient = 'PatientID'
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	977 study = 'StudyInstanceUID'
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	978 series = 'SeriesInstanceUID'
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	979 instance = 'SOPInstanceUID'
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	980 else:
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	981 # Up to Orthanc 0.8.5
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	982 patient = 'PatientId'
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	983 study = 'StudyInstanceUid'
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	984 series = 'SeriesInstanceUid'
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	985 instance = 'SopInstanceUid'
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	986
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	987 for k in range(4):
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	988 self.assertTrue('Date' in e[k])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	989 self.assertTrue('Seq' in e[k])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	990 self.assertEqual('orthanctest', e[k]['RemoteModality'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	991
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	992 self.assertEqual(10, len(e[0]))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	993 self.assertEqual('Instance', e[0]['ResourceType'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	994 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['ID'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	995 self.assertEqual('/instances/66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['Path'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	996 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	997 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	998 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	999 self.assertEqual('ozp00SjY2xG', e[0][patient])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1000
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1001 self.assertEqual(9, len(e[1]))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1002 self.assertEqual('Series', e[1]['ResourceType'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1003 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['ID'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1004 self.assertEqual('/series/f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['Path'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1005 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	1006 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	1007 self.assertEqual('ozp00SjY2xG', e[1][patient])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1008
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1009 self.assertEqual(8, len(e[2]))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1010 self.assertEqual('Study', e[2]['ResourceType'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1011 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['ID'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1012 self.assertEqual('/studies/b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['Path'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1013 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	1014 self.assertEqual('ozp00SjY2xG', e[2][patient])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1015
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1016 self.assertEqual(7, len(e[3]))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1017 self.assertEqual('Patient', e[3]['ResourceType'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1018 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['ID'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1019 self.assertEqual('/patients/6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['Path'])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1020 self.assertEqual('ozp00SjY2xG', e[3][patient])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1021
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1022 DropOrthanc(_REMOTE)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1023 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
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 def test_store_peer(self):
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1027 self.assertEqual(0, len(DoGet(_LOCAL, '/exports')['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1028 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1029
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1030 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1031 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1032 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1033
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1034 j = DoPost(_REMOTE, '/peers/peer/store', str(i), 'text/plain')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1035 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1036 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1037
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1038 self.assertEqual(1, len(DoGet(_REMOTE, '/exports')['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1039
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1040 DropOrthanc(_REMOTE)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1041 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1042
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1043
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1044 def test_bulk_storescu(self):
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1045 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
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 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1048 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1049
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1050 j = DoPost(_REMOTE, '/modalities/orthanctest/store', [ a['ID'], b['ID'] ], 'application/json')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1051 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1052
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1053 DropOrthanc(_LOCAL)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1054
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1055 # Send using patient's UUID
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1056 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1057 j = DoPost(_REMOTE, '/modalities/orthanctest/store',
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1058 [ 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' ], 'application/json')
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1059 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1060
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1061
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1062 def test_color(self):
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1063 i = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID']
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1064 im = GetImage(_REMOTE, '/instances/%s/preview' % i)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1065 self.assertEqual("RGB", im.mode)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1066 self.assertEqual(41, im.size[0])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1067 self.assertEqual(41, im.size[1])
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1068
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1069 # http://effbot.org/zone/pil-comparing-images.htm
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1070 truth = Image.open(GetDatabasePath('ColorTestMalaterre.png'))
11 c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1071 self.assertTrue(ImageChops.difference(im, truth).getbbox() is None)
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1072
c660a64ce2dd cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 10 diff changeset	1073
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1074 def test_faking_ruby_put(self):
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1075 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1076 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1077 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1078 a = DoGet(_REMOTE, '/patients')[0]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1079 b = DoGet(_REMOTE, '/patients')[1]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1080 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1081 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1082 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1083 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '1')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1084 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1085 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1086 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1087
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1088
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1089 def test_faking_ruby_delete(self):
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1090 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1091 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1092 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1093 a = DoGet(_REMOTE, '/patients')[0]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1094 b = DoGet(_REMOTE, '/patients')[1]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1095 DoGet(_REMOTE, '/patients/%s' % a, data = { '_method' : 'DELETE' })
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1096 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1097 DoGet(_REMOTE, '/patients/%s' % b, data = { '_method' : 'DELETE' })
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1098 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1099
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1100
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1101 def test_faking_google_put(self):
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1102 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1103 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1104 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1105 a = DoGet(_REMOTE, '/patients')[0]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1106 b = DoGet(_REMOTE, '/patients')[1]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1107 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1108 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	1109 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1110 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	1111 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1112 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	1113 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1114
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1115
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1116 def test_faking_google_delete(self):
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1117 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1118 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1119 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1120 a = DoGet(_REMOTE, '/patients')[0]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1121 b = DoGet(_REMOTE, '/patients')[1]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1122 DoPost(_REMOTE, '/patients/%s' % a, headers = { 'X-HTTP-Method-Override' : 'DELETE' })
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1123 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1124 DoPost(_REMOTE, '/patients/%s' % b, headers = { 'X-HTTP-Method-Override' : 'DELETE' })
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1125 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1126
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1127
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1128 def test_lua(self):
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1129 self.assertEqual(42, DoPost(_REMOTE, '/tools/execute-script', 'print(42)'))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1130 self.assertTrue(IsDefinedInLua(_REMOTE, 'PrintRecursive'))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1131 self.assertFalse(IsDefinedInLua(_REMOTE, 'HelloWorld'))
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1132
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1133
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1134 def test_metadata(self):
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1135 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1136 p = DoGet(_REMOTE, '/patients')[0]
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1137 i = DoGet(_REMOTE, '/instances')[0]
369 24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1138 series = DoGet(_REMOTE, '/series')[0]
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1139
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1140 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1141 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1142 self.assertEqual(2, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1143 self.assertTrue('MainDicomTagsSignature' in m)
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1144 else:
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1145 self.assertEqual(1, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1146 self.assertTrue('LastUpdate' in m)
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1147
369 24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1148 # 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	1149 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	1150 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	1151 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	1152
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1153 m = DoGet(_REMOTE, '/studies/%s/metadata' % DoGet(_REMOTE, '/studies')[0])
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1154 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1155 self.assertEqual(2, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1156 self.assertTrue('MainDicomTagsSignature' in m)
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1157 else:
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1158 self.assertEqual(1, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1159 self.assertTrue('LastUpdate' in m)
369 24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1160
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1161 m = DoGet(_REMOTE, '/series/%s/metadata' % series)
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1162 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1163 self.assertEqual(3, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1164 self.assertTrue('MainDicomTagsSignature' in m)
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1165 else:
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1166 self.assertEqual(2, len(m))
369 24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1167 self.assertTrue('LastUpdate' in m)
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1168
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1169 # New in Orthanc 1.9.0
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1170 self.assertTrue('RemoteAET' in m)
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1171 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	1172
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1173 m = DoGet(_REMOTE, '/instances/%s/metadata' % i)
547 7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1174 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1175 self.assertEqual(11, len(m))
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1176 elif IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1177 self.assertEqual(10, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1178 elif IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	1179 self.assertEqual(9, len(m))
547 7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1180 else:
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1181 self.assertEqual(8, len(m))
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1182
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1183 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1184 # ./Tests/GetPixelDataVR.py ./Database/Knee/T1/IM-0001-0001.dcm
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1185 self.assertTrue('PixelDataVR' in m) # New in Orthanc 1.12.1
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1186 self.assertEqual('OW', DoGet(_REMOTE, '/instances/%s/metadata/PixelDataVR' % i))
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1187
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1188 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1189 self.assertTrue('MainDicomTagsSignature' in m)
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1190
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1191 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	1192 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	1193 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	1194
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1195 self.assertTrue('IndexInSeries' in m)
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1196 self.assertTrue('ReceptionDate' in m)
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1197 self.assertTrue('RemoteAET' in m)
63 2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1198 self.assertTrue('Origin' in m)
89 74b7b9aed5f8 test TransferSyntax metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	1199 self.assertTrue('TransferSyntax' in m)
95 a807a4699eb4 testing of metadata SopClassUid Sebastien Jodogne <s.jodogne@gmail.com> parents: 92 diff changeset	1200 self.assertTrue('SopClassUid' in m)
145 69fecf5a3ff6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 144 diff changeset	1201 self.assertTrue('RemoteIP' in m)
69fecf5a3ff6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 144 diff changeset	1202 self.assertTrue('HttpUsername' in m)
63 2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1203 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	1204 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	1205 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	1206 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	1207 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	1208
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1209 # Play with custom metadata
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	1210 (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	1211 self.assertEqual('200', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	1212 self.assertEqual('', body)
394 e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1213
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1214 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	1215 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	1216 else:
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1217 self.assertFalse('ETag' in headers)
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1218 self.assertFalse('etag' in headers)
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1219
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1220 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1221 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1222 self.assertEqual(3, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1223 self.assertTrue('MainDicomTagsSignature' in m)
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1224 else:
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1225 self.assertEqual(2, len(m))
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1226 self.assertTrue('LastUpdate' in m)
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1227 self.assertTrue('5555' in m)
15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1228 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	1229
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1230 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1231 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	1232 'If-Match' : headers['etag']
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1233 })
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1234 else:
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1235 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'hello')
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	1236
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	1237 (headers, body) = DoGetRaw(_REMOTE, '/patients/%s/metadata/5555' % p)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	1238 self.assertEqual('200', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	1239 self.assertEqual('hello', body)
394 e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1240
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1241 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1242 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p, headers = {
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1243 'If-Match' : headers['etag']
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1244 })
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1245 else:
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1246 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p)
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1247
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1248 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1249 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1250 self.assertEqual(2, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1251 self.assertTrue('MainDicomTagsSignature' in m)
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1252 else:
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1253 self.assertEqual(1, len(m))
12 15c166240dfb cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 11 diff changeset	1254 self.assertTrue('LastUpdate' in m)
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1255
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1256
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1257 def test_statistics(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1258 # Upload 16 instances
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1259 for i in range(4):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1260 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1261 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1262 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1263 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1264
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1265 s = DoGet(_REMOTE, '/statistics')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1266 self.assertEqual(16, s['CountInstances'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1267 self.assertEqual(2, s['CountPatients'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1268 self.assertEqual(2, s['CountStudies'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1269 self.assertEqual(4, s['CountSeries'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1270 d = int(s['TotalUncompressedSize'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1271
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1272 e = 0
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1273 for patient in DoGet(_REMOTE, '/patients'):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1274 s = DoGet(_REMOTE, '/patients/%s/statistics' % patient)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1275 self.assertEqual(8, s['CountInstances'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1276 self.assertEqual(1, s['CountStudies'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1277 self.assertEqual(2, s['CountSeries'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1278 e += int(s['UncompressedSize'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1279
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1280 for study in DoGet(_REMOTE, '/studies'):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1281 s = DoGet(_REMOTE, '/studies/%s/statistics' % study)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1282 self.assertEqual(8, s['CountInstances'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1283 self.assertEqual(2, s['CountSeries'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1284 e += int(s['UncompressedSize'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1285
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1286 for series in DoGet(_REMOTE, '/series'):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1287 s = DoGet(_REMOTE, '/series/%s/statistics' % series)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1288 self.assertEqual(4, s['CountInstances'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1289 e += int(s['UncompressedSize'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1290
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1291 self.assertEqual(3 * d, e)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1292
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1293
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1294 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	1295 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	1296
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1297 patient = DoGet(_REMOTE, '/patients')[0]
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1298 instance = DoGet(_REMOTE, '/instances')[0]
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1299 size = int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1300 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1301
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1302 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient)))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1303 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	1304
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1305 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	1306 if IsDicomUntilPixelDataStored(_REMOTE):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1307 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	1308 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	1309
448 63f475995400 Orthanc 1.9.8 is now known as Orthanc 1.10.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 447 diff changeset	1310 # New in Orthanc 1.10.0
443 97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1311 a = DoGet(_REMOTE, '/instances/%s/attachments?full' % instance)
97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1312 self.assertEqual(2, len(a))
97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1313 self.assertEqual(1, a['dicom'])
97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1314 self.assertEqual(3, a['dicom-until-pixel-data'])
97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1315
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1316 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1317 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	1318
448 63f475995400 Orthanc 1.9.8 is now known as Orthanc 1.10.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 447 diff changeset	1319 # New in Orthanc 1.10.0
443 97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1320 a = DoGet(_REMOTE, '/instances/%s/attachments?full' % instance)
97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1321 self.assertEqual(1, len(a))
97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1322 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	1323 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	1324 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	1325 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	1326
448 63f475995400 Orthanc 1.9.8 is now known as Orthanc 1.10.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 447 diff changeset	1327 # New in Orthanc 1.10.0
443 97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1328 self.assertRaises(Exception, lambda: DoGet(
97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1329 _REMOTE, '/instances/%s/attachments?full' % instance))
97fca09bf849 test ?full in attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 442 diff changeset	1330
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1331 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/patients/%s/attachments/22' % patient, 'hello'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1332 hello = 'hellohellohellohellohellohellohellohellohello'
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1333 DoPut(_REMOTE, '/patients/%s/attachments/1025' % patient, hello)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1334 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1335 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1336 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1337 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient)))
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 DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1340 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1341 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1342 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1343 size +
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1344 int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient)) +
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1345 int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient)))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1346
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1347 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient)))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1348 self.assertEqual(hello, DoGet(_REMOTE, '/patients/%s/attachments/1025/data' % patient))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1349 self.assertEqual('world', DoGet(_REMOTE, '/patients/%s/attachments/1026/data' % patient))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1350 DoPost(_REMOTE, '/patients/%s/attachments/1025/verify-md5' % patient)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1351 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	1352 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	1353 'If-Match' : '0-%s' % ComputeMD5('world'),
392 5cbcb4a83b41 fix for revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 391 diff changeset	1354 })
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	1355
394 e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1356 (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	1357 self.assertEqual('200', headers['status'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	1358 self.assertEqual('world2', body)
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1359
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1360 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	1361 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	1362 'If-Match' : '0-%s' % ComputeMD5(hello),
392 5cbcb4a83b41 fix for revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 391 diff changeset	1363 })
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1364 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1365 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1366 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1367 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient)))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1368
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1369 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	1370
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1371 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1372 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient, headers = {
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1373 'If-Match' : headers['etag']
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1374 })
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1375 else:
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1376 self.assertFalse('etag' in headers)
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1377 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient)
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	1378
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1379 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient)))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1380
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1381 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), size)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1382 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1383
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1384
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1385 def test_incoming_storescu(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1386 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
45 a8cc12e9b268 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 44 diff changeset	1387 subprocess.check_call([ FindExecutable('storescu'),
44 ffa542cce638 Toolbox.FindExecutable() Sebastien Jodogne <s.jodogne@gmail.com> parents: 43 diff changeset	1388 _REMOTE['Server'], str(_REMOTE['DicomPort']),
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1389 GetDatabasePath('ColorTestImageJ.dcm') ])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1390 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1391
63 2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1392 i = DoGet(_REMOTE, '/instances')
2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1393 self.assertEqual(1, len(i))
2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1394 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	1395
547 7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1396 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1397 self.assertEqual(11, len(m))
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1398 elif IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1399 self.assertEqual(10, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1400 elif IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	1401 self.assertEqual(9, len(m))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	1402 else:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	1403 self.assertEqual(8, len(m))
547 7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1404
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1405 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1406 # ./Tests/GetPixelDataVR.py ./Database/ColorTestImageJ.dcm
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1407 self.assertTrue('PixelDataVR' in m) # New in Orthanc 1.12.1
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1408 self.assertEqual('OB', DoGet(_REMOTE, '/instances/%s/metadata/PixelDataVR' % i[0]))
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1409
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1410 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1411 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	1412
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1413 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
7de5fd295025 testing instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 543 diff changeset	1414 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	1415 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	1416
63 2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1417 self.assertTrue('IndexInSeries' in m)
2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1418 self.assertTrue('ReceptionDate' in m)
2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1419 self.assertTrue('RemoteAET' in m)
2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1420 self.assertTrue('Origin' in m)
89 74b7b9aed5f8 test TransferSyntax metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	1421 self.assertTrue('TransferSyntax' in m)
95 a807a4699eb4 testing of metadata SopClassUid Sebastien Jodogne <s.jodogne@gmail.com> parents: 92 diff changeset	1422 self.assertTrue('SopClassUid' in m)
145 69fecf5a3ff6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 144 diff changeset	1423 self.assertTrue('RemoteIP' in m)
69fecf5a3ff6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 144 diff changeset	1424 self.assertTrue('CalledAET' in m)
63 2652d562267a test Origin metadata of instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 62 diff changeset	1425 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	1426 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	1427 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	1428 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	1429 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	1430
369 24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1431 series = DoGet(_REMOTE, '/series')[0]
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1432 m = DoGet(_REMOTE, '/series/%s/metadata' % series)
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1433 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1434 self.assertEqual(3, len(m))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1435 self.assertTrue('MainDicomTagsSignature' in m)
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1436 else:
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	1437 self.assertEqual(2, len(m))
369 24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1438 self.assertTrue('LastUpdate' in m)
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1439 self.assertTrue('RemoteAET' in m)
24d93b42873a test "RemoteAET" metadata at series level Sebastien Jodogne <s.jodogne@gmail.com> parents: 368 diff changeset	1440 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	1441 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	1442 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	1443
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1444
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1445 def test_incoming_findscu(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1446 UploadInstance(_REMOTE, 'Multiframe.dcm')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1447 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1448
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1449 i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', '0010,0010' ])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1450 patientNames = re.findall('$0010,0010$.?\[(.?)\]', i)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1451 self.assertEqual(2, len(patientNames))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1452 self.assertTrue('Test Patient BG ' in patientNames)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1453 self.assertTrue('Anonymized' in patientNames)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1454
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1455 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0008,0021' ])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1456 series = re.findall('$0008,0021$.?\[\s(.?)\s\]', i)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1457 self.assertEqual(2, len(series))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1458 self.assertTrue('20070208' in series)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1459 self.assertTrue('19980312' in series)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1460
335 96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	1461 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	1462 series = re.findall('$0008,0021$.?\[\s(.?)\s\]', i)
1059b8de42de ModalitiesInStudy subtest Sebastien Jodogne <s.jodogne@gmail.com> parents: 55 diff changeset	1463 self.assertEqual(1, len(series))
1059b8de42de ModalitiesInStudy subtest Sebastien Jodogne <s.jodogne@gmail.com> parents: 55 diff changeset	1464 self.assertTrue('19980312' in series)
1059b8de42de ModalitiesInStudy subtest Sebastien Jodogne <s.jodogne@gmail.com> parents: 55 diff changeset	1465
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1466 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=Anonymized' ])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1467 series = re.findall('$0010,0010$.?\[\s(.?)\s\]', i)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1468 self.assertEqual(1, len(series))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1469
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1470 # Test the "CaseSentitivePN" flag (false by default)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1471 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=anonymized' ])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1472 series = re.findall('$0010,0010$.?\[\s(.?)\s\]', i)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1473 self.assertEqual(1, len(series))
66 821d9eb73c45 Test returning sequence values Sebastien Jodogne <s.jodogne@gmail.com> parents: 64 diff changeset	1474
70 9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1475 # Test range search (buggy if Orthanc <= 0.9.6)
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1476 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-' ])
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1477 studies = re.findall('$0008,0020$.?\[\s(.?)\s\]', i)
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1478 self.assertEqual(2, len(studies))
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1479 self.assertTrue('20070208' in studies)
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1480 self.assertTrue('19980312' in studies)
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1481 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-19980312' ])
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1482 studies = re.findall('$0008,0020$.?\[\s(.?)\s\]', i)
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1483 self.assertEqual(1, len(studies))
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1484 self.assertTrue('19980312' in studies)
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1485 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=-19980312' ])
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1486 studies = re.findall('$0008,0020$.?\[\s(.?)\s\]', i)
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1487 self.assertEqual(1, len(studies))
9e7b5809481f test range search Sebastien Jodogne <s.jodogne@gmail.com> parents: 69 diff changeset	1488 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	1489
05f48c19c60d Test "Retrieve AE Title" is returned by C-FIND SCP Sebastien Jodogne <s.jodogne@gmail.com> parents: 324 diff changeset	1490 # 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	1491 # 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	1492 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	1493 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	1494 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	1495 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	1496 self.assertEqual('ORTHANC', instances[1].strip())
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1497
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1498
191 bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1499 def test_incoming_findscu_2(self):
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1500 # This test fails if "LookupMode_DatabaseOnly" is used
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1501 # (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	1502 # DICOM tags are returned)
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1503 UploadInstance(_REMOTE, 'Multiframe.dcm')
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1504 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1505
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1506 # 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	1507 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	1508 sequences = re.findall('$0008,2112$', i)
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1509 self.assertEqual(1, len(sequences))
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1510
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1511 # Test returning a non-main DICOM tag,
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1512 # "SecondaryCaptureDeviceID" (0018,1010), whose value is
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1513 # "MEDPC" in "ColorTestImageJ.dcm"
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1514 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0018,1010' ])
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1515 tags = re.findall('$0018,1010$.*MEDPC', i)
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1516 self.assertEqual(1, len(tags))
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1517
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1518
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1519 def test_incoming_findscu_3(self):
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1520 # This test fails if "LookupMode_DatabaseOnly" or
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1521 # "LookupMode_DiskOnAnswer" is used, as
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1522 # "SecondaryCaptureDeviceID" (0018,1010) is not a main DICOM
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1523 # 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	1524 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1525
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1526 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	1527 sequences = re.findall('$0018,1010$', i)
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1528 self.assertEqual(1, len(sequences))
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1529
bc8bc83465dc testing C-FIND optimization Sebastien Jodogne <s.jodogne@gmail.com> parents: 189 diff changeset	1530
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1531 def test_incoming_movescu(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1532 UploadInstance(_REMOTE, 'Multiframe.dcm')
137 412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1533
412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1534 # No matching patient, so no job is created
412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1535 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1536 CallMoveScu([ '--patient', '-k', '0008,0052=PATIENT', '-k', 'PatientID=none' ])
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1537 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
137 412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1538
412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	1539 # 1 Matching patient, track the job
138 0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	1540 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	1541 '--patient',
0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	1542 '-k', '0008,0052=PATIENT',
0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	1543 '-k', 'PatientID=12345678'
0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	1544 ])))
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1545 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1546
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1547
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1548 def test_findscu(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1549 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1550 j = UploadInstance(_REMOTE, 'Issue22.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1551 k = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1552 DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1553
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1554 # Test the "find-patient" level
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1555 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1556 self.assertEqual(1, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1557 self.assertEqual('ozp00SjY2xG', p[0]['PatientID'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1558
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1559 # Test wildcards constraints. The "LO" value representation
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1560 # for PatientID is always case-sensitive, but the "PN" for
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1561 # PatientName might depend on the implementation:
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1562 # "GenerateConfigurationForTests.py" will force it to be case
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1563 # insensitive (which was the default until Orthanc 0.8.6).
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1564 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'K*' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1565 self.assertEqual(1, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1566
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1567 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'k*' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1568 self.assertEqual(1, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1569
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1570 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'ozp*' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1571 self.assertEqual(1, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1572
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1573 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'o?p*' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1574 self.assertEqual(1, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1575
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1576 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : '0?q*' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1577 self.assertEqual(0, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1578
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1579 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'B*' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1580 self.assertEqual(0, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1581
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1582 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'b*' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1583 self.assertEqual(0, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1584
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1585 DoPost(_REMOTE, '/modalities/orthanctest/store', str(j), 'text/plain')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1586 DoPost(_REMOTE, '/modalities/orthanctest/store', str(k), 'text/plain')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1587 DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1588 self.assertEqual(3, len(DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { })))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1589
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1590 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'A*' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1591 self.assertEqual(2, len(p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1592
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1593 # Test the "find-study" level. This is the instance "ColorTestImageJ.dcm"
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1594 s = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1595 self.assertEqual(1, len(s))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1596 self.assertEqual('20070208', s[0]['StudyDate'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1597
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1598 # Test range searches
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1599 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1600 'StudyDate' : '-20070101' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1601 self.assertEqual(0, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1602
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1603 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1604 'StudyDate' : '20090101-' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1605 self.assertEqual(0, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1606
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1607 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1608 'StudyDate' : '20070101-' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1609 self.assertEqual(1, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1610
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1611 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1612 'StudyDate' : '-20090101' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1613 self.assertEqual(1, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1614
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1615 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1616 'StudyDate' : '20070207-20070207' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1617 self.assertEqual(0, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1618
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1619 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1620 'StudyDate' : '20070208-20070208' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1621 self.assertEqual(1, len(t))
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 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1624 'StudyDate' : '20070209-20070209' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1625 self.assertEqual(0, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1626
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1627 # Test the ModalitiesInStudy tag
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1628 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', {
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1629 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1630 'ModalitiesInStudy' : 'US' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1631 self.assertEqual(0, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1632
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1633 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', {
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1634 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1635 'ModalitiesInStudy' : 'CT' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1636 self.assertEqual(1, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1637
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1638 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', {
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1639 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1640 'ModalitiesInStudy' : 'US\\CT' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1641 self.assertEqual(1, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1642
466 28a2c9452ec9 extra test with empty filter ModalitiesInStudy Alain Mazy <am@osimis.io> parents: 462 diff changeset	1643 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', {
28a2c9452ec9 extra test with empty filter ModalitiesInStudy Alain Mazy <am@osimis.io> parents: 462 diff changeset	1644 'PatientID' : 'B9uTHKOZ',
28a2c9452ec9 extra test with empty filter ModalitiesInStudy Alain Mazy <am@osimis.io> parents: 462 diff changeset	1645 'ModalitiesInStudy' : '' })
28a2c9452ec9 extra test with empty filter ModalitiesInStudy Alain Mazy <am@osimis.io> parents: 462 diff changeset	1646 self.assertEqual(1, len(t))
28a2c9452ec9 extra test with empty filter ModalitiesInStudy Alain Mazy <am@osimis.io> parents: 462 diff changeset	1647
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1648 # Test the "find-series" level
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1649 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', {
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1650 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1651 'StudyInstanceUID' : s[0]['StudyInstanceUID'] })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1652 self.assertEqual(1, 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 # Test "\" separator
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1655 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', {
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1656 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1657 'StudyInstanceUID' : s[0]['StudyInstanceUID'],
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1658 'Modality' : 'MR\\CT\\US' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1659 self.assertEqual(1, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1660
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1661 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', {
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1662 'PatientID' : 'B9uTHKOZ',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1663 'StudyInstanceUID' : s[0]['StudyInstanceUID'],
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1664 'Modality' : 'MR\\US' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1665 self.assertEqual(0, len(t))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1666
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1667
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1668 def test_update_modalities(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1669 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	1670 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/modalities/toto'))
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1671 DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000 ])
116 4a196ebc7a4f updated tests for issue #31 amazy parents: 112 diff changeset	1672 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	1673 DoDelete(_REMOTE, '/modalities/tata')
124 b110dc52ab38 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 123 diff changeset	1674 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoUniversalWildcard' ])
121 1a19f953f53c also test GenericNoWildcardInDates Sebastien Jodogne <s.jodogne@gmail.com> parents: 120 diff changeset	1675 DoDelete(_REMOTE, '/modalities/tata')
1a19f953f53c also test GenericNoWildcardInDates Sebastien Jodogne <s.jodogne@gmail.com> parents: 120 diff changeset	1676 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoWildcardInDates' ])
128 a9fdfcb696e6 added tests for ?expand in /peers and /modalities amazy parents: 127 diff changeset	1677 modalitiesReadback = DoGet(_REMOTE, '/modalities?expand')
182 7a6b532853ab modalities are now described as JSON objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	1678 self.assertEqual('STORESCP', modalitiesReadback['tata']['AET'])
7a6b532853ab modalities are now described as JSON objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	1679 self.assertEqual('localhost', modalitiesReadback['tata']['Host'])
7a6b532853ab modalities are now described as JSON objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	1680 self.assertEqual(2000, modalitiesReadback['tata']['Port'])
7a6b532853ab modalities are now described as JSON objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 181 diff changeset	1681 self.assertEqual('GenericNoWildcardInDates', modalitiesReadback['tata']['Manufacturer'])
116 4a196ebc7a4f updated tests for issue #31 amazy parents: 112 diff changeset	1682 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	1683 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/toto'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1684 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	1685
429cc9d03610 test access to the configuration of one single peer or modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1686 # 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	1687 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	1688 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	1689
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1690 DoDelete(_REMOTE, '/modalities/toto')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1691 DoDelete(_REMOTE, '/modalities/tata')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1692 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/toto'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1693 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/tata'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1694
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1695
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1696 def test_update_peers(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1697 # 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	1698 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	1699 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/peers/toto'))
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1700 DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/' ])
214 13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1701 DoPut(_REMOTE, '/peers/tata', { 'Url': 'http://localhost:8042/',
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1702 'Username': 'user',
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1703 'Password' : 'pass',
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1704 'RemoteSelf' : 'self' })
128 a9fdfcb696e6 added tests for ?expand in /peers and /modalities amazy parents: 127 diff changeset	1705 self.assertTrue('tata' in DoGet(_REMOTE, '/peers'))
a9fdfcb696e6 added tests for ?expand in /peers and /modalities amazy parents: 127 diff changeset	1706 peersReadback = DoGet(_REMOTE, '/peers?expand')
a9fdfcb696e6 added tests for ?expand in /peers and /modalities amazy parents: 127 diff changeset	1707 self.assertEqual('http://localhost:8042/', peersReadback['tata']['Url'])
a9fdfcb696e6 added tests for ?expand in /peers and /modalities amazy parents: 127 diff changeset	1708 self.assertEqual('user', peersReadback['tata']['Username'])
214 13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1709
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1710 if IsOrthancVersionAbove(_REMOTE, 1, 5, 4):
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1711 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	1712 self.assertFalse(peersReadback['tata']['Pkcs11']) # make sure no sensitive data is included
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1713 self.assertEqual('self', peersReadback['tata']['RemoteSelf'])
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1714 else:
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1715 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	1716 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	1717 self.assertFalse('RemoteSelf' in peersReadback['tata'])
13fa120c54a0 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 213 diff changeset	1718
128 a9fdfcb696e6 added tests for ?expand in /peers and /modalities amazy parents: 127 diff changeset	1719 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	1720 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	1721 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	1722
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1723 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a' ]))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1724 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	1725 self.assertTrue('store' in DoGet(_REMOTE, '/peers/toto'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1726 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	1727
429cc9d03610 test access to the configuration of one single peer or modality Sebastien Jodogne <s.jodogne@gmail.com> parents: 350 diff changeset	1728 # 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	1729 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	1730 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	1731
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1732 DoDelete(_REMOTE, '/peers/toto')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1733 DoDelete(_REMOTE, '/peers/tata')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1734 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1735 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/tata'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1736
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1737
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1738 def test_mesterhazy_modification(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1739 # When I modify a series ( eg. curl
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1740 # http://localhost:8042/series/uidhere/modify -X POST -d
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1741 # '{"Replace":{"SeriesDate":"19990101"}}' ) the modified
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1742 # series is added to a new Study, instead of the existing
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1743 # Study. Fixed in Orthanc 0.7.5
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1744
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1745 u = UploadInstance(_REMOTE, 'DummyCT.dcm')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1746 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0'
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1747 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe'
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1748
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1749 modified = DoPost(_REMOTE, '/series/%s/modify' % series,
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1750 json.dumps({ "Replace" : { "SeriesDate" : "19990101" }}))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1751
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1752 self.assertEqual(study, DoGet(_REMOTE, '/series/%s' % modified['ID']) ['ParentStudy'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1753
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1754
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1755 def test_create(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1756 i = DoPost(_REMOTE, '/tools/create-dicom',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1757 json.dumps({
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1758 'PatientName' : 'Jodogne',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1759 'Modality' : 'CT',
58 b5518378e23b fix test Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	1760 'SOPClassUID' : '1.2.840.10008.5.1.4.1.1.1',
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1761 'PixelData' : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==' # red dot in RGBA
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1762 }))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1763
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1764 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip())
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1765 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip())
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1766
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1767 png = GetImage(_REMOTE, '/instances/%s/preview' % i['ID'])
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1768 self.assertEqual((5, 5), png.size)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1769
38 d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	1770 j = DoGet(_REMOTE, i['Path'])
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	1771 self.assertEqual('Instance', j['Type'])
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	1772 self.assertEqual(j['ID'], i['ID'])
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	1773
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1774
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1775 def test_pilates(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1776 # "SCU failed error when accessing orthanc with osirix" by
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1777 # Pilates Agentur (Mar 10, 2014 at 9:33 PM)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1778 i = UploadInstance(_REMOTE, 'PilatesArgenturGEUltrasoundOsiriX.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1779 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1780 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1781 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1782
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1783
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1784 def test_shared_tags(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1785 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1786 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1787 p = DoGet(_REMOTE, '/patients')[0]
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1788
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1789 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1790 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	1791 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	1792
5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	1793 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	1794 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	1795 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	1796
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1797 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1798 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1799 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1800 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1801 self.assertFalse('0008,0018' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1802 self.assertFalse('SOPInstanceUID' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1803
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1804 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/tags' % a))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1805 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/tags?simplify' % a))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1806
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1807
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1808 def test_modules(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1809 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1810 p = DoGet(_REMOTE, '/patients')[0]
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1811 s = DoGet(_REMOTE, '/studies')[0]
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1812 t = DoGet(_REMOTE, '/series')[0]
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1813
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1814 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/module' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1815 self.assertTrue('PatientName' in DoGet(_REMOTE, '/patients/%s/module?simplify' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1816 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/studies/%s/module-patient' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1817 self.assertTrue('PatientName' in DoGet(_REMOTE, '/studies/%s/module-patient?simplify' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1818 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/studies/%s/module' % s))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1819 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/studies/%s/module?simplify' % s))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1820 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/series/%s/module' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1821 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/series/%s/module?simplify' % p))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1822 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/module' % a))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1823 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/module?simplify' % a))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1824
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1825
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1826 def test_auto_directory(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1827 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1828 self.assertTrue('now' in DoGet(_REMOTE, '/tools'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1829 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	1830 self.assertTrue('invalidate-tags' in DoGet(_REMOTE, '/tools'))
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1831 self.assertTrue(len(DoGet(_REMOTE, '/tools/dicom-conformance')) > 1000)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1832 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1833 self.assertTrue('echo' in DoGet(_REMOTE, '/modalities/orthanctest'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1834 self.assertTrue('find' in DoGet(_REMOTE, '/modalities/orthanctest'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1835 self.assertTrue('find-instance' in DoGet(_REMOTE, '/modalities/orthanctest'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1836 self.assertTrue('find-patient' in DoGet(_REMOTE, '/modalities/orthanctest'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1837 self.assertTrue('find-series' in DoGet(_REMOTE, '/modalities/orthanctest'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1838 self.assertTrue('find-study' in DoGet(_REMOTE, '/modalities/orthanctest'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1839 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/orthanctest'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1840 self.assertTrue('store' in DoGet(_REMOTE, '/peers/peer'))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1841 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	1842 self.assertTrue('raw' in DoGet(_REMOTE, '/instances/%s/frames/0' % a))
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1843 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/tools/nope'))
28 156c7ae164b5 new test Sebastien Jodogne <s.jodogne@gmail.com> parents: 27 diff changeset	1844 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope'))
156c7ae164b5 new test Sebastien Jodogne <s.jodogne@gmail.com> parents: 27 diff changeset	1845 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope/nope.html'))
156c7ae164b5 new test Sebastien Jodogne <s.jodogne@gmail.com> parents: 27 diff changeset	1846 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope')[0].status)
156c7ae164b5 new test Sebastien Jodogne <s.jodogne@gmail.com> parents: 27 diff changeset	1847 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope/nope.html')[0].status)
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1848
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1849
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1850 def test_echo(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1851 DoPost(_REMOTE, '/modalities/orthanctest/echo')
359 8b476a383999 test empty body in /modalities/.../echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 357 diff changeset	1852 DoPost(_REMOTE, '/modalities/orthanctest/echo', '{}')
8b476a383999 test empty body in /modalities/.../echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 357 diff changeset	1853
8b476a383999 test empty body in /modalities/.../echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 357 diff changeset	1854 # 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	1855 DoPost(_REMOTE, '/modalities/orthanctest/echo', '')
352 3d406c0261fc test /tools/dicom-echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 351 diff changeset	1856 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/nope/echo'))
3d406c0261fc test /tools/dicom-echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 351 diff changeset	1857
3d406c0261fc test /tools/dicom-echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 351 diff changeset	1858 # New in Orthanc 1.8.1
3d406c0261fc test /tools/dicom-echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 351 diff changeset	1859 DoPost(_REMOTE, '/tools/dicom-echo', [
355 95ee4e79825b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 354 diff changeset	1860 _REMOTE['DicomAet'], _REMOTE['Server'], _REMOTE['DicomPort'] ])
352 3d406c0261fc test /tools/dicom-echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 351 diff changeset	1861 DoPost(_REMOTE, '/tools/dicom-echo', DoGet(_REMOTE, '/modalities/orthanctest/configuration'))
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1862
353 49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1863 # Use the 'CheckFind' new option in Orthanc 1.8.1
49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1864 DoPost(_REMOTE, '/modalities/self/echo', { 'CheckFind' : True })
49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1865 DoPost(_REMOTE, '/tools/dicom-echo', {
49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1866 'AET' : _REMOTE['DicomAet'],
49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1867 'Host' : _REMOTE['Server'],
49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1868 'Port' : _REMOTE['DicomPort'],
49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1869 'CheckFind' : True
49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1870 })
49f2943544eb CheckFind on echo Sebastien Jodogne <s.jodogne@gmail.com> parents: 352 diff changeset	1871
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1872
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1873 def test_xml(self):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1874 json = DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/json' })
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1875 xml = minidom.parseString(DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/xml' }))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1876 items = xml.getElementsByTagName('root')[0].getElementsByTagName('item')
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1877 self.assertEqual(len(items), len(json))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1878
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1879 self.assertTrue('dicom-conformance' in json)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1880
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1881 ok = False
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1882 for i in items:
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1883 if i.childNodes[0].data == 'dicom-conformance':
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1884 ok = True
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1885 self.assertTrue(ok)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1886
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1887
46 85b2e36ed392 explicit GoogleCode source Sebastien Jodogne <s.jodogne@gmail.com> parents: 45 diff changeset	1888 def test_googlecode_issue_16(self):
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1889 i = UploadInstance(_REMOTE, 'Issue16.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1890 t = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)['FrameIncrementPointer']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1891 self.assertEqual('0018,1063', t)
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1892
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1893
46 85b2e36ed392 explicit GoogleCode source Sebastien Jodogne <s.jodogne@gmail.com> parents: 45 diff changeset	1894 def test_googlecode_issue_22(self):
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1895 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1896 a = [
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1897 "f804691f62197040438f4627c6b994f1", # Frame 0
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1898 "c69eee9a51eea3e8611e82e578897254",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1899 "315666be83e2d0111c77bc0996d84901",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1900 "3e27aa959d911172c48a1436443c72b1",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1901 "958642c9e7e9d232d3869faff546058c",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1902 "5e7ea8e3e4230cae707d143481355c59",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1903 "eda37f83558d858a596175aed8b2ad47",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1904 "486713bd2895c4ecbe0e97715ac7f80a",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1905 "091ef729eb169e67da8a0faa9631f9a8",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1906 "5aa2b8c7ffe0a483efaa8e12417686ca",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1907 "e2f39e85896fe58876654b94cd0b5013",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1908 "6fd2129e4950abbe1be053bc814d5da8",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1909 "c3331a8ba7a757f3d423735ab7fa81f9",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1910 "746f808582156734dd6b6fdfd3a0b72c",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1911 "8075ea2b227a70c60ea6b7b75a6bb190",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1912 "806b8b3e300c615099c11a5ec23465aa",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1913 "7c836aa298ba6eef96434579af631a11",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1914 "a0357dc9f4f72d73a885c33d7c287446",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1915 "f25ba3be1cc7d7fad95706adc199ea7d",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1916 "8b114c526b8cbed6cad8a3248b7b480c",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1917 "44e6670f127e612a2b4aa60a0d207698",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1918 "b8945f90fe02facf2ace24ca1ecbe0a5",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1919 "95c796c2fa8f59018b15cf2987b1f79b",
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1920 "ce0a51ab30224205b44920221dc27351", # Frame 23
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1921 ]
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1922
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1923 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s)))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1924 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/preview' % s))
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1925
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1926 for i in range(len(a)):
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1927 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	1928
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1929
46 85b2e36ed392 explicit GoogleCode source Sebastien Jodogne <s.jodogne@gmail.com> parents: 45 diff changeset	1930 def test_googlecode_issue_19(self):
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	1931 # 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	1932 # 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	1933
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1934 a = UploadInstance(_REMOTE, 'Issue19.dcm')['ID']
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	1935 if not HasGdcmPlugin(_REMOTE):
299 c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	1936 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	1937
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1938
46 85b2e36ed392 explicit GoogleCode source Sebastien Jodogne <s.jodogne@gmail.com> parents: 45 diff changeset	1939 def test_googlecode_issue_37(self):
13 7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1940 # 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	1941 u = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID']
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1942
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1943 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1944 'CaseSensitive' : True,
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1945 'Query' : { 'StationName' : 'SMR4-MP3' }})
7b69a561f4d3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 12 diff changeset	1946 self.assertEqual(1, len(a))
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	1947
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	1948
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	1949 def test_rest_find(self):
548 3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1950 # Upload 12 instances
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1951 for i in range(3):
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	1952 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	1953 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	1954 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	1955 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	1956
548 3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1957
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1958 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1959 'CaseSensitive' : True,
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1960 'Query' : {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1961 'PatientName' : 'NE',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1962 'StudyDate': '20080819'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1963 }})
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1964 self.assertEqual(1, len(a))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1965
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1966 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1967 'CaseSensitive' : True,
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1968 'Query' : {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1969 'PatientName' : 'NE',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1970 'PatientSex': '0000'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1971 }})
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1972 self.assertEqual(1, len(a))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1973
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1974 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1975 'CaseSensitive' : True,
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1976 'Query' : {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1977 'StudyInstanceUID' : '2.16.840.1.113669.632.20.121711.10000160881'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1978 }})
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1979 self.assertEqual(2, len(a))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1980
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1981 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1982 'CaseSensitive' : True,
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1983 'Query' : {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1984 'StudyInstanceUID' : '2.16.840.1.113669.632.20.121711.10000160881',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1985 '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	1986 }})
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1987 self.assertEqual(3, len(a))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1988
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1989 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1990 'CaseSensitive' : True,
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1991 'Query' : {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1992 'StudyDate' : '20080818-20080820',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1993 'Modality': 'MR'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1994 }})
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1995 self.assertEqual(2, len(a))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1996
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1997 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1998 'CaseSensitive' : True,
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	1999 'Query' : {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2000 'StudyDate' : '20080818-',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2001 'ModalitiesInStudy': 'MR'
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2002 }})
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2003 self.assertEqual(1, len(a))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2004
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2005
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2006 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2007 'CaseSensitive' : False,
194 9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2008 'Query' : { 'PatientName' : 'BRAINIX' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2009 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2010
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2011 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2012 'CaseSensitive' : False,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2013 'Query' : { 'PatientName' : 'BRAINIX\\KNEE\\NOPE' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2014 self.assertEqual(2, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2015
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2016 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2017 'CaseSensitive' : False,
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2018 'Query' : { 'PatientName' : 'n' }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2019 self.assertEqual(2, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2020
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2021 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2022 'CaseSensitive' : True,
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2023 'Query' : { 'PatientName' : 'n' }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2024 self.assertEqual(0, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2025
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2026 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True,
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2027 'Level' : 'Patient',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2028 'CaseSensitive' : False,
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2029 'Query' : { 'PatientName' : 'ne' }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2030 self.assertEqual(1, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2031 self.assertEqual('20080822', a[0]['MainDicomTags']['PatientBirthDate'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2032
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2033 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2034 'CaseSensitive' : True,
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2035 'Query' : { 'PatientName' : 'ne' }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2036 self.assertEqual(0, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2037
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2038 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2039 'CaseSensitive' : True,
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2040 'Query' : { 'PatientName' : 'NE' }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2041 self.assertEqual(1, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2042
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2043 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2044 'CaseSensitive' : True,
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2045 'Query' : { 'PatientName' : 'NE' }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2046 self.assertEqual(2, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2047
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2048 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2049 'CaseSensitive' : True,
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2050 'Query' : { 'PatientName' : 'NE' }})
548 3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2051 self.assertEqual(6, len(a))
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2052
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2053 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', 'Query' : { }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2054 self.assertEqual(2, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2055
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2056 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', 'Query' : { }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2057 self.assertEqual(2, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2058
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2059 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', 'Query' : { }})
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2060 self.assertEqual(4, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2061
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2062 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', 'Query' : { }})
548 3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	2063 self.assertEqual(12, len(a))
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2064
194 9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2065 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2066 'Expand' : True,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2067 'Query' : { 'StudyDate' : '20061201-20061201' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2068 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2069 self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName'])
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2070
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2071 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2072 'Expand' : True,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2073 'Query' : { 'StudyDate' : '20061201-20091201' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2074 self.assertEqual(2, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2075 for i in range(2):
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2076 self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE'])
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2077
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2078 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2079 'Query' : { 'StudyDate' : '20061202-20061202' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2080 self.assertEqual(0, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2081
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2082 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2083 'Expand' : True,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2084 'Query' : { 'StudyDate' : '-20061201' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2085 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2086 self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName'])
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2087
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2088 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2089 'Expand' : True,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2090 'Query' : { 'StudyDate' : '-20051201' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2091 self.assertEqual(0, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2092
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2093 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2094 'Expand' : True,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2095 'Query' : { 'StudyDate' : '20061201-' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2096 self.assertEqual(2, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2097 for i in range(2):
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2098 self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE'])
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2099
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2100 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2101 'Expand' : True,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2102 'Query' : { 'StudyDate' : '20061202-' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2103 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2104 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName'])
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2105
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2106 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2107 'Expand' : True,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2108 'Query' : { 'StudyDate' : '20080819-' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2109 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2110 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName'])
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2111
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2112 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2113 'Expand' : True,
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2114 'Query' : { 'StudyDate' : '20080820-' }})
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2115 self.assertEqual(0, len(a))
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2116
9f7ae64c0fda more tests about find Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	2117
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2118
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2119 def test_rest_query_retrieve(self):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2120 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2121
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2122 # Upload 8 instances
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2123 for i in range(2):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2124 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2125 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2126 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2127 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2128
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2129 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2130 for p in DoGet(_REMOTE, '/patients'):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2131 DoPost(_REMOTE, '/modalities/orthanctest/store', p)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2132 DoDelete(_REMOTE, '/patients/%s' % p)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2133
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2134 for q in DoGet(_REMOTE, '/queries'):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2135 DoDelete(_REMOTE, '/queries/%s' % q)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2136
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2137 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2138 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	2139
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	2140 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	2141 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	2142 '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	2143 '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	2144 '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	2145 }})['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	2146 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	2147
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	2148 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	2149 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	2150 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	2151 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	2152 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	2153 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	2154 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	2155 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	2156
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	2157 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	2158 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	2159 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	2160 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	2161 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	2162 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	2163
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	2164 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	2165
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	2166 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	2167 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	2168 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	2169
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	2170 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	2171 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	2172 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	2173
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	2174 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	2175 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	2176 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	2177 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	2178 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	2179 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	2180
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	2181 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	2182 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	2183 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	2184 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	2185 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	2186
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	2187 # 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	2188 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	2189 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	2190 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	2191 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	2192 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	2193 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	2194
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	2195 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	2196 self.assertEqual(0, len(DoGet(_REMOTE, '/queries')))
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2197
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2198
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2199 def test_parent(self):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2200 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2201 patient = '6816cb19-844d5aee-85245eba-28e841e6-2414fae2'
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2202 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0'
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2203 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe'
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2204 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d'
107 fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	2205 self.assertEqual(instance, u)
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2206
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2207 a = DoGet(_REMOTE, '/studies/%s/patient' % study)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2208 self.assertEqual('Patient', a['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2209 self.assertEqual(patient, a['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2210
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2211 a = DoGet(_REMOTE, '/series/%s/patient' % series)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2212 self.assertEqual('Patient', a['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2213 self.assertEqual(patient, a['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2214
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2215 a = DoGet(_REMOTE, '/series/%s/study' % series)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2216 self.assertEqual('Study', a['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2217 self.assertEqual(study, a['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2218
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2219 a = DoGet(_REMOTE, '/instances/%s/patient' % instance)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2220 self.assertEqual('Patient', a['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2221 self.assertEqual(patient, a['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2222
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2223 a = DoGet(_REMOTE, '/instances/%s/study' % instance)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2224 self.assertEqual('Study', a['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2225 self.assertEqual(study, a['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2226
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2227 a = DoGet(_REMOTE, '/instances/%s/series' % instance)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2228 self.assertEqual('Series', a['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2229 self.assertEqual(series, a['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2230
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2231
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2232 def test_shanon(self):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2233 def Anonymize(instance, replacements = {}):
119 7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	2234 return DoPost(_REMOTE, '/instances/%s/anonymize' % instance, {
7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	2235 'Replace' : replacements,
7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	2236 'Force' : True,
7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	2237 }, 'application/json')
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2238
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2239 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2240 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2241 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2242
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2243 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ]
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2244 ids = [ 'ozp00SjY2xG',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2245 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2246 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2247 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ]
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2248
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2249 a = ExtractDicomTags(Anonymize(u), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2250 for i in range(4):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2251 self.assertNotEqual(ids[i], a[i])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2252 self.assertTrue(a[4].startswith('Orthanc'))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2253
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2254 a = ExtractDicomTags(Anonymize(u, { 'PatientName' : 'toto' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2255 for i in range(4):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2256 self.assertNotEqual(ids[i], a[i])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2257 self.assertFalse(a[4].startswith('Orthanc'))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2258
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2259 a = ExtractDicomTags(Anonymize(u, { 'SOPInstanceUID' : 'instance' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2260 self.assertEqual('instance', a[3])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2261 self.assertFalse(a[4].startswith('Orthanc'))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2262
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2263 a = ExtractDicomTags(Anonymize(u, { 'SeriesInstanceUID' : 'series' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2264 self.assertEqual('series', a[2])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2265 self.assertFalse(a[4].startswith('Orthanc'))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2266
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2267 a = ExtractDicomTags(Anonymize(u, { 'StudyInstanceUID' : 'study' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2268 self.assertEqual('study', a[1])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2269 self.assertFalse(a[4].startswith('Orthanc'))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2270
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2271 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2272 self.assertEqual('patient', a[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2273 self.assertFalse(a[4].startswith('Orthanc'))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2274
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2275 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2276 'StudyInstanceUID' : 'study',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2277 'SeriesInstanceUID' : 'series',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2278 'SOPInstanceUID' : 'instance' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2279 self.assertEqual('patient', a[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2280 self.assertFalse(a[4].startswith('Orthanc'))
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 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2283
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2284
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2285 def test_shanon_2(self):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2286 def Modify(instance, replacements = {}):
119 7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	2287 return DoPost(_REMOTE, '/instances/%s/modify' % instance, {
7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	2288 'Replace' : replacements,
7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	2289 'Force': True,
7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	2290 }, 'application/json')
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2291
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2292 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2293 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2294 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2295
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2296 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ]
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2297 ids = [ 'ozp00SjY2xG',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2298 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2299 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2300 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ]
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2301
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2302 a = ExtractDicomTags(Modify(u), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2303 self.assertEqual(ids[0], a[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2304 self.assertEqual(ids[1], a[1])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2305 self.assertEqual(ids[2], a[2])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2306 self.assertNotEqual(ids[3], a[3])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2307 self.assertEqual(0, len(a[4]))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2308
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2309 a = ExtractDicomTags(Modify(u, { 'SOPInstanceUID' : 'instance' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2310 self.assertEqual(ids[0], a[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2311 self.assertEqual(ids[1], a[1])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2312 self.assertEqual(ids[2], a[2])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2313 self.assertEqual('instance', a[3])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2314
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2315 a = ExtractDicomTags(Modify(u, { 'SeriesInstanceUID' : 'series' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2316 self.assertEqual(ids[0], a[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2317 self.assertEqual(ids[1], a[1])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2318 self.assertEqual('series', a[2])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2319 self.assertNotEqual(ids[3], a[3])
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(Modify(u, { 'StudyInstanceUID' : 'study' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2322 self.assertEqual(ids[0], a[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2323 self.assertEqual('study', a[1])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2324 self.assertNotEqual(ids[2], a[2])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2325 self.assertNotEqual(ids[3], a[3])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2326
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2327 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2328 self.assertEqual('patient', a[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2329 self.assertNotEqual(ids[1], a[1])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2330 self.assertNotEqual(ids[2], a[2])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2331 self.assertNotEqual(ids[3], a[3])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2332
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2333 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2334 'StudyInstanceUID' : 'study',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2335 'SeriesInstanceUID' : 'series',
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2336 'SOPInstanceUID' : 'instance' }), tags)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2337 self.assertEqual('patient', a[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2338 self.assertEqual('study', a[1])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2339 self.assertEqual('series', a[2])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2340 self.assertEqual('instance', a[3])
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 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2343
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2344
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2345 def test_instances_tags(self):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2346 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2347 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')['ID']
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2348 #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	2349 #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	2350
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2351 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/patients')[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2352 self.assertEqual(2, len(i))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2353 self.assertEqual('887', i[i.keys()[0]]['PatientID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2354 self.assertEqual('887', i[i.keys()[1]]['PatientID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2355
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2356 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/studies')[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2357 self.assertEqual(2, len(i))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2358 self.assertEqual('887', i[i.keys()[0]]['PatientID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2359 self.assertEqual('887', i[i.keys()[1]]['PatientID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2360
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2361 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2362 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[0])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2363 self.assertEqual(1, len(i))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2364 self.assertEqual('887', i[i.keys()[0]]['PatientID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2365
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2366 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[1])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2367 self.assertEqual(1, len(i))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2368 self.assertEqual('887', i[i.keys()[0]]['PatientID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2369
136 5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	2370 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	2371 self.assertEqual(1, len(i))
5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	2372 self.assertEqual('887', i[i.keys()[0]]['0010,0020'])
5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	2373
14 ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2374
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2375 def test_lookup(self):
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2376 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG')
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2377 self.assertEqual(0, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2378
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2379 UploadInstance(_REMOTE, 'DummyCT.dcm')
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2380
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2381 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG')
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2382 self.assertEqual(1, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2383 self.assertEqual('Patient', a[0]['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2384 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', a[0]['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2385 self.assertEqual('/patients/%s' % a[0]['ID'], a[0]['Path'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2386
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2387 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	2388 self.assertEqual(1, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2389 self.assertEqual('Study', a[0]['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2390 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', a[0]['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2391 self.assertEqual('/studies/%s' % a[0]['ID'], a[0]['Path'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2392
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2393 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	2394 self.assertEqual(1, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2395 self.assertEqual('Series', a[0]['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2396 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', a[0]['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2397 self.assertEqual('/series/%s' % a[0]['ID'], a[0]['Path'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2398
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2399 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	2400 self.assertEqual(1, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2401 self.assertEqual('Instance', a[0]['Type'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2402 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', a[0]['ID'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2403 self.assertEqual('/instances/%s' % a[0]['ID'], a[0]['Path'])
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2404
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2405 DropOrthanc(_REMOTE)
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2406 a = DoPost(_REMOTE, '/tools/lookup', '3113719P')
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2407 self.assertEqual(0, len(a))
ed9a9fe66002 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 13 diff changeset	2408
15 2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2409
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2410 def test_autorouting(self):
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2411 knee1 = 'Knee/T1/IM-0001-0001.dcm'
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2412 knee2 = 'Knee/T2/IM-0001-0002.dcm'
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2413 other = 'Brainix/Flair/IM-0001-0001.dcm'
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2414
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2415 # Check that this version is >= 0.8.0
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2416 self.assertTrue(IsDefinedInLua(_REMOTE, '_InitializeJob'))
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2417 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities'))
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2418
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2419 UploadInstance(_REMOTE, knee1)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2420 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2421
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2422 DropOrthanc(_REMOTE)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2423 DropOrthanc(_LOCAL)
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	2424 InstallLuaScriptFromPath(_REMOTE, 'Lua/Autorouting.lua')
15 2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2425 UploadInstance(_REMOTE, knee1)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2426 UploadInstance(_REMOTE, knee2)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2427 UploadInstance(_REMOTE, other)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2428 WaitEmpty(_REMOTE)
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	2429 UninstallLuaCallbacks(_REMOTE)
15 2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2430 self.assertEqual(3, len(DoGet(_LOCAL, '/instances')))
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2431
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2432 DropOrthanc(_REMOTE)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2433 DropOrthanc(_LOCAL)
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	2434 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingConditional.lua')
15 2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2435 UploadInstance(_REMOTE, knee1)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2436 UploadInstance(_REMOTE, knee2)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2437 UploadInstance(_REMOTE, other)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2438 WaitEmpty(_REMOTE)
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	2439 UninstallLuaCallbacks(_REMOTE)
15 2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2440 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2441
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2442 DropOrthanc(_REMOTE)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2443 DropOrthanc(_LOCAL)
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	2444 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingModification.lua')
15 2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2445 UploadInstance(_REMOTE, knee1)
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2446 WaitEmpty(_REMOTE)
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	2447 UninstallLuaCallbacks(_REMOTE)
15 2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2448 i = DoGet(_LOCAL, '/instances')
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2449 self.assertEqual(1, len(i))
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2450
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2451 with tempfile.NamedTemporaryFile(delete = True) as f:
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2452 f.write(DoGet(_LOCAL, '/instances/%s/file' % i[0]))
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2453 f.flush()
45 a8cc12e9b268 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 44 diff changeset	2454 routed = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ])
15 2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2455 self.assertEqual('My Medical Device', re.search('"StationName">(.*?)<', routed).group(1).strip())
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2456 self.assertEqual(None, re.search('"MilitaryRank"', routed))
2e5dbbbe3889 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 14 diff changeset	2457 self.assertEqual(None, re.search('"0051,0010"', routed)) # A private tag
17 7c8500991a12 karsten Sebastien Jodogne <s.jodogne@gmail.com> parents: 15 diff changeset	2458
7c8500991a12 karsten Sebastien Jodogne <s.jodogne@gmail.com> parents: 15 diff changeset	2459
7c8500991a12 karsten Sebastien Jodogne <s.jodogne@gmail.com> parents: 15 diff changeset	2460 def test_storescu_rf(self):
7c8500991a12 karsten Sebastien Jodogne <s.jodogne@gmail.com> parents: 15 diff changeset	2461 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
7c8500991a12 karsten Sebastien Jodogne <s.jodogne@gmail.com> parents: 15 diff changeset	2462 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
7c8500991a12 karsten Sebastien Jodogne <s.jodogne@gmail.com> parents: 15 diff changeset	2463 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
7c8500991a12 karsten Sebastien Jodogne <s.jodogne@gmail.com> parents: 15 diff changeset	2464 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
18 16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2465
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2466
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2467 def test_anonymize_instance(self):
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2468 def AnonymizeAndUpload(instanceId, parameters):
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2469 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/anonymize' % instanceId, parameters,
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2470 'application/json'), 'application/dicom')['ID']
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2471
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2472 def ModifyAndUpload(instanceId, parameters):
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2473 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/modify' % instanceId, parameters,
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2474 'application/json'), 'application/dicom')['ID']
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2475
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2476 a = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID']
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2477 s1 = DoGet(_REMOTE, '/instances/%s/content/PatientName' % a)
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2478 s2 = DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % a) # Some private tag
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2479 s3 = DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % a)
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2480 s4 = DoGet(_REMOTE, '/instances/%s/content/SeriesDescription' % a)
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2481 s5 = DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a)
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2482
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2483 b = AnonymizeAndUpload(a, '{}')
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2484 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2485 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2486
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2487 # Keep private tag (only OK since Orthanc 0.8.0)
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2488 b = AnonymizeAndUpload(a, '{"Keep":["00e1-10c2"]}')
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2489 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2490 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2491
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2492 b = AnonymizeAndUpload(a, '{"Keep":["00e1,10c2","PatientName"]}')
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2493 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2494 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2495
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2496 b = AnonymizeAndUpload(a, '{"Keep":["PatientName"],"Replace":{"00e1,10c2":"Hello"}}')
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2497 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2498 self.assertTrue(DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b).startswith('Hello'))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2499
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2500 # Examples from the Wiki
118 a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	2501 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	2502 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2503 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2504 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2505 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2506 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2507 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2508 DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a)
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2509 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2510
118 a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	2511 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	2512 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2513 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2514 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2515 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2516 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2517 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2518
118 a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	2519 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Force":true}')
18 16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2520 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2521 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2522 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1,10c2' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2523 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2524 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2525 self.assertEqual(s5, DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2526
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2527
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2528 # Test modify non-existing
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2529 i = DoPost(_REMOTE, '/tools/create-dicom',
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2530 json.dumps({
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2531 'PatientName' : 'Jodogne',
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2532 'Modality' : 'CT',
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2533 }))['ID']
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2534
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2535 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2536 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % i))
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2537 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i).strip())
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 b = ModifyAndUpload(i, '{"Replace":{"StudyDescription":"hello","Modality":"world"}}')
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2540 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2541 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2542 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/Modality' % b).strip())
16c37933384d test Sebastien Jodogne <s.jodogne@gmail.com> parents: 17 diff changeset	2543
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2544
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2545 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	2546 # 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	2547 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	2548
468 e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2549 def storescu(image, acceptUnknownSopClassUid, expectSuccess = True, retries = 1):
61 967d44407308 test UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	2550 if acceptUnknownSopClassUid:
967d44407308 test UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	2551 tmp = [ '-xf', GetDatabasePath('UnknownSopClassUid.cfg'), 'Default' ]
967d44407308 test UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	2552 else:
967d44407308 test UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	2553 tmp = [ '-xs' ]
967d44407308 test UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	2554
468 e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2555 while retries > 0:
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2556 retries -= 1
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2557 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	2558 try:
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2559 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	2560 [ _REMOTE['Server'], str(_REMOTE['DicomPort']),
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2561 GetDatabasePath(image) ],
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2562 stderr = FNULL)
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2563
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2564 if expectSuccess:
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2565 return
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2566 except subprocess.CalledProcessError as e:
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2567 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	2568 if not expectSuccess:
e1867aeb57e2 retries storescu if it succeeds while it should fail Alain Mazy <am@osimis.io> parents: 465 diff changeset	2569 raise e
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2570
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2571 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	2572
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2573 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	2574 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	2575 '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	2576 ])
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2577 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	2578 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	2579 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	2580 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	2581 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	2582 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	2583 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	2584 else:
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2585 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	2586
490 10a47656e34f new tests for MaximumStorageMode Alain Mazy <am@osimis.io> parents: 488 diff changeset	2587 # 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	2588 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	2589 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	2590 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	2591
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2592 if IsOrthancVersionAbove(_REMOTE, 1, 9, 0):
374 78bef07c4118 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 373 diff changeset	2593 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	2594 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	2595 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	2596 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	2597 else:
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes Sebastien Jodogne <s.jodogne@gmail.com> parents: 372 diff changeset	2598 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	2599
62 f9c4ce95756f removal of useless information Sebastien Jodogne <s.jodogne@gmail.com> parents: 61 diff changeset	2600 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	2601 storescu('Knix/Loc/IM-0001-0001.dcm', False)
967d44407308 test UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	2602 storescu('UnknownSopClassUid.dcm', True)
967d44407308 test UnknownSopClassAccepted option Sebastien Jodogne <s.jodogne@gmail.com> parents: 60 diff changeset	2603 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2604
463 29aaa3df718f added verbosity and retries for test sometimes failing on CI Alain Mazy <am@osimis.io> parents: 457 diff changeset	2605 # set back normal verbosity
29aaa3df718f added verbosity and retries for test sometimes failing on CI Alain Mazy <am@osimis.io> parents: 457 diff changeset	2606 DoPut(_REMOTE, '/tools/log-level', 'default')
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2607
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2608 def test_storescu_jpeg(self):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2609 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2610
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2611 knixStudy = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0'
64 369e439cdfd6 test access header Sebastien Jodogne <s.jodogne@gmail.com> parents: 63 diff changeset	2612 i = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm')['ID']
369e439cdfd6 test access header Sebastien Jodogne <s.jodogne@gmail.com> parents: 63 diff changeset	2613
369e439cdfd6 test access header Sebastien Jodogne <s.jodogne@gmail.com> parents: 63 diff changeset	2614 # This is JPEG lossless
136 5634ef96fcc5 testing "short" option Sebastien Jodogne <s.jodogne@gmail.com> parents: 133 diff changeset	2615 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	2616 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	2617 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	2618
21 2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2619 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm')
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2620 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0003.dcm')
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2621
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2622 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	2623 b = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2624 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2625 DoPost(_REMOTE, '/modalities/orthanctest/store', [ knixStudy, a, b ])
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2626 self.assertEqual(5, len(DoGet(_LOCAL, '/instances')))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2627
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2628 self.assertEqual(3, len(DoGet(_REMOTE, '/exports')['Exports']))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2629
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2630 DropOrthanc(_REMOTE)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2631 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2632
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2633
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2634 def test_pixel_data(self):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2635 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	2636 color = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2637 phenix = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2638
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2639 phenixSize = 358 * 512 * 2
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2640 colorSize = 1000 * 1000 * 3
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2641 jpegSize = 51918
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2642
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2643 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	2644 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	2645 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	2646
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2647 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	2648 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	2649
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2650 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	2651 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	2652
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2653
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2654 def test_decode_brainix(self):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2655 brainix = [
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2656 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'], # (*)
384 9a41306c1fe5 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 383 diff changeset	2657 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	2658 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	2659 ]
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2660 h = '6fb11b932d535c2be04beabd99793ff8'
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2661 maxValue = 426.0
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2662
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2663 truth = Image.open(GetDatabasePath('Formats/Brainix.png'))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2664 for i in brainix:
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2665 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % i)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2666 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % i)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2667
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2668 truth2 = map(lambda x: min(255, x), truth.getdata())
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2669 for i in brainix:
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2670 self.AssertSameImages(truth2, '/instances/%s/image-uint8' % i)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2671
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2672 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	2673 for i in brainix:
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2674 self.AssertSameImages(truth2, '/instances/%s/preview' % i)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2675
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2676 for i in brainix:
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2677 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	2678
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2679
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2680 def test_decode_color(self):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2681 imagej = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2682 color = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2683
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2684 for i in [ imagej, color ]:
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2685 for j in [ 'image-uint8', 'image-uint16', 'image-int16' ]:
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2686 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	2687
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2688 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	2689 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	2690
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2691 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	2692 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	2693
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 def test_decode_rf(self):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2696 rf = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2697 truth = Image.open(GetDatabasePath('Formats/KarstenHilbertRF.png'))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2698
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2699 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % rf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2700 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % rf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2701 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % rf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2702 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % rf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2703
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2704 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	2705
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2706
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2707 def test_decode_multiframe(self):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2708 mf = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID']
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 # Test the first frame
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2711 truth = Image.open(GetDatabasePath('Formats/Multiframe0.png'))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2712 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % mf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2713 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % mf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2714 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % mf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2715 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % mf)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2716 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	2717
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2718 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	2719
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2720 # Test the last frame
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2721 truth = Image.open(GetDatabasePath('Formats/Multiframe75.png'))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2722 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	2723
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2724
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2725 def test_decode_signed(self):
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2726 signed = UploadInstance(_REMOTE, 'SignedCT.dcm')['ID']
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2727 minValue = -2000
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2728 maxValue = 4042
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/SignedCT.png'))
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2731 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % signed)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2732
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2733 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	2734 self.AssertSameImages(truth2, '/instances/%s/image-uint16' % signed)
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2735
2a29bcff60a7 tests of image decoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 18 diff changeset	2736 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	2737 self.AssertSameImages(truth3, '/instances/%s/image-uint8' % signed)
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 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	2740 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	2741 self.AssertSameImages(tmp, '/instances/%s/preview' % signed)
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 self.assertEqual('b57e6c872a3da50877c7da689b03a444', ComputeMD5(DoGet(_REMOTE, '/instances/%s/matlab' % signed)))
22 8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2744
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2745
46 85b2e36ed392 explicit GoogleCode source Sebastien Jodogne <s.jodogne@gmail.com> parents: 45 diff changeset	2746 def test_googlecode_issue_32(self):
92 dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2747 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/default-encoding', 'nope'))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2748 self.assertEqual('Windows1251', DoPut(_REMOTE, '/tools/default-encoding', 'Windows1251'))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2749 self.assertEqual('Windows1251', DoGet(_REMOTE, '/tools/default-encoding'))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2750
22 8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2751 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID']
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2752 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f)
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2753 self.assertEqual(u'Рентгенография', tags['SeriesDescription'])
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2754 self.assertEqual(u'Таз', tags['BodyPartExamined'])
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2755 self.assertEqual(u'Прямая', tags['ViewPosition'])
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2756
92 dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2757 # 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	2758 self.assertEqual('Latin1', DoPut(_REMOTE, '/tools/default-encoding', 'Latin1'))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2759
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2760 DoDelete(_REMOTE, '/instances/%s' % f)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2761 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID']
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2762 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2763 self.assertNotEqual(u'Рентгенография', tags['SeriesDescription'])
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2764
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	2765
22 8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2766 def test_encodings(self):
23 30ecc857fa07 test latin-2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	2767 # Latin-1 (ISO_IR 100)
22 8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2768 brainix = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID']
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2769 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % brainix)
8f4b70c89467 readme Sebastien Jodogne <s.jodogne@gmail.com> parents: 21 diff changeset	2770 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	2771
30ecc857fa07 test latin-2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	2772 # Latin-2 (ISO_IR 101)
30ecc857fa07 test latin-2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	2773 a = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID']
30ecc857fa07 test latin-2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	2774 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % a)
30ecc857fa07 test latin-2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	2775 # 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	2776 self.assertEqual('Imię i Nazwisko osoby opisującej',
30ecc857fa07 test latin-2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	2777 i['ContentSequence'][4]['ConceptNameCodeSequence'][0]['CodeMeaning'].encode('utf-8'))
30ecc857fa07 test latin-2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 22 diff changeset	2778
26 040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2779
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2780 def test_storescu_custom_aet(self):
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2781 # 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	2782 # 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	2783 # in the REST API)."
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2784 # 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	2785
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2786 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2787
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2788 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2789 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2790 c = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0003.dcm')
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2791
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2792 j = DoPost(_REMOTE, '/modalities/orthanctest/store', {
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2793 'LocalAet' : 'YOP',
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2794 'Resources' : [ a['ID'], b['ID'] ]
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2795 })
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2796
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2797 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2798 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	2799
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2800 DropOrthanc(_LOCAL)
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2801 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2802
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2803 j = DoPost(_REMOTE, '/modalities/orthanctest/store', {
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2804 'Resources' : [ c['ID'] ]
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2805 })
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2806
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2807 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2808 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	2809
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2810 DropOrthanc(_REMOTE)
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2811 DropOrthanc(_LOCAL)
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2812
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	2813 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingChangeAet.lua')
26 040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2814 DoPost(_REMOTE, '/tools/execute-script', 'aet = "HELLO"', 'application/lua')
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2815
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2816 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2817 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2818 WaitEmpty(_REMOTE)
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2819 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2820 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	2821
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2822 DoPost(_REMOTE, '/tools/execute-script', 'aet = nill', 'application/lua')
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2823 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2824 WaitEmpty(_REMOTE)
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2825 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet Sebastien Jodogne <s.jodogne@gmail.com> parents: 23 diff changeset	2826 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	2827
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2828 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	2829 # 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	2830 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	2831 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	2832 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	2833 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	2834 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	2835
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2836 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	2837 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	2838 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	2839 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	2840
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2841 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	2842 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	2843
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2844 self.assertEqual(0, len(DoGet(_REMOTE, '/patients?since=0&limit=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	2845 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	2846 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	2847 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	2848 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	2849 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	2850 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	2851 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	2852 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	2853 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	2854 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	2855 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	2856 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	2857 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	2858 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	2859
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2860 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	2861 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	2862 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	2863 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	2864 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	2865 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	2866 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	2867
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2868 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	2869 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	2870 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	2871
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API Sebastien Jodogne <s.jodogne@gmail.com> parents: 28 diff changeset	2872 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	2873 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	2874 self.assertTrue(instance in s)
36 42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2875
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2876
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2877 def test_create_pdf(self):
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2878 # Upload 4 instances
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2879 brainixInstance = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2880 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2881 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2882 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2883
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2884 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0'
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2885 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988'
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2886 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8'
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2887
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2888 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f:
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2889 pdf = f.read()
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2890
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2891 i = DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2892 json.dumps({
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2893 'Tags' : {
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2894 'PatientName' : 'Jodogne',
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2895 'Modality' : 'CT',
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2896 },
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2897 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2898 }))
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2899
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2900 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip())
446 9184e6cb215a allow custom value for "Modality" in /tools/create-dicom for PDF Sebastien Jodogne <s.jodogne@gmail.com> parents: 445 diff changeset	2901 # 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	2902 # 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	2903 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	2904
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2905 b = DoGet(_REMOTE, '/instances/%s/content/0042-0011' % i['ID'])
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2906 self.assertEqual(len(b), len(pdf) + 1)
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2907 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf + '\0'))
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2908
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2909 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2910 json.dumps({
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2911 'Parent' : brainixPatient,
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2912 'Tags' : {
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2913 'PatientName' : 'Jodogne',
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2914 }
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2915 })))
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2916
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2917 i = DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2918 json.dumps({
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2919 'Parent' : brainixPatient,
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2920 'Tags' : { 'StudyDescription' : 'PDF^Patient' },
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2921 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2922 }))
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2923
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2924 self.assertEqual(brainixPatient, DoGet(_REMOTE, '/instances/%s/patient' % i['ID'])['ID'])
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2925
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2926 i = DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2927 json.dumps({
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2928 'Parent' : brainixStudy,
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2929 'Tags' : { 'SeriesDescription' : 'PDF^Study' },
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2930 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2931 }))
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2932
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2933 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	2934
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2935 i = DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2936 json.dumps({
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2937 'Parent' : brainixEpi,
37 6f86a5168e68 test Sebastien Jodogne <s.jodogne@gmail.com> parents: 36 diff changeset	2938 'Tags' : { 'SpecificCharacterSet' : 'ISO_IR 13' },
36 42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2939 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2940 }))
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2941
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2942 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	2943
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2944 b = DoGet(_REMOTE, '/instances/%s/pdf' % i['ID'])
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2945 self.assertEqual(len(b), len(pdf))
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2946 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf))
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2947
42ad759ef40a test PDF embedding Sebastien Jodogne <s.jodogne@gmail.com> parents: 34 diff changeset	2948 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	2949
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	2950
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	2951 def test_create_series(self):
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	2952 i = DoPost(_REMOTE, '/tools/create-dicom',
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	2953 json.dumps({
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	2954 'Tags' : {
40 8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2955 'SpecificCharacterSet' : 'ISO_IR 100',
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2956 'PatientName' : 'Sébastien Jodogne',
38 d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	2957 'Modality' : 'CT',
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	2958 },
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	2959 'Content' : [
40 8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2960 {
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2961 'Content': 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==', # red dot in RGBA
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2962 'Tags' : { 'ImageComments' : 'Tutu' }
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2963 },
38 d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	2964 '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	2965 ]
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	2966 }))
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	2967
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	2968 s = DoGet(_REMOTE, i['Path'])
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	2969 self.assertEqual('Series', s['Type'])
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	2970 self.assertEqual(s['ID'], i['ID'])
d147e36c6d18 test_create_series Sebastien Jodogne <s.jodogne@gmail.com> parents: 37 diff changeset	2971 self.assertEqual(2, len(s['Instances']))
39 7412a437ab47 test Sebastien Jodogne <s.jodogne@gmail.com> parents: 38 diff changeset	2972 self.assertEqual(2, s['ExpectedNumberOfInstances'])
7412a437ab47 test Sebastien Jodogne <s.jodogne@gmail.com> parents: 38 diff changeset	2973 self.assertEqual('Complete', s['Status'])
40 8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2974
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2975 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][0])
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2976 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][1])
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2977 self.assertTrue('ImageComments' in a or 'ImageComments' in b)
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2978 if 'ImageComments' in a:
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2979 self.assertEqual('Tutu', a['ImageComments'])
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2980 else:
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2981 self.assertEqual('Tutu', b['ImageComments'])
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2982
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2983 patient = DoGet(_REMOTE, '/instances/%s/patient' % s['Instances'][0])
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2984 self.assertEqual(patient['MainDicomTags']['PatientName'].encode('utf-8'),
8fb14554b27c test Sebastien Jodogne <s.jodogne@gmail.com> parents: 39 diff changeset	2985 'Sébastien Jodogne')
47 f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	2986
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	2987
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	2988 def test_create_binary(self):
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	2989 binary = ''.join(map(chr, range(256)))
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	2990 encoded = 'data:application/octet-stream;base64,' + base64.b64encode(binary)
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	2991 tags = {
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	2992 'PatientName' : 'Jodogne',
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	2993 '8899-8899' : encoded
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	2994 }
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	2995
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	2996 i = DoPost(_REMOTE, '/tools/create-dicom',
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	2997 json.dumps({
266 b105bb2233c6 fix issue 140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 265 diff changeset	2998 'Tags' : tags,
b105bb2233c6 fix issue 140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 265 diff changeset	2999 'PrivateCreator' : 'TestBinary',
47 f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3000 }))
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3001
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3002 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	3003 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	3004
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3005 i = DoPost(_REMOTE, '/tools/create-dicom',
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3006 json.dumps({
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3007 'InterpretBinaryTags' : False,
266 b105bb2233c6 fix issue 140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 265 diff changeset	3008 'Tags' : tags,
b105bb2233c6 fix issue 140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 265 diff changeset	3009 'PrivateCreator' : 'TestBinary',
47 f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3010 }))
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3011
f610491f74c3 test_create_binary Sebastien Jodogne <s.jodogne@gmail.com> parents: 46 diff changeset	3012 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	3013 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	3014
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3015
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3016 def test_patient_ids_collision(self):
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3017 # 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	3018 # same PatientID
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3019 for i in range(3):
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3020 UploadInstance(_REMOTE, 'PatientIdsCollision/Image%d.dcm' % (i + 1))
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3021
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3022 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3023 'Query' : { 'PatientName' : '*' }})
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3024 self.assertEqual(1, len(a))
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3025 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	3026
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3027 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3028 'CaseSensitive' : True,
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3029 'Query' : { 'PatientName' : 'FOO\\HELLO' }})
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3030 self.assertEqual(2, len(a))
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3031
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3032 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3033 'CaseSensitive' : False,
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3034 'Query' : { 'PatientName' : 'Foo' }})
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3035 self.assertEqual(1, len(a))
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3036 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	3037 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	3038 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	3039
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3040 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3041 'Query' : { 'PatientName' : '*' }})
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3042 self.assertEqual(3, len(a))
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3043 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	3044 self.assertTrue('FOO^SERIES' in d)
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3045 self.assertTrue('HELLO^SERIES' in d)
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3046 self.assertTrue('WORLD^SERIES' in d)
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3047
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3048 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	3049 self.assertEqual(1, len(set(d)))
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3050 self.assertEqual('COMMON', d[0])
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3051
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3052 for i in a:
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3053 d = DoGet(_REMOTE, '/studies/%s' % i) ['MainDicomTags']['StudyDescription']
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3054 p = DoGet(_REMOTE, '/studies/%s' % i) ['PatientMainDicomTags']['PatientName']
e4352463ff74 test_patient_ids_collision Sebastien Jodogne <s.jodogne@gmail.com> parents: 47 diff changeset	3055 self.assertEqual('%s^SERIES' % p, d)
49 e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3056
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3057
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3058 def test_bitbucket_issue_4(self):
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3059 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3060 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3061 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm')
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3062 UploadInstance(_REMOTE, 'Formats/Jpeg.dcm')
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3063 UploadInstance(_REMOTE, 'Formats/JpegLossless.dcm')
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3064 UploadInstance(_REMOTE, 'Formats/Rle.dcm')
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3065
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3066 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3067 self.assertEqual(6, len(DoGet(_REMOTE, '/instances')))
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3068
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3069 p = DoGet(_REMOTE, '/patients')
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3070 self.assertEqual(2, len(p))
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3071 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	3072 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	3073 self.assertEqual(3, len(i1))
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3074 self.assertEqual(3, len(i2))
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3075
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3076 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	3077
e7f9b8199545 test_bitbucket_issue_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 48 diff changeset	3078 self.assertEqual(6, len(DoGet(_LOCAL, '/instances')))
50 8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3079
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3080
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3081 def test_create_sequence(self):
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3082 i = DoPost(_REMOTE, '/tools/create-dicom',
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3083 json.dumps({
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3084 'Tags' : {
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3085 'SpecificCharacterSet': 'ISO_IR 100', # Encode using Latin1
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3086 'PatientName': 'Jodogne^',
51 264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3087 'ReferencedStudySequence': GenerateTestSequence(),
50 8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3088 }
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3089 }))['ID']
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3090
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3091 self.assertEqual('Jodogne^', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i))
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3092 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	3093 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	3094 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	3095 self.assertEqual(u'Sébastien^'.encode('latin-1'),
8de63d56cf11 test_create_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 49 diff changeset	3096 DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence/1/StudyDescription' % i))
51 264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3097
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3098
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3099 def test_modify_sequence(self):
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3100 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID']
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3101 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	3102
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3103 j = DoPost(_REMOTE, '/instances/%s/modify' % i,
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3104 json.dumps({
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3105 "Replace" : {
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3106 "PatientName" : "hello",
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3107 'ReferencedStudySequence': GenerateTestSequence(),
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3108 },
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3109 }),
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3110 'application/json')
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3111 j = DoPost(_REMOTE, '/instances', j, 'application/dicom')['ID']
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3112 DoDelete(_REMOTE, '/instances/%s' % i)
264a20a0276d test_modify_sequence Sebastien Jodogne <s.jodogne@gmail.com> parents: 50 diff changeset	3113
52 7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3114 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence' % j)))
7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3115
7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3116
7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3117 def test_compression(self):
7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3118 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3119
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3120 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	3121 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	3122 # 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	3123 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	3124 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	3125 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3126 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	3127 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	3128 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	3129
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3130 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	3131
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3132 # 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	3133 # 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	3134 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	3135 DoPost(_REMOTE, '/instances/%s/attachments/dicom/uncompress' % i)
52 7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3136
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3137 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	3138 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	3139 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	3140 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	3141 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	3142 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	3143 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	3144
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3145 ops = DoGet(_REMOTE, '/instances/%s/attachments/dicom' % i)
52 7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3146 self.assertTrue('compress' in ops)
7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3147 self.assertTrue('uncompress' in ops)
7c08e542db23 test_compression Sebastien Jodogne <s.jodogne@gmail.com> parents: 51 diff changeset	3148 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	3149 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	3150 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	3151
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3152 # Re-compress the attachment
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3153 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	3154 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	3155 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	3156 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	3157 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	3158 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	3159 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	3160 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	3161 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	3162 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	3163
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3164 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	3165 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	3166 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	3167 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	3168 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	3169 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	3170 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	3171 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	3172 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	3173 self.assertEqual(us, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']))
53 e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3174
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3175
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3176 def test_ordered_slices(self):
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3177 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3178 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3179 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s)
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3180 self.assertEqual('Sequence', o['Type'])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3181 self.assertEqual(1, len(o['Dicom']))
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3182 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	3183 self.assertEqual(76, len(o['Slices']))
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3184 for j in range(76):
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3185 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	3186
68 a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3187 self.assertEqual(1, len(o['SlicesShort']))
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3188 self.assertEqual('9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02', o['SlicesShort'][0][0])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3189 self.assertEqual(0, o['SlicesShort'][0][1])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3190 self.assertEqual(76, o['SlicesShort'][0][2])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3191
53 e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3192 i = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3193 j = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')['ID']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3194 k = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm')['ID']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3195 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3196 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s)
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3197
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3198 self.assertEqual('Volume', o['Type'])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3199 self.assertEqual(3, len(o['Dicom']))
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3200 self.assertEqual(3, len(o['Slices']))
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3201 self.assertEqual('/instances/%s/file' % i, o['Dicom'][2])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3202 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3203 self.assertEqual('/instances/%s/file' % k, o['Dicom'][0])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3204 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][2])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3205 self.assertEqual('/instances/%s/frames/0' % j, o['Slices'][1])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3206 self.assertEqual('/instances/%s/frames/0' % k, o['Slices'][0])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3207
68 a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3208 self.assertEqual(3, len(o['SlicesShort']))
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3209 self.assertEqual(k, o['SlicesShort'][0][0])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3210 self.assertEqual(0, o['SlicesShort'][0][1])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3211 self.assertEqual(1, o['SlicesShort'][0][2])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3212 self.assertEqual(j, o['SlicesShort'][1][0])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3213 self.assertEqual(0, o['SlicesShort'][1][1])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3214 self.assertEqual(1, o['SlicesShort'][1][2])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3215 self.assertEqual(i, o['SlicesShort'][2][0])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3216 self.assertEqual(0, o['SlicesShort'][2][1])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3217 self.assertEqual(1, o['SlicesShort'][2][2])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3218
53 e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3219 i = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3220 j = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0002.dcm')['ID']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3221 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3222 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s)
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3223
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3224 self.assertEqual('Sequence', o['Type'])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3225 self.assertEqual(2, len(o['Dicom']))
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3226 self.assertEqual(2, len(o['Slices']))
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3227 self.assertEqual('/instances/%s/file' % i, o['Dicom'][0])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3228 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3229 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][0])
e0d1ee04119f test_ordered_slices Sebastien Jodogne <s.jodogne@gmail.com> parents: 52 diff changeset	3230 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	3231
68 a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3232 self.assertEqual(2, len(o['SlicesShort']))
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3233 self.assertEqual(i, o['SlicesShort'][0][0])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3234 self.assertEqual(0, o['SlicesShort'][0][1])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3235 self.assertEqual(1, o['SlicesShort'][0][2])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3236 self.assertEqual(j, o['SlicesShort'][1][0])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3237 self.assertEqual(0, o['SlicesShort'][1][1])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3238 self.assertEqual(1, o['SlicesShort'][1][2])
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3239
a8d1a347a701 SlicesShort Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	3240
54 c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3241
c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3242 def test_incoming_movescu_accession(self):
c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3243 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3244
137 412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	3245 # No matching patient, so no job is created
54 c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3246 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3247 CallMoveScu([ '--study', '-k', '0008,0052=STUDY', '-k', 'AccessionNumber=nope' ])
c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3248 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3249 CallMoveScu([ '--study', '-k', '0008,0052=PATIENT', '-k', 'AccessionNumber=A10003245599' ])
c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3250 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
137 412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	3251
412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	3252 # 1 Matching patient, track the job
138 0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	3253 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	3254 '--study',
0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	3255 '-k', '0008,0052=STUDY',
0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	3256 '-k', 'AccessionNumber=A10003245599'
0682740fcfcb cleanup Sebastien Jodogne <s.jodogne@gmail.com> parents: 137 diff changeset	3257 ])))
137 412d5f70447e testing asynchronous c-move Sebastien Jodogne <s.jodogne@gmail.com> parents: 136 diff changeset	3258
54 c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3259 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
c5f8a6b0d85e test_incoming_movescu_accession Sebastien Jodogne <s.jodogne@gmail.com> parents: 53 diff changeset	3260
55 a395fd51cc4f test_dicom_to_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 54 diff changeset	3261
a395fd51cc4f test_dicom_to_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 54 diff changeset	3262 def test_dicom_to_json(self):
a395fd51cc4f test_dicom_to_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 54 diff changeset	3263 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	3264 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	3265
cd3c7f70f139 test backward compatibility with Orthanc 0.9.4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	3266 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	3267 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	3268 self.assertTrue(CompareTags(t, json.loads(f.read()), [
123 ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	3269 # Tags for compatibility with DCMTK 3.6.0
ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	3270 'RETIRED_OtherPatientIDs',
ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	3271 'OtherPatientIDs',
ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	3272 'ACR_NEMA_2C_VariablePixelDataGroupLength',
80 8466dbfcb22b fix test against dcmtk 3.6.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	3273 ]))
55 a395fd51cc4f test_dicom_to_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 54 diff changeset	3274
a395fd51cc4f test_dicom_to_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 54 diff changeset	3275 t = DoGet(_REMOTE, '/instances/%s/tags' % i)
a395fd51cc4f test_dicom_to_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 54 diff changeset	3276 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	3277 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	3278 ]))
55 a395fd51cc4f test_dicom_to_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 54 diff changeset	3279
60 cd3c7f70f139 test backward compatibility with Orthanc 0.9.4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	3280 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	3281 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	3282 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	3283 ]))
60 cd3c7f70f139 test backward compatibility with Orthanc 0.9.4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 59 diff changeset	3284
372 e9b03d8f3b78 fix for DCMTK 3.6.6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 369 diff changeset	3285
e9b03d8f3b78 fix for DCMTK 3.6.6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 369 diff changeset	3286 # 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	3287 # following command:
e9b03d8f3b78 fix for DCMTK 3.6.6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 369 diff changeset	3288 # $ 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	3289 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	3290 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	3291 a = json.loads(f.read())
378 a4b8450a1158 fix test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 377 diff changeset	3292
a4b8450a1158 fix test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 377 diff changeset	3293 # 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	3294 # 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	3295 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	3296 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	3297 self.assertFalse('7fe1,1001' in t)
378 a4b8450a1158 fix test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 377 diff changeset	3298 del a['7fe1,0010']
a4b8450a1158 fix test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 377 diff changeset	3299 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	3300 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3301 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	3302 self.assertTrue('7fe1,1001' in t)
378 a4b8450a1158 fix test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 377 diff changeset	3303
65 09fc27e0899a patch for testing windows builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 64 diff changeset	3304 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	3305 tt = (json.dumps(t)
e9b03d8f3b78 fix for DCMTK 3.6.6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 369 diff changeset	3306 .replace('2e+022', '2e+22')
e9b03d8f3b78 fix for DCMTK 3.6.6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 369 diff changeset	3307 # 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	3308 .replace('IllegalPrivatePixelSequence', 'Unknown Tag & Data'))
65 09fc27e0899a patch for testing windows builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 64 diff changeset	3309 self.assertEqual(aa, tt)
57 784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3310
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3311
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3312 def test_batch_archive(self):
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3313 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3314 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3315 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3316 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0002.dcm')
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3317 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3318 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3319 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3320 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm')
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3321
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3322 s = DoPost(_REMOTE, '/tools/create-archive', [ ])
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3323 z = zipfile.ZipFile(StringIO(s), "r")
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3324 self.assertEqual(0, len(z.namelist()))
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3325
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3326 # One patient
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3327 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	3328 z = zipfile.ZipFile(StringIO(s), "r")
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3329 self.assertEqual(4, len(z.namelist()))
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3330
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3331 # One patient + twice its study + one series from other patient
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3332 s = DoPost(_REMOTE, '/tools/create-archive', [
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3333 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17',
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3334 '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918',
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3335 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0'
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3336 ])
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3337 z = zipfile.ZipFile(StringIO(s), "r")
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3338 self.assertEqual(6, len(z.namelist()))
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3339
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3340 # One patient + one series + one instance
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3341 s = DoPost(_REMOTE, '/tools/create-archive', [
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3342 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17',
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3343 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0',
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3344 '1d429ccb-bdcc78a1-7d129d6a-ba4966ed-fe4dbd87'
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3345 ])
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3346 z = zipfile.ZipFile(StringIO(s), "r")
784a544706cf test_batch_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 56 diff changeset	3347 self.assertEqual(7, len(z.namelist()))
59 84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3348
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3349
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3350 def test_decode_brainix_as_jpeg(self):
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3351 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	3352
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3353 j = GetImage(_REMOTE, '/instances/%s/preview' % i)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3354 self.assertEqual('PNG', j.format)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3355 self.assertEqual(j.size[0], 256)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3356 self.assertEqual(j.size[1], 256)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3357
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3358 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	3359 self.assertEqual('PNG', j.format)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3360
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3361 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	3362 self.assertEqual('PNG', j.format)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3363
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3364 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	3365 self.assertEqual('PNG', j.format)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3366
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3367 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	3368 self.assertEqual('JPEG', j.format)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3369 self.assertEqual(j.size[0], 256)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3370 self.assertEqual(j.size[1], 256)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3371
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3372 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	3373 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	3374 self.assertLess(a, b)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3375
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3376 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	3377 self.assertEqual('JPEG', j.format)
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3378
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3379 # 16bit encoding is not supported with JPEG
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3380 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	3381 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	3382
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3383 # No matching content type
84378ada15ab test_decode_brainix_as_jpeg Sebastien Jodogne <s.jodogne@gmail.com> parents: 58 diff changeset	3384 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	3385
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3386
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3387
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3388 def test_media_encodings(self):
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3389 ascii = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3390 latin1 = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID']
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3391 latin2 = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID']
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3392
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3393 tmp = DoPost(_REMOTE, '/tools/create-media', [ascii,latin1,latin2])
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3394 z = zipfile.ZipFile(StringIO(tmp), "r")
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3395
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3396 self.assertEqual(4, len(z.namelist()))
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3397 self.assertTrue('IMAGES/IM0' in z.namelist())
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3398 self.assertTrue('IMAGES/IM1' in z.namelist())
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3399 self.assertTrue('IMAGES/IM2' in z.namelist())
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3400 self.assertTrue('DICOMDIR' in z.namelist())
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3401
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3402 try:
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3403 os.remove('/tmp/DICOMDIR')
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3404 except:
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3405 # The file does not exist
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3406 pass
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3407
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3408 z.extract('DICOMDIR', '/tmp')
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3409 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ],
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3410 stderr = subprocess.STDOUT).split('\n')
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3411
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3412 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ],
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3413 stderr = subprocess.STDOUT).split('\n')
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3414 self.assertEqual(1, len(a))
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3415 self.assertEqual('', a[0])
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3416
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3417 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ])
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3418 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	3419 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	3420 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	3421
83fd88230097 test_media_encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 68 diff changeset	3422 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	3423
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3424
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3425 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	3426 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	3427 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	3428 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	3429
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3430 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	3431 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	3432 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	3433 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	3434
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3435 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	3436 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	3437 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	3438 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	3439
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3440 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	3441 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	3442 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	3443 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	3444
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3445 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	3446 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	3447 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	3448 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	3449
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3450 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	3451 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	3452 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	3453 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	3454
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3455 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	3456 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	3457 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	3458 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	3459 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	3460
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3461 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	3462 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	3463 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	3464 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	3465 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	3466 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	3467
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3468 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	3469 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	3470 self.assertEqual(1, len(s))
176 48cc188ffb09 strip trailing 0 char that appears with some findscu versions am@osimis.io parents: 175 diff changeset	3471 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	3472 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	3473 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	3474
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find Sebastien Jodogne <s.jodogne@gmail.com> parents: 70 diff changeset	3475
78 b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3476 def test_decode_transfer_syntax(self):
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3477 def Check(t, md5):
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3478 i = UploadInstance(_REMOTE, 'TransferSyntaxes/%s.dcm' % t)['ID']
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3479
89 74b7b9aed5f8 test TransferSyntax metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	3480 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	3481 transferSyntax = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i)
74b7b9aed5f8 test TransferSyntax metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	3482 self.assertEqual(t, transferSyntax)
74b7b9aed5f8 test TransferSyntax metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 87 diff changeset	3483
78 b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3484 if md5 == None:
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3485 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	3486 else:
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3487 m = ComputeMD5(DoGet(_REMOTE, '/instances/%s/preview' % i))
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3488 self.assertEqual(m, md5)
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3489
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3490 Check('1.2.840.10008.1.2.1', 'fae08d5415c4c0cd2cdbae4522408631')
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3491 Check('1.2.840.10008.1.2.2', 'f3d9784768b8feb54d6a50b6d5c37682')
b89af51797ff test_decode_transfer_syntax Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	3492 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	3493 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	3494 Check('1.2.840.10008.1.2.4.70', '7132cfbc457305b04b59787030c785d2')
384 9a41306c1fe5 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 383 diff changeset	3495 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	3496 Check('1.2.840.10008.1.2', 'd54aed9f67a100984b42942cc2e9939b')
9a41306c1fe5 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 383 diff changeset	3497
9a41306c1fe5 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 383 diff changeset	3498 # The 3 checks below don't work on big-endian
9a41306c1fe5 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 383 diff changeset	3499 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	3500 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	3501 Check('1.2.840.10008.1.2.4.81', '801579ae7cbf28e604ea74f2c99fa2ca')
299 c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	3502
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	3503 # JPEG2k image, not supported without GDCM plugin
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	3504 if not HasGdcmPlugin(_REMOTE):
299 c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	3505 Check('1.2.840.10008.1.2.4.90', None)
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	3506 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	3507
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3508
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3509 def test_raw_frame(self):
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3510 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID']
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3511 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s)))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3512 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s)
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3513 self.assertEqual(512 * 512 * 2, len(a))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3514 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	3515 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	3516 self.assertEqual('1914287dc4d958eca21fdaacfb3482fa', ComputeMD5(a))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3517
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3518 s = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID']
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3519 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % s)))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3520 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	3521 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	3522 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	3523 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s)
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3524 self.assertEqual("L", im.mode)
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3525 self.assertEqual(512, im.size[0])
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3526 self.assertEqual(512, im.size[1])
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3527
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3528 # 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	3529 s = UploadInstance(_REMOTE, 'LenaTwiceWithFragments.dcm')['ID']
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3530 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/frames' % s)))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3531 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s)
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3532 b = DoGet(_REMOTE, '/instances/%s/frames/1/raw' % s)
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3533 self.assertEqual(69214, len(a))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3534 self.assertEqual(ComputeMD5(a), ComputeMD5(b))
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3535 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	3536 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s)
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3537 self.assertEqual("RGB", im.mode)
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3538 self.assertEqual(512, im.size[0])
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3539 self.assertEqual(512, im.size[1])
323 fbf5bdebbba7 comment Sebastien Jodogne <s.jodogne@gmail.com> parents: 322 diff changeset	3540 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	3541 self.assertEqual("RGB", im.mode)
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3542 self.assertEqual(512, im.size[0])
962274ebd797 test_raw_frame Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	3543 self.assertEqual(512, im.size[1])
81 5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3544
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3545
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3546
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3547 def test_rest_movescu(self):
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3548 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3549
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3550 # Upload 4 instances
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3551 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3552 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm')
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3553 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3554 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3555
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3556 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3557 for p in DoGet(_REMOTE, '/patients'):
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3558 DoPost(_REMOTE, '/modalities/orthanctest/store', p)
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3559 DoDelete(_REMOTE, '/patients/%s' % p)
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3560
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3561 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3562
482 535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3563 # Move instance Brainix/Flair/IM-0001-0001.dcm
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3564 DoPost(_REMOTE, '/modalities/orthanctest/move', {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3565 'Level' : 'Instance',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3566 'Resources' : [
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3567 {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3568 '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	3569 '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	3570 '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	3571 }
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3572 ]})
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3573
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3574 # Move series Brainix/Flair/*
81 5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3575 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3576 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3577 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3578 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3579
482 535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3580 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1):
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3581 # Reset and test asynchronous C-Move at instance level
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3582 for p in DoGet(_REMOTE, '/patients'):
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3583 DoDelete(_REMOTE, '/patients/%s' % p)
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3584
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3585 DoPost(_REMOTE, '/modalities/orthanctest/move', {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3586 'Level' : 'Instance',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3587 'Resources' : [
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3588 {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3589 '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	3590 '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	3591 '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	3592 }
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3593 ],
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3594 'Asynchronous': True
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3595 })
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3596
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3597 job = MonitorJob2(_REMOTE, lambda: DoPost
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3598 (_REMOTE, '/modalities/orthanctest/move', {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3599 'Level' : 'Instance',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3600 'Resources' : [
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3601 {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3602 '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	3603 '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	3604 '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	3605 }
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3606 ],
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3607 'Asynchronous': True
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3608 }))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3609
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3610 self.assertNotEqual(None, job)
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3611
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3612 # check the job was successfull
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3613 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3614 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3615 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3616 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3617
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3618 # check the job content
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3619 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content']
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3620 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	3621 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	3622 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	3623
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3624 # Reset and test synchronous C-Move at series level
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3625 for p in DoGet(_REMOTE, '/patients'):
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3626 DoDelete(_REMOTE, '/patients/%s' % p)
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3627
81 5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3628 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series',
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3629 'Resources' : [
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3630 {
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3631 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775',
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3632 '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	3633 }
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3634 ]})
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3635 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3636 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3637 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3638 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3639
482 535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3640 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1):
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3641 # 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	3642 for p in DoGet(_REMOTE, '/patients'):
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3643 DoDelete(_REMOTE, '/patients/%s' % p)
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3644
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3645 job = MonitorJob2(_REMOTE, lambda: DoPost
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3646 (_REMOTE, '/modalities/orthanctest/move', {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3647 'Level' : 'Series',
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 'PatientID' : '5Yp0E',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3651 '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	3652 '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	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 'Asynchronous': True
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3656 }))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3657
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3658 self.assertNotEqual(None, job)
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3659
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3660 # check the job was successfull
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3661 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3662 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3663 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3664 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3665
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3666 # check the job content
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3667 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content']
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3668 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	3669 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	3670 self.assertEqual('5Yp0E', jobContent['Query'][0]['0010,0020'])
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3671
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3672 # Move series Brainix/Epi/*
81 5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3673 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series',
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3674 'Resources' : [
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3675 {
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3676 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775',
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3677 '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	3678 }
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3679 ]})
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3680 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3681 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3682 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3683 self.assertEqual(3, len(DoGet(_REMOTE, '/instances')))
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3684
482 535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3685 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1):
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3686 # Move study Knee asynchronously
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3687 job = MonitorJob2(_REMOTE, lambda: DoPost
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3688 (_REMOTE, '/modalities/orthanctest/move', {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3689 'Level' : 'Study',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3690 'Resources' : [
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 '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	3693 }
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3694 ],
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3695 'Asynchronous': True
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3696 }))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3697
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3698 self.assertNotEqual(None, job)
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 was successfull
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3701 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3702 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3703 self.assertEqual(3, len(DoGet(_REMOTE, '/series')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3704 self.assertEqual(4, len(DoGet(_REMOTE, '/instances')))
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 # check the job content
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3707 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content']
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3708 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	3709
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3710 # Reset
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3711 for p in DoGet(_REMOTE, '/patients'):
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3712 DoDelete(_REMOTE, '/patients/%s' % p)
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3713
5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3714 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
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
482 535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3717 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1):
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3718 # Move all at once asynchronously at PatientLevel
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3719 job = MonitorJob2(_REMOTE, lambda: DoPost(_REMOTE, '/modalities/orthanctest/move',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3720 {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3721 'Level' : 'Patient',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3722 'Resources' : [
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3723 {
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3724 'PatientID' : '5Yp0E',
81 5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3725 },
482 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 'PatientID': '887',
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3728 'PatientName' : 'KNEE',
81 5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3729 }
482 535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3730 ],
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3731 'Synchronous': False
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3732 }))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3733
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3734 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3735 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3736 self.assertEqual(3, len(DoGet(_REMOTE, '/series')))
535e651e70a2 added test for asynchronous cmove Alain Mazy <am@osimis.io> parents: 473 diff changeset	3737 self.assertEqual(4, len(DoGet(_REMOTE, '/instances')))
81 5920954287dd test_rest_movescu Sebastien Jodogne <s.jodogne@gmail.com> parents: 80 diff changeset	3738
86 0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3739
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3740
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3741 def test_reconstruct_json(self):
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3742 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3743
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3744 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3745 first = DoGet(_REMOTE, '/instances/%s/tags' % instance)
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3746
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3747 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	3748
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3749 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	3750 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	3751 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3752 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	3753
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3754 # Cannot delete the "DICOM" attachment
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3755 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	3756
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3757 # Can delete the "DICOM as JSON" attachment
392 5cbcb4a83b41 fix for revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 391 diff changeset	3758 if not IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
5cbcb4a83b41 fix for revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 391 diff changeset	3759 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	3760 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	3761
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3762 # Only the "DICOM" attachment subsists
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3763 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance)))
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3764
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3765 # Cannot manually reconstruct the "DICOM as JSON" attachment
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3766 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	3767
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3768 # Transparently reconstruct the "DICOM as JSON" attachment
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3769 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	3770 second = DoGet(_REMOTE, '/instances/%s/tags' % instance)
0401ef51f5c1 test_reconstruct_json Sebastien Jodogne <s.jodogne@gmail.com> parents: 83 diff changeset	3771 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	3772
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3773 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	3774 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	3775 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3776 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	3777 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	3778 self.assertEqual(str(first), str(third))
87 4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3779
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3780
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3781 def test_reconstruct_json2(self):
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3782 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3783
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3784 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	3785 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	3786
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3787 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	3788 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	3789
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3790 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	3791 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	3792
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3793 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	3794 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	3795 self.assertEqual(aa, bb)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3796 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	3797 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	3798 elif IsDicomUntilPixelDataStored(_REMOTE):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3799 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	3800 self.assertEqual(aa, bb)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3801 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	3802 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	3803 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3804 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	3805 self.assertEqual(aa, bb)
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3806 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	3807
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3808 # 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	3809 DoPost(_REMOTE, '/tools/invalidate-tags', '', 'text/plain')
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3810
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3811 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	3812 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	3813 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	3814 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3815 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	3816 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	3817
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3818 # 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	3819 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	3820 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	3821
380 b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3822 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	3823 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	3824 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	3825 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	3826 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	3827 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	3828
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3829
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3830 def test_private_tags(self):
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3831 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID']
4b24faec842b test_reconstruct_json2 + test_private_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 86 diff changeset	3832 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	3833 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	3834 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	3835
92 dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3836
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3837 def test_findscu_encoding(self):
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3838 # Check out ../Database/Encodings/Generate.sh
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3839 TEST = u'Test-éüäöòДΘĝדصķћ๛ﾈİ'
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3840 ENCODINGS = {
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3841 'Arabic' : [ 'ISO_IR 127' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3842 'Ascii' : [ 'ISO_IR 6' ], # More accurately, ISO 646
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3843 'Cyrillic' : [ 'ISO_IR 144' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3844 'Greek' : [ 'ISO_IR 126' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3845 'Hebrew' : [ 'ISO_IR 138' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3846 'Japanese' : [ 'ISO_IR 13', 'shift-jis' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3847 'Latin1' : [ 'ISO_IR 100' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3848 'Latin2' : [ 'ISO_IR 101' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3849 'Latin3' : [ 'ISO_IR 109' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3850 'Latin4' : [ 'ISO_IR 110' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3851 'Latin5' : [ 'ISO_IR 148' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3852 'Thai' : [ 'ISO_IR 166', 'tis-620' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3853 'Utf8' : [ 'ISO_IR 192' ],
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3854 }
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3855
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3856 for name in ENCODINGS.iterkeys():
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3857 if len(ENCODINGS[name]) == 1:
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3858 ENCODINGS[name].append(name.lower())
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3859
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3860 UploadInstance(_REMOTE, 'Encodings/Lena-utf8.dcm')
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3861
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3862 for name in ENCODINGS.iterkeys():
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3863 self.assertEqual(name, DoPut(_REMOTE, '/tools/default-encoding', name))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3864 self.assertEqual(name, DoGet(_REMOTE, '/tools/default-encoding'))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3865
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3866 i = CallFindScu([ '-k', '0008,0052=STUDY',
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3867 '-k', 'SpecificCharacterSet',
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3868 '-k', 'PatientName' ])
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3869
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3870 characterSet = re.findall('$0008,0005$.?\[(.?)\]', i)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3871 self.assertEqual(1, len(characterSet))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3872 self.assertEqual(ENCODINGS[name][0], characterSet[0].strip())
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3873
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3874 patientName = re.findall('$0010,0010$.?\[(.?)\]', i)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3875 self.assertEqual(1, len(patientName))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3876
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3877 expected = TEST.encode(ENCODINGS[name][1], 'ignore')
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3878 self.assertEqual(expected, patientName[0].strip())
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3879
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3880
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3881 #for master in ENCODINGS:
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3882 for master in [ 'Latin1', 'Utf8', 'Cyrillic' ]: # Shortcut to speedup tests
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3883 self.assertEqual(master, DoPut(_REMOTE, '/tools/default-encoding', master))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3884 self.assertEqual(master, DoGet(_REMOTE, '/tools/default-encoding'))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3885
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3886 for name in ENCODINGS:
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3887 DropOrthanc(_REMOTE)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3888 UploadInstance(_REMOTE, 'Encodings/Lena-%s.dcm' % ENCODINGS[name][1])
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3889
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3890 i = CallFindScu([ '-k', '0008,0052=STUDY',
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3891 '-k', 'PatientID',
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3892 '-k', 'SpecificCharacterSet',
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3893 '-k', 'PatientName' ])
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3894 i = i.decode(ENCODINGS[master][1])
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3895
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3896 characterSet = re.findall('$0008,0005$.?\[(.?)\]', i)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3897 self.assertEqual(1, len(characterSet))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3898 self.assertEqual(ENCODINGS[master][0], characterSet[0].strip())
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3899
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3900 patientId = re.findall('$0010,0020$.?\[(.?)\]', i)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3901 self.assertEqual(1, len(patientId))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3902 self.assertEqual(ENCODINGS[name][1], patientId[0].strip())
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3903
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3904 patientName = re.findall('$0010,0010$.?\[(.?)\]', i)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3905 self.assertEqual(1, len(patientName))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3906
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3907 tmp = ENCODINGS[name][1]
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3908 expected = TEST.encode(tmp, 'ignore').decode(tmp)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3909 tmp = ENCODINGS[master][1]
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3910 expected = expected.encode(tmp, 'ignore').decode(tmp)
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3911
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3912 self.assertEqual(expected, patientName[0].strip())
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3913
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3914
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3915 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True,
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3916 'Level' : 'Study',
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3917 'Query' : { }})
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3918 self.assertEqual(1, len(a))
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3919
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3920 tmp = ENCODINGS[name][1]
dbcbffb889da test_findscu_encoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 89 diff changeset	3921 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	3922
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3923
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3924 def test_reconstruct(self):
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3925 def CompareMainDicomTag(expected, instance, level, tag):
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3926 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	3927
504 16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	3928 originalInstanceId = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
96 272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3929
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3930 studies = DoGet(_REMOTE, '/studies/')
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3931 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/')))
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3932 self.assertEqual(1, len(studies))
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3933 self.assertEqual(1, len(DoGet(_REMOTE, '/series/')))
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3934 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/')))
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3935
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3936 modified = DoPost(_REMOTE, '/studies/%s/modify' % studies[0], {
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3937 "Replace" : {
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3938 "StudyDescription" : "hello",
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3939 "SeriesDescription" : "world",
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3940 "SOPClassUID" : "test",
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3941 "SOPInstanceUID" : "myid",
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3942 },
119 7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	3943 "Keep" : [ "StudyInstanceUID", "SeriesInstanceUID" ],
7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	3944 "Force" : True
96 272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3945 })
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3946
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3947 instances = DoGet(_REMOTE, '/instances/')
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3948 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/')))
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3949 self.assertEqual(1, len(DoGet(_REMOTE, '/studies/')))
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3950 self.assertEqual(1, len(DoGet(_REMOTE, '/series/')))
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3951 self.assertEqual(2, len(instances))
272d1229cb49 test reconstruction of tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 95 diff changeset	3952
504 16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	3953 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	3954
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	3955 # 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	3956 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	3957 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	3958 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	3959 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	3960 CompareMainDicomTag('myid', modifiedInstanceId, '', 'SOPInstanceUID')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	3961 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	3962 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	3963
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	3964 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	3965 # metadata before reconstruct
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	3966 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	3967 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	3968
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	3969 # 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	3970 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	3971
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	3972 CompareMainDicomTag('hello', originalInstanceId, 'study', 'StudyDescription')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	3973 CompareMainDicomTag('world', originalInstanceId, 'series', 'SeriesDescription')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	3974 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	3975
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	3976 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	3977 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	3978 # 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	3979 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	3980 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	3981
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	3982 self.assertEqual(mba, maa)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	3983 self.assertEqual(mbb, mab)
473 4ee85b016a40 added NewTests framework - only the Housekeeper tests right now Alain Mazy <am@osimis.io> parents: 472 diff changeset	3984
4ee85b016a40 added NewTests framework - only the Housekeeper tests right now Alain Mazy <am@osimis.io> parents: 472 diff changeset	3985
503 138d5efd4407 added test_rle_planar_configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 502 diff changeset	3986 @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	3987 def test_httpClient_lua(self):
496 f78f7ee6b660 fix httpclient Alain Mazy <am@osimis.io> parents: 490 diff changeset	3988 retries = 4
463 29aaa3df718f added verbosity and retries for test sometimes failing on CI Alain Mazy <am@osimis.io> parents: 457 diff changeset	3989 result = ''
29aaa3df718f added verbosity and retries for test sometimes failing on CI Alain Mazy <am@osimis.io> parents: 457 diff changeset	3990
104 7530eb50c3c4 renamed HttpPost.lua into HttpClient.lua + fix tests amazy parents: 102 diff changeset	3991 with open(GetDatabasePath('Lua/HttpClient.lua'), 'r') as f:
496 f78f7ee6b660 fix httpclient Alain Mazy <am@osimis.io> parents: 490 diff changeset	3992 scriptContent = f.read()
463 29aaa3df718f added verbosity and retries for test sometimes failing on CI Alain Mazy <am@osimis.io> parents: 457 diff changeset	3993 # 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	3994 while retries > 0 and not ('OK' in result):
496 f78f7ee6b660 fix httpclient Alain Mazy <am@osimis.io> parents: 490 diff changeset	3995 print("Executing lua script HttpClient.lua")
f78f7ee6b660 fix httpclient Alain Mazy <am@osimis.io> parents: 490 diff changeset	3996 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	3997 retries -= 1
102 9671578fd4d3 added tests for Lua HttpPost/Put/Get/Delete methods amazy parents: 100 diff changeset	3998
9671578fd4d3 added tests for Lua HttpPost/Put/Get/Delete methods amazy parents: 100 diff changeset	3999 self.assertIn('OK', result)
107 fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4000
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4001
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4002 def test_bitbucket_issue_44(self):
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	4003 # 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	4004 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm')
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4005 UploadInstance(_REMOTE, 'Issue44/Monochrome2.dcm')
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4006
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4007 # dcmcjpeg +ua +eb Monochrome1.dcm Monochrome1-Jpeg.dcm
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4008 UploadInstance(_REMOTE, 'Issue44/Monochrome1-Jpeg.dcm')
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4009
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4010 # dcmcjpeg +ua Monochrome1.dcm Monochrome1-JpegLS.dcm
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4011 UploadInstance(_REMOTE, 'Issue44/Monochrome1-JpegLS.dcm')
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4012
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4013 monochrome1 = 'bcdd600a-a6a9c522-5f0a6e84-8657c9f3-b76e59b7'
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4014 monochrome1_jpeg = '9df82121-208a2da8-0038674a-3d7a773b-b7008cd2'
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4015 monochrome1_jpegls = '0486d1a2-9165573f-b1976b20-e927b016-6b8d67ab'
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4016 monochrome2 = 'f00947b7-f61f7164-c93414d1-c6fbda6a-9e92ed20'
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4017
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4018 for i in [ monochrome1, monochrome1_jpeg, monochrome1_jpegls ]:
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4019 im = GetImage(_REMOTE, '/instances/%s/preview' % i)
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4020 self.assertEqual("L", im.mode)
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4021 self.assertEqual(2010, im.size[0])
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4022 self.assertEqual(2446, im.size[1])
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4023
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4024 # 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	4025 # white (255), should be rendered as black (0) => invert
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4026 if i == monochrome1_jpeg:
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4027 # Add some tolerance because of JPEG destructive compression
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4028 self.assertGreater(10, im.getpixel((0,0)))
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4029 else:
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4030 self.assertEqual(0, im.getpixel((0,0)))
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4031
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4032 im = GetImage(_REMOTE, '/instances/%s/preview' % monochrome2)
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4033 self.assertEqual("L", im.mode)
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4034 self.assertEqual(1572, im.size[0])
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4035 self.assertEqual(2010, im.size[1])
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4036
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4037 # 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	4038 # white (255), should be rendered as white (255)
fddb35f7289d test_bitbucket_issue_44 Sebastien Jodogne <s.jodogne@gmail.com> parents: 104 diff changeset	4039 self.assertEqual(255, im.getpixel((0,0)))
111 7005cdeeb704 test_bitbucket_issue_42 Sebastien Jodogne <s.jodogne@gmail.com> parents: 107 diff changeset	4040
7005cdeeb704 test_bitbucket_issue_42 Sebastien Jodogne <s.jodogne@gmail.com> parents: 107 diff changeset	4041
7005cdeeb704 test_bitbucket_issue_42 Sebastien Jodogne <s.jodogne@gmail.com> parents: 107 diff changeset	4042 def test_bitbucket_issue_42(self):
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	4043 # https://bugs.orthanc-server.com/show_bug.cgi?id=42
123 ff7438e51f63 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 122 diff changeset	4044 # 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	4045 UploadInstance(_REMOTE, 'Issue42.dcm')['ID']
7005cdeeb704 test_bitbucket_issue_42 Sebastien Jodogne <s.jodogne@gmail.com> parents: 107 diff changeset	4046 modified = DoPost(_REMOTE,
7005cdeeb704 test_bitbucket_issue_42 Sebastien Jodogne <s.jodogne@gmail.com> parents: 107 diff changeset	4047 '/patients/da128605-e040d0c4-310615d2-3475da63-df2d1ef4/modify',
119 7ecd26982dd7 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 118 diff changeset	4048 '{"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	4049 'application/json')
7005cdeeb704 test_bitbucket_issue_42 Sebastien Jodogne <s.jodogne@gmail.com> parents: 107 diff changeset	4050 self.assertTrue('PatientID' in modified)
113 3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4051
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4052
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4053 def test_rest_find_limit(self):
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4054 # Check the "Since" and "Limit" parameters in URI "/tools/find"
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	4055 # 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	4056
113 3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4057 # Upload 6 instances
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4058 brainix = []
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4059 knee = []
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4060 for i in range(2):
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4061 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	4062 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	4063 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	4064
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4065 # Check using BRAINIX
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4066 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4067 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4068 'Limit' : 10 })
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4069 self.assertEqual(4, len(a))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4070
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4071 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4072 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4073 'Limit' : 4 })
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4074 self.assertEqual(4, len(a))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4075
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4076 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4077 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4078 'Since' : 2,
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4079 'Limit' : 4 })
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4080 self.assertEqual(2, len(a))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4081
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4082 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4083 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4084 'Limit' : 3 })
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4085 self.assertEqual(3, len(a))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4086
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4087 b = []
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4088 for i in range(4):
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4089 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4090 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4091 'Limit' : 1,
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4092 'Since' : i })
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4093 self.assertEqual(1, len(a))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4094 b.append(a[0])
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4095
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4096 # 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	4097 self.assertEqual(0, len(set(b) ^ set(brainix)))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4098
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4099 # Check using KNEE
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4100 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4101 'Query' : { 'PatientName' : 'K*' },
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4102 'Limit' : 10 })
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4103 self.assertEqual(2, len(a))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4104
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4105 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4106 'Query' : { 'PatientName' : 'K*' },
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4107 'Limit' : 2 })
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4108 self.assertEqual(2, len(a))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4109
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4110 b = []
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4111 for i in range(2):
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4112 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4113 'Query' : { 'PatientName' : 'K*' },
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4114 'Limit' : 1,
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4115 'Since' : i })
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4116 self.assertEqual(1, len(a))
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4117 b.append(a[0])
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4118
3e5934363e76 test_rest_find_limitµ Sebastien Jodogne <s.jodogne@gmail.com> parents: 112 diff changeset	4119 self.assertEqual(0, len(set(b) ^ set(knee)))
115 45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4120
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4121
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4122 def test_bitbucket_issue_46(self):
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4123 # "PHI remaining after anonymization"
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	4124 # 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	4125
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4126 def GetAnonymizedTags(study, version):
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4127 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4128 { 'DicomVersion' : version },
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4129 'application/json') ['ID']
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4130 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized)
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4131 self.assertEqual(1, len(a))
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4132
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4133 instance = a[0]['ID']
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4134
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4135 return (instance, DoGet(_REMOTE, '/instances/%s/tags' % instance))
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4136
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4137 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm')
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4138 origStudy = '6068a14b-d4df27af-9ec22145-538772d8-74f228ff'
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4139
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4140 # 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	4141 # (Patient's Mother's Birth Name) tags
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4142 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy,
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4143 '{"Replace":{"0010,1060":"OSIMIS","0032,1033":"MOTHER"}}',
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4144 'application/json')['ID']
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4145
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4146 # 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	4147 # 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	4148 (instance, tags) = GetAnonymizedTags(newStudy, "2008")
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4149 self.assertTrue('0032,1033' in tags)
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4150 self.assertTrue('0010,1060' in tags)
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4151
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4152 # 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	4153 # 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	4154 (instance, tags) = GetAnonymizedTags(newStudy, "2017c")
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4155 self.assertFalse('0032,1033' in tags)
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4156 self.assertFalse('0010,1060' in tags)
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4157
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4158 t = {}
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4159 for (key, value) in tags.iteritems():
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4160 t[value['Name']] = value['Value']
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4161
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4162 self.assertEqual('', t['StudyDate']) # Type 1 tag => cleared
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4163 self.assertEqual('', t['StudyTime']) # Type 1 tag => cleared
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4164 self.assertEqual('', t['PatientSex']) # Type 1 tag => cleared
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4165 self.assertFalse('SeriesDate' in t) # Type 3 tag => null
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4166 self.assertFalse('SeriesTime' in t) # Type 3 tag => null
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4167
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4168 with tempfile.NamedTemporaryFile(delete = True) as f:
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4169 # 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	4170 f.write(DoGet(_REMOTE, '/instances/%s/file' % instance))
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4171 f.flush()
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4172 subprocess.check_output([ FindExecutable('dciodvfy'), f.name ],
45ebfab035b7 test_bitbucket_issue_46 Sebastien Jodogne <s.jodogne@gmail.com> parents: 113 diff changeset	4173 stderr = subprocess.STDOUT).split('\n')
118 a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4174
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4175
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4176 def test_bitbucket_issue_55(self):
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4177 def Run(modify, query):
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4178 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4179
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4180 operation = 'modify' if modify else 'anonymize'
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4181
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4182 self.assertRaises(Exception, lambda: DoPost(
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4183 _REMOTE, '/studies/%s/%s' % (study, operation), query))
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4184 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4185
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4186 query["Force"] = True
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4187 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	4188 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4189 DoDelete(_REMOTE, a)
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4190
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4191 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4192
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4193 UploadInstance(_REMOTE, 'DummyCT.dcm')
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4194 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0'
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4195
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4196 Run(True, { "Replace" : { "StudyInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4197 Run(True, { "Replace" : { "SeriesInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4198 Run(True, { "Replace" : { "SOPInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4199
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4200 Run(False, { "Keep" : [ "StudyInstanceUID" ]})
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4201 Run(False, { "Keep" : [ "SeriesInstanceUID" ]})
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4202 Run(False, { "Keep" : [ "SOPInstanceUID" ]})
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4203
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4204 Run(False, { "Replace" : { "StudyInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4205 Run(False, { "Replace" : { "SeriesInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4206 Run(False, { "Replace" : { "SOPInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55 Sebastien Jodogne <s.jodogne@gmail.com> parents: 117 diff changeset	4207
120 fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4208
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4209 def test_bitbucket_issue_56(self):
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4210 # Case-insensitive matching over accents. This test assumes
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4211 # that the "CaseSensitivePN" configuration option of Orthanc
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4212 # is set to "false" (default value).
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	4213 # 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	4214
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4215 def Check(name, expected, expectedSensitive):
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4216 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	4217 '-k', '0008,0052=PATIENT',
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4218 '-k', 'PatientName=%s' % name ])
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4219 patientNames = re.findall('$0010,0010$.?\[(.?)\]', a)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4220 self.assertEqual(expected, len(patientNames))
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4221
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4222 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4223 'CaseSensitive' : False,
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4224 'Query' : { 'PatientName' : name }})
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4225 self.assertEqual(expected, len(a))
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4226
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4227 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4228 'CaseSensitive' : True,
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4229 'Query' : { 'PatientName' : name }})
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4230 self.assertEqual(expectedSensitive, len(a))
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4231
533 c5291d97ed54 fix Alain Mazy <am@osimis.io> parents: 531 diff changeset	4232 # SpecificCharacterSet = ISO_IR 100 (Latin1), PatientName=Test-éüäöò
120 fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4233 UploadInstance(_REMOTE, 'Encodings/Lena-latin1.dcm')
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4234
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4235 # WildcardConstraint
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4236 Check('TeSt*', 1, 0)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4237 Check('TeSt-a*', 0, 0)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4238 Check('TeSt-É*', 1, 0)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4239 Check('TeSt-é*', 1, 0)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4240 Check('Test-é*', 1, 1)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4241
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4242 # ListConstraint
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4243 Check('Test-éüäöò\\nope', 1, 1)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4244 Check('Test-ÉÜÄÖÒ\\nope', 1, 0)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4245
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4246 # ValueConstraint
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4247 Check('Test-éüäöò', 1, 1)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4248 Check('Test-ÉÜÄÖÒ', 1, 0)
fce08afe6b2d test_bitbucket_issue_56 Sebastien Jodogne <s.jodogne@gmail.com> parents: 119 diff changeset	4249
125 15e4dc0a5810 test_gbk_alias Sebastien Jodogne <s.jodogne@gmail.com> parents: 124 diff changeset	4250
15e4dc0a5810 test_gbk_alias Sebastien Jodogne <s.jodogne@gmail.com> parents: 124 diff changeset	4251 def test_gbk_alias(self):
15e4dc0a5810 test_gbk_alias Sebastien Jodogne <s.jodogne@gmail.com> parents: 124 diff changeset	4252 # 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	4253 # This test fails on Orthanc <= 1.3.0
15e4dc0a5810 test_gbk_alias Sebastien Jodogne <s.jodogne@gmail.com> parents: 124 diff changeset	4254 i = UploadInstance(_REMOTE, '2017-09-19-GBK-Tumashu.dcm')['ID']
15e4dc0a5810 test_gbk_alias Sebastien Jodogne <s.jodogne@gmail.com> parents: 124 diff changeset	4255 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
15e4dc0a5810 test_gbk_alias Sebastien Jodogne <s.jodogne@gmail.com> parents: 124 diff changeset	4256 self.assertEqual(tags['PatientName'], u'徐浩凯')
15e4dc0a5810 test_gbk_alias Sebastien Jodogne <s.jodogne@gmail.com> parents: 124 diff changeset	4257 self.assertEqual(tags['InstitutionName'], u'灌云县疾病预防控制中心')
126 6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4258
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4259
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4260 def test_long_tag(self):
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4261 i = UploadInstance(_REMOTE, 'DummyCTWithLongTag.dcm')['ID']
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4262 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe'
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4263
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4264 tags = DoGet(_REMOTE, '/instances/%s/tags' % i)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4265 self.assertTrue('0018,1020' in tags)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4266 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4267 self.assertEqual('TooLong', tags['0018,1020']['Type'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4268 self.assertEqual(None, tags['0018,1020']['Value'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4269
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4270 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	4271 self.assertTrue('0018,1020' in tags)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4272 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4273 self.assertEqual('String', tags['0018,1020']['Type'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4274 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	4275
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4276 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4277 self.assertTrue('SoftwareVersions' in tags)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4278 self.assertEqual(None, tags['SoftwareVersions'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4279 self.assertTrue('HeartRate' in tags)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4280 self.assertEqual(474, int(tags['HeartRate']))
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4281
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4282 tags = DoGet(_REMOTE, '/instances/%s/simplified-tags' % i)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4283 self.assertTrue('SoftwareVersions' in tags)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4284 self.assertEqual(None, tags['SoftwareVersions'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4285
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4286 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	4287 self.assertTrue('SoftwareVersions' in tags)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4288 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet'))
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4289
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4290 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	4291 self.assertTrue('SoftwareVersions' in tags)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4292 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet'))
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4293
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4294 tags = DoGet(_REMOTE, '/series/%s/instances-tags' % series)
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4295 self.assertEqual(1, len(tags))
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4296 self.assertTrue(i in tags.keys())
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4297 self.assertTrue('0018,1020' in tags[i])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4298 self.assertEqual('TooLong', tags[i]['0018,1020']['Type'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4299
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4300 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	4301 self.assertEqual(1, len(tags))
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4302 self.assertTrue(i in tags.keys())
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4303 self.assertTrue('0018,1020' in tags[i])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4304 self.assertEqual('String', tags[i]['0018,1020']['Type'])
6ead76f08d9c test_long_tag Sebastien Jodogne <s.jodogne@gmail.com> parents: 125 diff changeset	4305 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	4306
127 1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4307
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4308 def test_extended_media(self):
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4309 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4310
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4311 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	4312 self.assertEqual(2, len(z.namelist()))
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4313 self.assertTrue('IMAGES/IM0' in z.namelist())
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4314 self.assertTrue('DICOMDIR' in z.namelist())
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4315
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4316 try:
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4317 os.remove('/tmp/DICOMDIR')
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4318 except:
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4319 # The file does not exist
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4320 pass
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4321
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4322 z.extract('DICOMDIR', '/tmp')
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4323 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ],
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4324 stderr = subprocess.STDOUT).split('\n')
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4325 self.assertEqual(5, len(a))
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4326 self.assertTrue(a[0].startswith('Warning'))
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4327 self.assertEqual('BasicDirectory', a[1])
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4328 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	4329 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	4330 self.assertEqual('', a[4])
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4331
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4332 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ],
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4333 stderr = subprocess.STDOUT).split('\n')
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4334 self.assertEqual(1, len(a))
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4335 self.assertEqual('', a[0])
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4336
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4337 a = subprocess.check_output([ FindExecutable('dcm2xml'), '/tmp/DICOMDIR' ])
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4338 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	4339
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4340 # Check the presence of the series description (extended tag)
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4341 self.assertTrue(re.search('T1W_aTSE', a) != None)
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4342
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4343 os.remove('/tmp/DICOMDIR')
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4344
1eea4d3a1ba9 test_extended_media Sebastien Jodogne <s.jodogne@gmail.com> parents: 126 diff changeset	4345
132 149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4346 def test_anonymize_relationships_1(self):
133 f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4347 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4348 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	4349 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4350
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4351 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4352 '{}',
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4353 'application/json')['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4354
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4355 a = DoGet(_REMOTE, '/studies/%s/instances' % study)
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4356 self.assertEqual(2, len(a))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4357 a1 = a[0]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4358 a2 = a[1]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4359
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4360 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized)
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4361 self.assertEqual(2, len(b))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4362 b1 = b[0]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4363 b2 = b[1]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4364
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4365 SEQUENCE = '/instances/%s/content/ReferencedImageSequence'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4366 SOP = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPInstanceUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4367 CLASS = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPClassUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4368 FRAME = '/instances/%s/content/FrameOfReferenceUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4369
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4370 self.assertEqual(DoGet(_REMOTE, FRAME % a1),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4371 DoGet(_REMOTE, FRAME % a2))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4372 self.assertEqual(DoGet(_REMOTE, FRAME % b1),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4373 DoGet(_REMOTE, FRAME % b2))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4374 self.assertNotEqual(DoGet(_REMOTE, FRAME % a1),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4375 DoGet(_REMOTE, FRAME % b1))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4376 self.assertNotEqual(DoGet(_REMOTE, FRAME % a2),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4377 DoGet(_REMOTE, FRAME % b2))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4378
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4379 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	4380 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	4381 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	4382 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	4383
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4384 for i in range(3):
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4385 self.assertEqual(DoGet(_REMOTE, SOP % (a1, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4386 DoGet(_REMOTE, SOP % (a2, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4387 self.assertEqual(DoGet(_REMOTE, SOP % (b1, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4388 DoGet(_REMOTE, SOP % (b2, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4389 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4390 DoGet(_REMOTE, SOP % (b1, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4391 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4392 DoGet(_REMOTE, SOP % (b2, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4393 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4394 DoGet(_REMOTE, CLASS % (b1, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4395 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4396 DoGet(_REMOTE, CLASS % (b2, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4397
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4398
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4399 def test_anonymize_relationships_2(self):
133 f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4400 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm')
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4401 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	4402 study = '6c65289b-db2fcb71-7eaf73f4-8e12470c-a4d6d7cf'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4403
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4404 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4405 '{}',
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4406 'application/json')['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4407
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4408 a = DoGet(_REMOTE, '/studies/%s/instances' % study)
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4409 self.assertEqual(2, len(a))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4410 a1 = a[0]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4411 a2 = a[1]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4412
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4413 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized)
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4414 self.assertEqual(2, len(b))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4415 b1 = b[0]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4416 b2 = b[1]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4417
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4418 SEQUENCE = '/instances/%s/content/SourceImageSequence'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4419 SOP = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPInstanceUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4420 CLASS = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPClassUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4421
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4422 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	4423 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	4424 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	4425 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	4426 self.assertEqual(DoGet(_REMOTE, SOP % (a1, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4427 DoGet(_REMOTE, SOP % (a2, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4428 self.assertEqual(DoGet(_REMOTE, SOP % (b1, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4429 DoGet(_REMOTE, SOP % (b2, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4430 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4431 DoGet(_REMOTE, SOP % (b1, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4432 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4433 DoGet(_REMOTE, SOP % (b2, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4434 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4435 DoGet(_REMOTE, CLASS % (b1, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4436 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 130 diff changeset	4437 DoGet(_REMOTE, CLASS % (b2, 0)))
133 f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4438
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4439
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4440 def test_anonymize_relationships_3(self):
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4441 sr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM0')['ID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4442 mr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM631')['ID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4443 study = 'ef351eb2-c1147229-062736b8-35a151e3-e32d526b'
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4444
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4445 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4446 { "Keep" : [ "ContentSequence" ] }) ['ID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4447
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4448 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized)
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4449 self.assertEqual(2, len(a))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4450
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4451 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	4452 sr2 = a[0]['ID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4453 mr2 = a[1]['ID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4454 else:
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4455 sr2 = a[1]['ID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4456 mr2 = a[0]['ID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4457
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4458 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % sr1),
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4459 DoGet(_REMOTE, '/instances/%s/content/Modality' % sr2))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4460 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % mr1),
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4461 DoGet(_REMOTE, '/instances/%s/content/Modality' % mr2))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4462
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4463 mrUid1 = DoGet(_REMOTE, '/instances/%s' % mr1)['MainDicomTags']['SOPInstanceUID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4464 mrUid2 = DoGet(_REMOTE, '/instances/%s' % mr2)['MainDicomTags']['SOPInstanceUID']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4465 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	4466 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	4467 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	4468 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	4469
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4470 PATH1 = '/instances/%s/content/CurrentRequestedProcedureEvidenceSequence'
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4471 PATH2 = PATH1 + '/0/ReferencedSeriesSequence'
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4472 PATH3 = PATH2 + '/0/ReferencedSOPSequence'
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4473 PATH4 = PATH3 + '/0/ReferencedSOPInstanceUID'
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4474 PATH5 = PATH3 + '/0/ReferencedSOPClassUID'
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4475
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4476 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr1)))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4477 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr1)))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4478 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr1)))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4479 self.assertEqual(DoGet(_REMOTE, PATH4 % sr1), mrUid1)
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4480 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	4481 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	4482
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4483 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr2)))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4484 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr2)))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4485 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr2)))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4486 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	4487
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4488 self.assertEqual(mrUid2, DoGet(_REMOTE, PATH4 % sr2).strip('\x00'))
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4489 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	4490 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	4491
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4492 content1 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr1) ['ContentSequence']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4493 content2 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr2) ['ContentSequence']
f0d4c4707e64 test_anonymize_relationships_3 Sebastien Jodogne <s.jodogne@gmail.com> parents: 132 diff changeset	4494 self.assertEqual(str(content1), str(content2))
141 5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4495
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4496
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4497 def test_bitbucket_issue_94(self):
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4498 # "a simple instance modification should not modify FrameOfReferenceUID + ..."
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	4499 # 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	4500 i = UploadInstance(_REMOTE, 'Issue94.dcm')['ID']
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4501
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4502 source = DoGet(_REMOTE, '/instances/%s/attachments/dicom/data' % i)
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4503
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4504 modified = DoPost(_REMOTE, '/instances/%s/modify' % i,
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4505 { "Replace" : {"PatientID" : "toto"}, "Force": True})
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4506
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4507 anonymized = DoPost(_REMOTE, '/instances/%s/anonymize' % i)
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4508
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4509 a = ExtractDicomTags(source, [ 'FrameOfReferenceUID' ])
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4510 self.assertEqual(1, len(a))
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4511
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4512 b = ExtractDicomTags(modified, [ 'FrameOfReferenceUID' ])
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4513 self.assertEqual(1, len(b))
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4514
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4515 c = ExtractDicomTags(anonymized, [ 'FrameOfReferenceUID' ])
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4516 self.assertEqual(1, len(c))
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4517
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4518 self.assertEqual(a, b) # Modified DICOM
5de178abe4d8 test_bitbucket_issue_94 Sebastien Jodogne <s.jodogne@gmail.com> parents: 138 diff changeset	4519 self.assertNotEqual(a, c) # Anonymized DICOM
143 28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4520
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4521
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4522 def test_metadata_origin(self):
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4523 # Upload using the REST API
144 7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4524 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	4525 self.assertEqual('RestApi', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i))
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4526 self.assertEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i))
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4527 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i))
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4528 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/metadata/CalledAET' % i))
315 0124075797cd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	4529
0124075797cd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	4530 # "HttpUsername" is empty iff "AuthenticationEnabled" is "false"
0124075797cd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	4531 self.assertTrue(DoGet(_REMOTE, '/instances/%s/metadata/HttpUsername' % i) in [ '', 'alice' ])
0124075797cd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	4532
144 7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4533 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i)
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4534 self.assertEqual('RestApi', m['Origin'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4535 self.assertEqual('', m['RemoteAET'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4536 self.assertNotEqual('', m['RemoteIP'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4537 self.assertFalse('CalledAET' in m)
315 0124075797cd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	4538 self.assertTrue('HttpUsername' in m)
0124075797cd fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 314 diff changeset	4539 self.assertTrue(m['HttpUsername'] in [ '', 'alice' ])
144 7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4540
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4541 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	4542 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	4543 self.assertEqual('1', m['IndexInSeries'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4544 self.assertTrue('ReceptionDate' in m)
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4545
143 28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4546 DoDelete(_REMOTE, '/instances/%s' % i)
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4547
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4548 # Upload using the DICOM protocol
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4549 subprocess.check_call([ FindExecutable('storescu'),
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4550 _REMOTE['Server'], str(_REMOTE['DicomPort']),
144 7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4551 GetDatabasePath('Knee/T1/IM-0001-0001.dcm'),
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4552 '-xw' ]) # Propose JPEG2000
143 28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4553 self.assertEqual('DicomProtocol', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i))
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4554 self.assertEqual('STORESCU', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i))
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4555 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i))
28d50ffac07d test_metadata_origin Sebastien Jodogne <s.jodogne@gmail.com> parents: 142 diff changeset	4556 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	4557 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	4558
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4559 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i)
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4560 self.assertEqual('DicomProtocol', m['Origin'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4561 self.assertEqual('STORESCU', m['RemoteAET'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4562 self.assertNotEqual('', m['RemoteIP'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4563 self.assertEqual('ANY-SCP', m['CalledAET'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4564 self.assertFalse('HttpUsername' in m)
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4565
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4566 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	4567 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	4568 self.assertEqual('1', m['IndexInSeries'])
7809fdf8056f testing metadata?expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 143 diff changeset	4569 self.assertTrue('ReceptionDate' in m)
147 ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4570
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4571
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4572 def test_lua_deadlock(self):
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4573 # 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	4574 # 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	4575 # 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	4576 # instance appears to be stored and then everything just
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4577 # halts, ie Orthanc wont respond to anything after that."
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4578 # https://groups.google.com/d/msg/orthanc-users/Rc-Beb42xc8/JUgdzrmCAgAJ
174 d468cbe1b161 added tests for IncomingWorklistRequestFilter am@osimis.io parents: 173 diff changeset	4579 InstallLuaScriptFromPath(_REMOTE, 'Lua/Jpeg2000Conversion.lua')
147 ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4580
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4581 subprocess.check_call([ FindExecutable('storescu'),
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4582 _REMOTE['Server'], str(_REMOTE['DicomPort']),
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4583 GetDatabasePath('Brainix/Flair/IM-0001-0001.dcm'),
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4584 GetDatabasePath('Brainix/Flair/IM-0001-0002.dcm'),
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4585 ])
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4586
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4587 instances = DoGet(_REMOTE, '/instances')
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4588 self.assertEqual(2, len(instances))
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4589
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4590 t1 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[0])
ff788c99f1aa test_lua_deadlock Sebastien Jodogne <s.jodogne@gmail.com> parents: 145 diff changeset	4591 t2 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[1])
175 09ca519087a1 doc am@osimis.io parents: 174 diff changeset	4592 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	4593 self.assertEqual(t1, t2);
154 4a533d003080 test_find_group_length Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	4594
4a533d003080 test_find_group_length Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	4595
4a533d003080 test_find_group_length Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	4596 def test_find_group_length(self):
4a533d003080 test_find_group_length Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	4597 # 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	4598 # one of the Generic Group Length tags (*, 0x0000)
4a533d003080 test_find_group_length Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	4599 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	4600 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	4601 self.assertFalse('UnableToProcess' in result)
4a533d003080 test_find_group_length Sebastien Jodogne <s.jodogne@gmail.com> parents: 147 diff changeset	4602 self.assertFalse('E:' in result)
179 8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4603
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4604
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4605 def test_split(self):
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4606 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4607 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	4608 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	4609 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	4610 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4611 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4612 t2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59'
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4613
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4614 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4615 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4616
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4617 info = DoGet(_REMOTE, '/studies/%s' % study)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4618 self.assertTrue('ReferringPhysicianName' in info['MainDicomTags'])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4619
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4620 job = MonitorJob2(_REMOTE, lambda: DoPost
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4621 (_REMOTE, '/studies/%s/split' % study, {
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4622 'Series' : [ t2 ],
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4623 'Replace' : { 'PatientName' : 'Hello' },
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4624 'Remove' : [ 'ReferringPhysicianName' ],
181 911070f790e3 more checks Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	4625 'KeepSource' : False,
911070f790e3 more checks Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	4626 'Asynchronous' : True
179 8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4627 }))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4628
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4629 self.assertNotEqual(None, job)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4630
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4631 studies = set(DoGet(_REMOTE, '/studies'))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4632 self.assertEqual(2, len(studies))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4633
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4634 series = set(DoGet(_REMOTE, '/series'))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4635 self.assertEqual(2, len(series))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4636 self.assertTrue(t1 in series)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4637
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4638 study2 = DoGet(_REMOTE, '/jobs/%s' % job)['Content']['TargetStudy']
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4639 self.assertTrue(study in studies)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4640 self.assertTrue(study2 in studies)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4641
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4642 info = DoGet(_REMOTE, '/studies/%s' % study2)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4643 self.assertTrue('Hello', info['PatientMainDicomTags']['PatientName'])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4644 self.assertFalse('ReferringPhysicianName' in info['MainDicomTags'])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4645
254 05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4646 sopInstanceUids = set()
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4647 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	4648 sopInstanceUids.add(i['MainDicomTags']['SOPInstanceUID'])
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4649
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4650 self.assertTrue(knee1Sop in sopInstanceUids)
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4651
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4652 # Fails if Orthanc <= 1.5.7
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4653 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	4654
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4655 # 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	4656 self.assertEqual(2, len(sopInstanceUids))
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4657
179 8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4658
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4659 def test_merge(self):
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4660 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	4661 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	4662 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	4663 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	4664 knee = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4665 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4666 brainix = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988'
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4667 flair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0'
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4668
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4669 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4670 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4671
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4672 job = MonitorJob2(_REMOTE, lambda: DoPost
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4673 (_REMOTE, '/studies/%s/merge' % knee, {
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4674 'Resources' : [ brainix ],
181 911070f790e3 more checks Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	4675 'KeepSource' : True,
911070f790e3 more checks Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	4676 'Synchronous' : False
179 8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4677 }))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4678
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4679 self.assertNotEqual(None, job)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4680
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4681 studies = set(DoGet(_REMOTE, '/studies'))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4682 self.assertEqual(2, len(studies))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4683 self.assertTrue(knee in studies)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4684 self.assertTrue(brainix in studies)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4685
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4686 series = set(DoGet(_REMOTE, '/studies/%s' % knee)['Series'])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4687 self.assertTrue(t1 in series)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4688 series.remove(t1)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4689 self.assertEqual(1, len(series))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4690
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4691 instances = DoGet(_REMOTE, '/series/%s' % list(series)[0])['Instances']
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4692 self.assertEqual(1, len(instances))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4693 merged = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4694
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4695 instances = DoGet(_REMOTE, '/series/%s' % t1)['Instances']
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4696 self.assertEqual(1, len(instances))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4697 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4698
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4699 instances = DoGet(_REMOTE, '/series/%s' % flair)['Instances']
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4700 self.assertEqual(1, len(instances))
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4701 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4702
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4703 tags = DoGet(_REMOTE, '/studies/%s' % knee)
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4704
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4705 for key in tags['PatientMainDicomTags']:
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4706 self.assertEqual(a[key], merged[key])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4707 if (key in b and key != 'PatientSex'):
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4708 self.assertNotEqual(a[key], b[key])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4709
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4710 for key in tags['MainDicomTags']:
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4711 # Not in the patient/study module
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4712 if (not key in [ 'InstitutionName',
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4713 'RequestingPhysician',
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4714 'RequestedProcedureDescription', ]):
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4715 self.assertEqual(a[key], merged[key])
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4716 if (key in b):
8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4717 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	4718
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4719 sopInstanceUids = set()
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4720 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	4721 sopInstanceUids.add(i['MainDicomTags']['SOPInstanceUID'])
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4722
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4723 self.assertTrue(kneeSop in sopInstanceUids)
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4724 self.assertTrue(brainixSop in sopInstanceUids)
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4725
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4726 # Fails if Orthanc <= 1.5.7
05b77ade5e1d test generation of sopinstanceuid in split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 247 diff changeset	4727 # 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	4728 self.assertEqual(3, len(sopInstanceUids))
179 8a2dd77d4035 testing split/merge Sebastien Jodogne <s.jodogne@gmail.com> parents: 177 diff changeset	4729
187 770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4730
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4731 def test_async_archive(self):
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4732 # Testing the asynchronous generation of archives/medias (new
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4733 # in Orthanc 1.4.3)
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4734 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4735 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4736
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4737 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4738 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59'
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4739
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4740 job = MonitorJob2(_REMOTE, lambda: DoPost
508 ae493446336a fix tests for missing archives Alain Mazy <am@osimis.io> parents: 507 diff changeset	4741 (_REMOTE, '/series/%s/archive' % kneeT1, {
187 770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4742 'Synchronous' : False
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4743 }))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4744
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4745 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4746 self.assertEqual(1, len(z.namelist()))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4747 self.assertFalse('DICOMDIR' in z.namelist())
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4748
354 88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4749 info = DoGet(_REMOTE, '/jobs/%s' % job)
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4750 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	4751 self.assertEqual(1, info['Content']['InstancesCount'])
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4752 self.assertEqual(0, info['Content']['UncompressedSizeMB'])
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4753
187 770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4754 job2 = MonitorJob2(_REMOTE, lambda: DoPost
508 ae493446336a fix tests for missing archives Alain Mazy <am@osimis.io> parents: 507 diff changeset	4755 (_REMOTE, '/series/%s/media' % kneeT1, {
187 770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4756 'Synchronous' : False
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4757 }))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4758
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4759 # 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	4760 # archive from second job (as MediaArchiveSize == 1)
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4761 self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4762
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4763 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job2)
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4764 self.assertEqual(2, len(z.namelist()))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4765 self.assertTrue('DICOMDIR' in z.namelist())
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4766
354 88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4767 info = DoGet(_REMOTE, '/jobs/%s' % job2)
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4768 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	4769 self.assertEqual(1, info['Content']['InstancesCount'])
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4770 self.assertEqual(0, info['Content']['UncompressedSizeMB'])
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4771
187 770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4772 job = MonitorJob2(_REMOTE, lambda: DoPost
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4773 (_REMOTE, '/tools/create-archive', {
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4774 'Synchronous' : False,
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4775 'Resources' : [ kneeT1, kneeT2 ],
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4776 }))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4777
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4778 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4779 self.assertEqual(2, len(z.namelist()))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4780 self.assertFalse('DICOMDIR' in z.namelist())
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4781
354 88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4782 info = DoGet(_REMOTE, '/jobs/%s' % job)
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4783 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	4784 self.assertEqual(2, info['Content']['InstancesCount'])
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4785 self.assertEqual(0, info['Content']['UncompressedSizeMB'])
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4786
187 770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4787 job = MonitorJob2(_REMOTE, lambda: DoPost
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4788 (_REMOTE, '/tools/create-media', {
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4789 'Synchronous' : False,
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4790 'Resources' : [ kneeT1, kneeT2 ],
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4791 }))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4792
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4793 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4794 self.assertEqual(3, len(z.namelist()))
770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4795 self.assertTrue('DICOMDIR' in z.namelist())
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4796
354 88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4797 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	4798 self.assertEqual(2, info['Content']['InstancesCount'])
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4799 self.assertEqual(0, info['Content']['UncompressedSizeMB'])
88f076b906ca test ArchiveSizeMB in archive jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 353 diff changeset	4800
187 770f6f5aea16 test_async_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 186 diff changeset	4801
540 ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4802 def test_archive_job_delete_output(self):
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4803 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4804 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	4805 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	4806
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4807 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4808 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59'
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4809
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4810 job = MonitorJob2(_REMOTE, lambda: DoPost
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4811 (_REMOTE, '/series/%s/archive' % kneeT1, {
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4812 'Synchronous' : False
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4813 }))
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4814
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4815 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4816 # delete the output
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4817 DoDelete(_REMOTE, '/jobs/%s/archive' % job)
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4818 # 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	4819 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	4820
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4821 # repeat with another resource/job
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4822 job = MonitorJob2(_REMOTE, lambda: DoPost
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4823 (_REMOTE, '/series/%s/archive' % kneeT2, {
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4824 'Synchronous' : False
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4825 }))
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4826 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4827 # delete the output
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4828 DoDelete(_REMOTE, '/jobs/%s/archive' % job)
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4829 # 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	4830 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	4831
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4832
ea1003982c27 added a test for DELETE /jobs/../archive Alain Mazy <am@osimis.io> parents: 538 diff changeset	4833
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4834 def test_queries_hierarchy(self):
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4835 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4836 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	4837
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4838 tags = {
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4839 'NumberOfPatientRelatedInstances' : '',
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4840 'NumberOfPatientRelatedSeries' : '',
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4841 'NumberOfPatientRelatedStudies' : '',
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4842 'NumberOfStudyRelatedInstances' : '',
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4843 'NumberOfStudyRelatedSeries' : '',
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4844 'NumberOfSeriesRelatedInstances' : '',
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4845 }
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4846
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4847 tags2 = copy.copy(tags)
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4848 tags2['PatientID'] = '887' # Only consider the "Knee" patient
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4849
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4850 patient = DoPost(_REMOTE, '/modalities/self/query', {
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4851 'Level' : 'Patient',
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4852 'Query' : tags2
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4853 }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4854
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4855 study = DoPost(_REMOTE, '/modalities/self/query', {
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4856 'Level' : 'Study',
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4857 'Query' : tags2
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4858 }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4859
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4860 series = DoPost(_REMOTE, '/modalities/self/query', {
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4861 'Level' : 'Series',
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4862 'Query' : tags2
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4863 }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4864
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4865 instance = DoPost(_REMOTE, '/modalities/self/query', {
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4866 'Level' : 'Instance',
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4867 'Query' : tags2
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4868 }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4869
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4870 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	4871 self.assertEqual(1, len(p))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4872 self.assertEqual('887', p[0]['PatientID'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4873 self.assertEqual('1', p[0]['NumberOfPatientRelatedInstances'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4874 self.assertEqual('1', p[0]['NumberOfPatientRelatedSeries'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4875 self.assertEqual('1', p[0]['NumberOfPatientRelatedStudies'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4876 self.assertFalse('NumberOfStudyRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4877 self.assertFalse('NumberOfStudyRelatedSeries' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4878 self.assertFalse('NumberOfSeriesRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4879
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4880 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	4881 self.assertEqual(1, len(p))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4882 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	4883 self.assertEqual('1', p[0]['NumberOfStudyRelatedInstances'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4884 self.assertEqual('1', p[0]['NumberOfStudyRelatedSeries'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4885 self.assertFalse('NumberOfPatientRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4886 self.assertFalse('NumberOfPatientRelatedSeries' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4887 self.assertFalse('NumberOfPatientRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4888 self.assertFalse('NumberOfSeriesRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4889
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4890 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	4891 self.assertEqual(1, len(p))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4892 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	4893 self.assertEqual('1', p[0]['NumberOfSeriesRelatedInstances'])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4894 self.assertFalse('NumberOfPatientRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4895 self.assertFalse('NumberOfPatientRelatedSeries' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4896 self.assertFalse('NumberOfPatientRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4897 self.assertFalse('NumberOfStudyRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4898 self.assertFalse('NumberOfStudyRelatedSeries' in p[0])
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4899
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4900 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	4901 self.assertEqual(1, len(p))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4902 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	4903
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4904 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	4905 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4906 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	4907 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % study))
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4908
188 7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4909 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	4910 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4911 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	4912 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % series))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4913
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4914 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	4915 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4916 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	4917 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4918
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4919 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	4920 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4921 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	4922 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % series))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4923
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4924 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	4925 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4926 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	4927 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4928
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4929 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	4930 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4931 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	4932 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % instance))
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4933
7d585263808b new test: test_queries_hierarchy Sebastien Jodogne <s.jodogne@gmail.com> parents: 187 diff changeset	4934
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4935 def test_dicom_disk_size(self):
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4936 dicomSize = 0
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4937
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	4938 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	4939 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	4940
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4941 for i in range(2):
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4942 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	4943 UploadInstance(_REMOTE, p)
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4944 dicomSize += os.path.getsize(GetDatabasePath(p))
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4945
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4946 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	4947 self.assertEqual(2, s['CountInstances'])
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4948 self.assertEqual(2, s['CountSeries'])
11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4949 self.assertEqual(1, s['CountStudies'])
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	4950
189 11719f19bd62 test_dicom_disk_size Sebastien Jodogne <s.jodogne@gmail.com> parents: 188 diff changeset	4951 self.assertEqual(dicomSize, int(s['DicomUncompressedSize']))
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	4952
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	4953 if isCompressed:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	4954 self.assertGreater(dicomSize, int(s['DicomDiskSize']))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	4955 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	4956 self.assertLess(dicomSize, int(s['UncompressedSize']))
379 097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	4957 else:
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	4958 self.assertEqual(dicomSize, int(s['DicomDiskSize']))
097329b67509 fix tests if StorageCompression is true Sebastien Jodogne <s.jodogne@gmail.com> parents: 378 diff changeset	4959 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	4960 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	4961 if IsDicomUntilPixelDataStored(_REMOTE):
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	4962 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	4963 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	4964 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	4965 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 379 diff changeset	4966 # 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	4967 # 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	4968 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	4969
202 f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4970
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4971 def test_changes_2(self):
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4972 # 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	4973 # 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	4974
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4975 # 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	4976 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	4977 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	4978 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	4979 DoDelete(_REMOTE, '/instances/%s' % a)
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4980
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4981 # 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	4982 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	4983
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4984 c = DoGet(_REMOTE, '/changes')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4985 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	4986 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4987 seq = c['Last']
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4988
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4989 c = DoGet(_REMOTE, '/changes?last')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4990 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	4991 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4992 self.assertEqual(seq, c['Last'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4993
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4994 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	4995 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	4996 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4997 self.assertEqual(seq, c['Last'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4998
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	4999 # Add one instance
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5000 UploadInstance(_REMOTE, 'DummyCT.dcm')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5001 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	5002
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5003 c = DoGet(_REMOTE, '/changes')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5004 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	5005 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5006 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	5007
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5008 c = DoGet(_REMOTE, '/changes?last')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5009 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	5010 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5011 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	5012
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5013 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	5014 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	5015 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5016 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	5017
389 27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5018 # 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	5019 # changes of type "UpdatedMetadata"
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5020 i = DoGet(_REMOTE, '/instances') [0]
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5021 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	5022
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	5023 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/4000' % i)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	5024 self.assertEqual('200', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	5025 self.assertEqual('hello', body)
389 27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5026
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5027 c = DoGet(_REMOTE, '/changes?last')
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5028 self.assertEqual(1, len(c['Changes']))
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5029 self.assertTrue(c['Done'])
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5030 self.assertEqual(seq + 5, c['Last'])
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5031 self.assertEqual('UpdatedMetadata', c['Changes'][0]['ChangeType'])
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5032
394 e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	5033 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	5034 DoDelete(_REMOTE, '/instances/%s/metadata/4000' % i, headers = {
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	5035 'If-Match' : headers['etag']
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	5036 })
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	5037 else:
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	5038 self.assertFalse('etag' in headers)
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	5039 DoDelete(_REMOTE, '/instances/%s/metadata/4000' % i)
e87d54a8a204 compatibility with 1.9.1 Sebastien Jodogne <s.jodogne@gmail.com> parents: 393 diff changeset	5040
389 27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5041 c = DoGet(_REMOTE, '/changes?last')
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5042 self.assertEqual(1, len(c['Changes']))
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5043 self.assertTrue(c['Done'])
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5044 self.assertEqual(seq + 6, c['Last'])
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5045 self.assertEqual('UpdatedMetadata', c['Changes'][0]['ChangeType'])
27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5046
202 f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5047 # Remove the uploaded instance
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5048 DoDelete(_REMOTE, '/instances/%s' % a)
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5049 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	5050
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5051 c = DoGet(_REMOTE, '/changes')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5052 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	5053 self.assertTrue(c['Done'])
389 27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5054 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	5055
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5056 c = DoGet(_REMOTE, '/changes?last')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5057 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	5058 self.assertTrue(c['Done'])
389 27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5059 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	5060
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5061 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	5062 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	5063 self.assertTrue(c['Done'])
389 27e0a2fcdc85 test /changes of type UpdatedMetadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 384 diff changeset	5064 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	5065
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5066
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124 Sebastien Jodogne <s.jodogne@gmail.com> parents: 195 diff changeset	5067 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	5068 a = UploadInstance(_REMOTE, 'Issue124.dcm')['ID']
508 ae493446336a fix tests for missing archives Alain Mazy <am@osimis.io> parents: 507 diff changeset	5069 s = DoGet(_REMOTE, '/instances/%s/series' % a)['ID']
ae493446336a fix tests for missing archives Alain Mazy <am@osimis.io> parents: 507 diff changeset	5070
ae493446336a fix tests for missing archives Alain Mazy <am@osimis.io> parents: 507 diff changeset	5071 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	5072 self.assertEqual(2, len(z.namelist()))
207 a515eec74078 test_invalid_findscp Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	5073
a515eec74078 test_invalid_findscp Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	5074
a515eec74078 test_invalid_findscp Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	5075 def test_invalid_findscp(self):
a515eec74078 test_invalid_findscp Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	5076 UploadInstance(_REMOTE, 'DummyCT.dcm')
a515eec74078 test_invalid_findscp Sebastien Jodogne <s.jodogne@gmail.com> parents: 202 diff changeset	5077 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	5078 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	5079
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5080
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5081 def test_bitbucket_issue_90(self):
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5082 def CountDicomResults(sex):
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5083 a = CallFindScu([ '-S', '-k', '8,52=STUDY', '-k', sex ])
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5084 return len(re.findall('$0010,0040$', a))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5085
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5086 def CountRestResults(sex):
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5087 a = DoPost(_REMOTE, '/tools/find',
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5088 { 'Level' : 'Study', 'Query' : { 'PatientSex' : sex } })
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5089 return len(a)
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5090
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5091 # 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	5092 # "DummyCT.dcm" has the tag PatientSex (0010,0040) unset
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5093 UploadInstance(_REMOTE, 'DummyCT.dcm')
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5094
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5095 # 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	5096
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5097 # 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	5098 self.assertEqual(0, CountDicomResults('PatientSex=*'))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5099 self.assertEqual(0, CountRestResults('*'))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5100
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5101 # 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	5102 self.assertEqual(0, CountDicomResults('PatientSex=F'))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5103 self.assertEqual(0, CountDicomResults('PatientSex=M'))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5104 self.assertEqual(0, CountRestResults('F'))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5105 self.assertEqual(0, CountRestResults('M'))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5106
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5107 # 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	5108 # 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	5109 # as a filter in such a situation.
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5110 self.assertEqual(1, CountDicomResults('PatientSex'))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5111 self.assertEqual(1, CountDicomResults('PatientSex='))
2444c9a7c422 test_bitbucket_issue_90 Sebastien Jodogne <s.jodogne@gmail.com> parents: 207 diff changeset	5112 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	5113
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5114
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5115 def test_rest_modalities_in_study(self):
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5116 # 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	5117 # 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	5118 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5119
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5120 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5121 'Query' : { 'ModalitiesInStudy' : 'US' }})
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5122 self.assertEqual(0, len(a))
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5123
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5124 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5125 'Query' : { 'ModalitiesInStudy' : 'US\\CT' }})
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5126 self.assertEqual(1, len(a))
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5127
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5128 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5129 'Query' : { 'ModalitiesInStudy' : 'CT' }})
2c50c8f340c2 test_rest_modalities_in_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 208 diff changeset	5130 self.assertEqual(1, len(a))
211 a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5131
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5132
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5133 def test_series_status(self):
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5134 def HasCompletedInChanges():
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5135 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	5136 if c['ChangeType'] == 'CompletedSeries':
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5137 return True;
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5138
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5139 return False
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5140
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5141 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm')
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5142 series = '8ea120d7-5057d919-837dfbcc-ccd04e0f-7f3a94aa'
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5143 self.assertEqual('Unknown', DoGet(_REMOTE, '/series/%s' % series)['Status'])
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5144 self.assertFalse(HasCompletedInChanges())
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5145
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5146 series = 'ce25ecb6-ed79d004-5ae43ca7-3fc89bc5-67511614'
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5147
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5148 for i in range(3):
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5149 UploadInstance(_REMOTE, 'Series/Lena-%d.dcm' % (i + 1))
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5150 self.assertEqual('Missing', DoGet(_REMOTE, '/series/%s' % series)['Status'])
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5151 self.assertFalse(HasCompletedInChanges())
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5152
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5153 UploadInstance(_REMOTE, 'Series/Lena-4.dcm')
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5154 self.assertEqual('Complete', DoGet(_REMOTE, '/series/%s' % series)['Status'])
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5155 self.assertTrue(HasCompletedInChanges())
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5156
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5157 DoDelete(_REMOTE, '/changes')
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5158 self.assertFalse(HasCompletedInChanges())
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5159
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5160 UploadInstance(_REMOTE, 'Series/Lena-5.dcm')
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5161 self.assertEqual('Inconsistent', DoGet(_REMOTE, '/series/%s' % series)['Status'])
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5162 self.assertFalse(HasCompletedInChanges())
a05cc24f84e5 test_series_status Sebastien Jodogne <s.jodogne@gmail.com> parents: 210 diff changeset	5163
215 d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5164
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5165 def test_dicomweb(self):
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5166 def Compare(dicom, reference):
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5167 a = UploadInstance(_REMOTE, dicom) ['ID']
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5168 b = DoGet(_REMOTE, '/instances/%s/file' % a,
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5169 headers = { 'Accept' : 'application/dicom+json' })
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5170 with open(GetDatabasePath(reference), 'rb') as c:
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5171 d = json.load(c)
220 7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5172 AssertAlmostEqualRecursive(self, d, b)
215 d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5173
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5174 Compare('DummyCT.dcm', 'DummyCT.json')
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5175 Compare('MarekLatin2.dcm', 'MarekLatin2.json')
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5176 Compare('HierarchicalAnonymization/StructuredReports/IM0',
d8fc62207ba3 test_dicomweb Sebastien Jodogne <s.jodogne@gmail.com> parents: 214 diff changeset	5177 'HierarchicalAnonymization/StructuredReports/IM0.json')
217 a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5178
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5179
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5180 def test_issue_95_encodings(self):
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	5181 # https://bugs.orthanc-server.com/show_bug.cgi?id=95
217 a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5182 # Check out image: "../Database/Encodings/DavidClunie/charsettests.screenshot.png"
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5183
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5184 # Very useful tool: "file2" from package "file-kanji"
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5185
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5186 def GetPatientName(dicom):
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5187 i = UploadInstance(_REMOTE, dicom) ['ID']
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5188 j = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5189 return j['PatientName']
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5190
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5191 def ComparePatientName(name, dicom):
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5192 self.assertEqual(name, GetPatientName(dicom))
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5193
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5194 # 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	5195 ComparePatientName(u'Buc^Jérôme', 'Encodings/DavidClunie/SCSFREN')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5196
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5197 # 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	5198 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	5199
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5200 # 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	5201 ComparePatientName(u'Wang^XiaoDong=王^小东=', 'Encodings/DavidClunie/SCSX2')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5202
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5203 # 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	5204 ComparePatientName(u'Wang^XiaoDong=王^小東=', 'Encodings/DavidClunie/SCSX1')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5205
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5206 # 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	5207 ComparePatientName(u'Yamada^Tarou=山田^太郎=やまだ^たろう', 'Encodings/DavidClunie/SCSH31')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5208
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5209 # 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	5210 ComparePatientName(u'Äneas^Rüdiger', 'Encodings/DavidClunie/SCSGERM')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5211
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5212 # 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	5213 ComparePatientName(u'Διονυσιος', 'Encodings/DavidClunie/SCSGREEK')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5214
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5215 # 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	5216 ComparePatientName(u'Люкceмбypг', 'Encodings/DavidClunie/SCSRUSS')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5217
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5218 # 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	5219 # NB: Hebrew is a right-to-left encoding, copying/pasting from
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5220 # Linux console into Emacs automatically reverse the string
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5221 ComparePatientName(u'שרון^דבורה', 'Encodings/DavidClunie/SCSHBRW')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5222
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5223 # 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	5224 # 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	5225 # characters by default, but copy/paste works with Emacs
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5226 ComparePatientName(u'قباني^لنزار', 'Encodings/DavidClunie/SCSARAB')
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5227
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5228 # SCSH32: This SpecificCharacterSet is composed of 2
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5229 # codepages: "ISO 2022 IR 13" (i.e. "SHIFT_JIS") until the
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5230 # 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	5231 # remainer. Orthanc only takes into consideration the first
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5232 # codepage: This is a limitation.
a491d5ec370a test encodings Sebastien Jodogne <s.jodogne@gmail.com> parents: 215 diff changeset	5233 # 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	5234 self.assertTrue(GetPatientName('Encodings/DavidClunie/SCSH32').startswith(u'ﾔﾏﾀﾞ^ﾀﾛｳ='))
218 70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5235
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5236
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5237 def test_findscu_missing_tags(self):
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5238 # dcmodify -e Rows DummyCTInvalidRows.dcm -gst -gse -gin
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5239 UploadInstance(_REMOTE, 'DummyCT.dcm')
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5240 UploadInstance(_REMOTE, 'DummyCTInvalidRows.dcm')
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5241
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5242 i = CallFindScu([ '-k', '0008,0052=IMAGES', '-k', 'Rows', '-k', 'PatientName' ])
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5243
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5244 # We have 2 instances...
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5245 patientNames = re.findall('$0010,0010$.?\[(.?)\]', i)
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5246 self.assertEqual(2, len(patientNames))
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5247 self.assertEqual('KNIX', patientNames[0])
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5248 self.assertEqual('KNIX', patientNames[1])
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5249
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5250 # ...but only 1 value for the "Rows" tag
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5251 rows = re.findall('$0028,0010$ US ([0-9]+)', i)
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5252 self.assertEqual(1, len(rows))
70fba41776be test_findscu_missing_tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 217 diff changeset	5253 self.assertEqual('512', rows[0])
219 00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5254
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5255
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5256
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5257 def test_bitbucket_issue_131(self):
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5258 # "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	5259 # StudyInstanceUID in it's database."
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	5260 # 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	5261
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5262 # Insert 2 instances, with the same StudyInstanceUID, but with
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5263 # different patient IDs. Orthanc will create 2 distincts
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5264 # patients, and the hierarchy of resources above the two
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5265 # instances will be fully disjoint.
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5266 UploadInstance(_REMOTE, 'PatientIdsCollision/Issue131-a.dcm')
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5267 UploadInstance(_REMOTE, 'PatientIdsCollision/Issue131-b.dcm')
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5268
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5269 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5270 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5271
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5272 a = DoPost(_REMOTE, '/modalities/self/query', {
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5273 'Level' : 'Study',
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5274 'Query' : {"PatientID": "A" }})['ID']
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5275
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5276 # 1 study is matched
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5277 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	5278
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5279 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
220 7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5280 WaitAllNewJobsDone(_REMOTE, lambda: DoPost
7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5281 (_REMOTE, '/queries/%s/retrieve' % a,
7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5282 '{"TargetAet":"ORTHANCTEST","Synchronous":false}'))
219 00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5283
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5284 # 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	5285 # 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	5286 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5287
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5288
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5289 # Match the 2 studies
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5290 a = DoPost(_REMOTE, '/modalities/self/query', {
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5291 'Level' : 'Study',
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5292 'Query' : {"StudyInstanceUID": "2.25.123" }})['ID']
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5293 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	5294 DropOrthanc(_LOCAL)
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5295 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
220 7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5296 WaitAllNewJobsDone(_REMOTE, lambda: DoPost
7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5297 (_REMOTE, '/queries/%s/retrieve' % a,
7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5298 '{"TargetAet":"ORTHANCTEST","Synchronous":false}'))
219 00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5299 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5300
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5301
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5302 # 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	5303 a = DoPost(_REMOTE, '/modalities/self/query', {
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5304 'Level' : 'Patient',
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5305 'Query' : {"PatientID": "A" }})['ID']
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5306 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	5307 DropOrthanc(_LOCAL)
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5308 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
220 7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5309 WaitAllNewJobsDone(_REMOTE, lambda: DoPost
7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5310 (_REMOTE, '/queries/%s/retrieve' % a,
7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5311 '{"TargetAet":"ORTHANCTEST","Synchronous":false}'))
219 00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5312 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5313
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5314
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5315 # 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	5316 a = DoPost(_REMOTE, '/modalities/self/query', {
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5317 'Level' : 'Series',
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5318 'Query' : {"PatientID": "A" }})['ID']
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5319 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	5320 DropOrthanc(_LOCAL)
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5321 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
220 7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5322 WaitAllNewJobsDone(_REMOTE, lambda: DoPost
7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5323 (_REMOTE, '/queries/%s/retrieve' % a,
7b1c976caa9b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 219 diff changeset	5324 '{"TargetAet":"ORTHANCTEST","Synchronous":false}'))
219 00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5325 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
00e5aeea33dd test_bitbucket_issue_131 Sebastien Jodogne <s.jodogne@gmail.com> parents: 218 diff changeset	5326
233 ce0b19a2c807 test_bitbucket_issue_136 Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	5327
ce0b19a2c807 test_bitbucket_issue_136 Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	5328 def test_bitbucket_issue_136(self):
ce0b19a2c807 test_bitbucket_issue_136 Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	5329 UploadInstance(_REMOTE, 'Issue137.dcm')
ce0b19a2c807 test_bitbucket_issue_136 Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	5330 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	5331 patientNames = re.findall('$0010,0010$.?\[(.?)\]', i)
ce0b19a2c807 test_bitbucket_issue_136 Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	5332 self.assertEqual(1, len(patientNames))
ce0b19a2c807 test_bitbucket_issue_136 Sebastien Jodogne <s.jodogne@gmail.com> parents: 231 diff changeset	5333 self.assertEqual('John Doe', patientNames[0])
234 93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5334
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5335
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5336 def test_anonymize_relationships_4(self):
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5337 # 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	5338 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	5339 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	5340 study = '0c923249-d52121a9-2b7167f7-6b85534f-0943697e'
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5341
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5342 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, '{}',
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5343 'application/json')['ID']
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5344 series = DoGet(_REMOTE, '/studies/%s/series' % anonymized)
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5345 self.assertEqual(2, len(series))
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5346
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5347 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	5348 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	5349 self.assertEqual(1, len(cr))
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5350 self.assertEqual(1, len(pr))
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5351 self.assertEqual(1, len(cr[0]['Instances']))
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5352 self.assertEqual(1, len(pr[0]['Instances']))
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5353
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5354 crinstance = DoGet(_REMOTE, '/instances/%s' % cr[0]['Instances'][0])
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5355 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	5356
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5357 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	5358 crinstance['MainDicomTags']['SOPInstanceUID'])
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5359 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	5360 '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	5361
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5362 # This fails on Orthanc <= 1.5.6
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5363 self.assertEqual(tags['0008,1115'][0]['0020,000e'],
93cd4fdd4a67 test_anonymize_relationships_4 Sebastien Jodogne <s.jodogne@gmail.com> parents: 233 diff changeset	5364 cr[0]['MainDicomTags']['SeriesInstanceUID'])
235 9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5365
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5366
255 02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5367 def test_anonymize_relationships_5(self):
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5368 ct1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/CT01.dcm')
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5369 rt1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/RT.dcm')
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5370 oStudyId = ct1['ParentStudy']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5371 oCtInstanceId = ct1['ID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5372 oRtInstanceId = rt1['ID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5373
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5374 oCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oCtInstanceId)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5375 oRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oRtInstanceId)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5376
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5377 # first validate the relationships in the source data
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5378 oStudyUID = oCtTags['StudyInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5379 oRtSeriesUID = oRtTags['SeriesInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5380 oRtInstanceUID = oRtTags['SOPInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5381 oRtFrameOfReferenceUID = oRtTags['ReferencedFrameOfReferenceSequence'][0]['FrameOfReferenceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5382 oCtSeriesUID = oCtTags['SeriesInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5383 oCtInstanceUID = oCtTags['SOPInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5384 oCtFrameOfReferenceUID = oCtTags['FrameOfReferenceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5385
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5386 oContourSequenceCount = len(oRtTags['ROIContourSequence'][0]['ContourSequence'])
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5387 self.assertEqual(oCtFrameOfReferenceUID, oRtFrameOfReferenceUID)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5388 self.assertEqual(oStudyUID, oRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['ReferencedSOPInstanceUID'])
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5389 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	5390 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	5391 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	5392
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5393 ### anonymize
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5394
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5395 aStudyId = DoPost(_REMOTE, '/studies/%s/anonymize' % oStudyId, '{}',
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5396 'application/json')['ID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5397
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5398 ### validate
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5399
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5400 aSeries = DoGet(_REMOTE, '/studies/%s/series' % aStudyId)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5401 self.assertEqual(2, len(aSeries))
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5402
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5403 aCt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'CT', aSeries))
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5404 aRt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'RTSTRUCT', aSeries))
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5405 aCtInstanceId = aCt[0]['Instances'][0]
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5406 aRtInstanceId = aRt[0]['Instances'][0]
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5407 aCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aCtInstanceId)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5408 aRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aRtInstanceId)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5409
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5410 # now validate the relationships in the anonymized data
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5411 aStudyUID = aCtTags['StudyInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5412 aRtSeriesUID = aRtTags['SeriesInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5413 aRtInstanceUID = aRtTags['SOPInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5414 aRtFrameOfReferenceUID = aRtTags['ReferencedFrameOfReferenceSequence'][0]['FrameOfReferenceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5415 aCtSeriesUID = aCtTags['SeriesInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5416 aCtInstanceUID = aCtTags['SOPInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5417 aCtFrameOfReferenceUID = aCtTags['FrameOfReferenceUID']
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5418
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5419 aContourSequenceCount = len(aRtTags['ROIContourSequence'][0]['ContourSequence'])
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5420 # make sure all UIDs have been updated
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5421 self.assertNotEqual(oStudyUID, aStudyUID)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5422 self.assertNotEqual(oRtSeriesUID, aRtSeriesUID)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5423 self.assertNotEqual(oRtInstanceUID, aRtInstanceUID)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5424 self.assertNotEqual(oRtFrameOfReferenceUID, aRtFrameOfReferenceUID)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5425 self.assertNotEqual(oCtSeriesUID, aCtSeriesUID)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5426 self.assertNotEqual(oCtInstanceUID, aCtInstanceUID)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5427 self.assertNotEqual(oCtFrameOfReferenceUID, aCtFrameOfReferenceUID)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5428
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5429 # validate the relationships
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5430 self.assertEqual(oContourSequenceCount, aContourSequenceCount)
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5431 self.assertEqual(aCtFrameOfReferenceUID, aRtFrameOfReferenceUID)
256 397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5432 self.assertEqual(aStudyUID, aRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['ReferencedSOPInstanceUID'])
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5433 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	5434 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	5435 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	5436
256 397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5437 def test_anonymize_relationships_5b(self):
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5438 # same test as previous one but, this time, we force the StudyInstanceUID
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5439 ct1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/CT01.dcm')
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5440 rt1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/RT.dcm')
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5441 oStudyId = ct1['ParentStudy']
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5442 oCtInstanceId = ct1['ID']
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5443 oRtInstanceId = rt1['ID']
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5444
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5445 oCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oCtInstanceId)
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5446 oRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oRtInstanceId)
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5447
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5448 ### anonymize while forcing the StudyInstanceUID
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5449
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5450 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	5451 'application/json')['ID']
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5452
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5453 ### validate
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5454
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5455 aSeries = DoGet(_REMOTE, '/studies/%s/series' % aStudyId)
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5456 self.assertEqual(2, len(aSeries))
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5457
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5458 aCt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'CT', aSeries))
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5459 aRt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'RTSTRUCT', aSeries))
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5460 aCtInstanceId = aCt[0]['Instances'][0]
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5461 aRtInstanceId = aRt[0]['Instances'][0]
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5462 aCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aCtInstanceId)
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5463 aRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aRtInstanceId)
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5464
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5465 self.assertEqual("1.2.3.4", aCtTags['StudyInstanceUID'])
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5466 self.assertEqual("1.2.3.4", aRtTags['StudyInstanceUID'])
397bcd1d16b2 tests for RT-STRUCT anonymization amazy parents: 255 diff changeset	5467 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	5468
02c3d91b155c added anonymization test for RTH data (currently failing) amazy parents: 254 diff changeset	5469
235 9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5470 def test_bitbucket_issue_140(self):
266 b105bb2233c6 fix issue 140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 265 diff changeset	5471 # "Modifying private tags with REST API changes VR from LO to
267 f30b5bfa9599 note Sebastien Jodogne <s.jodogne@gmail.com> parents: 266 diff changeset	5472 # UN." This test fails if DCMTK <= 3.6.1 (e.g. fails on Ubuntu 16.04).
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	5473 # 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	5474 source = UploadInstance(_REMOTE, 'Issue140.dcm') ['ID']
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5475 series = DoGet(_REMOTE, '/instances/%s' % source) ['ParentSeries']
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5476
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5477 target = DoPost(_REMOTE, '/series/%s/modify' % series, {
266 b105bb2233c6 fix issue 140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 265 diff changeset	5478 'Replace' : { 'RadioButton3' : 'aaabbbccc' },
b105bb2233c6 fix issue 140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 265 diff changeset	5479 'PrivateCreator' : 'RadioLogic', # <= the trick is here
235 9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5480 }, 'application/json') ['ID']
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5481
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5482 instances = DoGet(_REMOTE, '/series/%s/instances' % target)
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5483 self.assertEqual(1, len(instances))
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5484
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5485 tags = DoGet(_REMOTE, '/instances/%s/tags' % source)
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5486 t = tags['4321,1012']
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5487 self.assertEqual('String', t['Type'])
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5488 self.assertEqual('RadioButton3', t['Name'])
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5489 self.assertEqual('RadioLogic', t['PrivateCreator'])
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5490 self.assertEqual('jklmopq', t['Value'])
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5491
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5492 tags = DoGet(_REMOTE, '/instances/%s/tags' % instances[0]['ID'])
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5493 t = tags['4321,1012']
327 33ba5b1a0dd9 note Sebastien Jodogne <s.jodogne@gmail.com> parents: 326 diff changeset	5494 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	5495 self.assertEqual('RadioButton3', t['Name'])
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5496 self.assertEqual('RadioLogic', t['PrivateCreator'])
9929e4af2b7a test_bitbucket_issue_140 Sebastien Jodogne <s.jodogne@gmail.com> parents: 234 diff changeset	5497 self.assertEqual('aaabbbccc', t['Value'])
236 2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5498
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5499
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5500 def test_find_normalize(self):
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5501 # https://groups.google.com/d/msg/orthanc-users/AIwooGjsh94/YL28MNY4AgAJ
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5502
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5503 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5504
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5505 a = DoPost(_REMOTE, '/modalities/self/query', {
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5506 'Level' : 'Instance',
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5507 'Query' : { 'Rows' : '42' }
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5508 }) ['ID']
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5509
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5510 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a)
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5511 self.assertEqual(1, len(b))
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5512 self.assertFalse('Rows' in b[0])
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5513
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5514 a = DoPost(_REMOTE, '/modalities/self/query', {
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5515 'Level' : 'Instance',
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5516 'Query' : { 'Rows' : '42' },
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5517 'Normalize' : False
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5518 }) ['ID']
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5519
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5520 b = DoGet(_REMOTE, '/queries/%s/answers' % a)
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5521 self.assertEqual(0, len(b))
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5522
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5523 a = DoPost(_REMOTE, '/modalities/self/query', {
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5524 'Level' : 'Instance',
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5525 'Query' : { 'Rows' : '512' },
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5526 'Normalize' : False
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5527 }) ['ID']
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5528
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5529 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a)
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5530 self.assertEqual(1, len(b))
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5531 self.assertTrue('Rows' in b[0])
2de1aec255ae test_find_normalize Sebastien Jodogne <s.jodogne@gmail.com> parents: 235 diff changeset	5532 self.assertEqual('512', b[0]['Rows'])
237 21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5533
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5534 a = DoPost(_REMOTE, '/modalities/self/query', {
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5535 'Level' : 'Instance',
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5536 'Query' : { 'Rows' : '' },
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5537 'Normalize' : False
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5538 }) ['ID']
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5539
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5540 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a)
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5541 self.assertEqual(1, len(b))
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5542 self.assertTrue('Rows' in b[0])
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5543 self.assertEqual('512', b[0]['Rows'])
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5544
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5545 self.assertRaises(Exception, lambda: DoPost(
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5546 _REMOTE, '/modalities/self/query', {
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5547 'Level' : 'Instance',
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5548 'Query' : { 'Rows' : '*' }, # Out-of-range value
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5549 'Normalize' : False
21aa666c8fa0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 236 diff changeset	5550 }))
243 cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5551
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5552
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5553 def test_bitbucket_issue_141(self):
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	5554 # 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	5555 a = UploadInstance(_REMOTE, 'Issue141.dcm') ['ID']
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5556 study = '494c8037-b237f263-d8f15075-c8cb2280-daf39bd1'
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5557
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5558 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f:
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5559 pdf = f.read()
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5560
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5561 b = DoPost(_REMOTE, '/tools/create-dicom', {
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5562 'Parent' : study,
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5563 'Tags' : {},
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5564 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5565 }) ['ID']
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5566
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5567 tagsA = DoGet(_REMOTE, '/instances/%s/tags?short' % a)
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5568 tagsB = DoGet(_REMOTE, '/instances/%s/tags?short' % b)
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5569 self.assertEqual(tagsA['0008,0005'], tagsB['0008,0005'])
cccf697a4e13 test_bitbucket_issue_141 Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	5570 self.assertEqual(tagsA['0008,1030'], tagsB['0008,1030'])
247 1abdab0ba0e6 test_modifying_missing_patientid Sebastien Jodogne <s.jodogne@gmail.com> parents: 243 diff changeset	5571
1abdab0ba0e6 test_modifying_missing_patientid Sebastien Jodogne <s.jodogne@gmail.com> parents: 243 diff changeset	5572
1abdab0ba0e6 test_modifying_missing_patientid Sebastien Jodogne <s.jodogne@gmail.com> parents: 243 diff changeset	5573 def test_modifying_missing_patientid(self):
1abdab0ba0e6 test_modifying_missing_patientid Sebastien Jodogne <s.jodogne@gmail.com> parents: 243 diff changeset	5574 # 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	5575 UploadInstance(_REMOTE, '2019-06-17-VedranZdesic.dcm')
1abdab0ba0e6 test_modifying_missing_patientid Sebastien Jodogne <s.jodogne@gmail.com> parents: 243 diff changeset	5576 DoPost(_REMOTE, '/studies/0c4aca1d-c107a241-6659d6aa-594c674a-a468b94a/modify', {})
262 045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5577
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5578
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5579 def test_log_level(self):
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	5580 # 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	5581 original = DoGet(_REMOTE, '/tools/log-level')
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5582
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5583 DoPut(_REMOTE, '/tools/log-level', 'default')
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5584 self.assertEqual('default', DoGet(_REMOTE, '/tools/log-level'))
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5585 DoGet(_REMOTE, '/system')
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5586
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5587 DoPut(_REMOTE, '/tools/log-level', 'verbose')
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5588 self.assertEqual('verbose', DoGet(_REMOTE, '/tools/log-level'))
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5589 DoGet(_REMOTE, '/system')
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5590
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5591 DoPut(_REMOTE, '/tools/log-level', 'trace')
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5592 self.assertEqual('trace', DoGet(_REMOTE, '/tools/log-level'))
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5593 DoGet(_REMOTE, '/system')
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5594
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5595 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/log-level', 'nope'))
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5596
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5597 # Switch back to the original log level
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5598 DoPut(_REMOTE, '/tools/log-level', original)
264 445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5599
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5600
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5601 def test_upload_compressed(self):
265 8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5602 # New in Orthanc 1.6.0
264 445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5603 with open(GetDatabasePath('DummyCT.dcm.gz'), 'rb') as f:
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5604 d = f.read()
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5605
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5606 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances', d, 'application/dicom'))
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5607
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5608 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances', d, 'application/dicom',
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5609 headers = { 'Content-Encoding' : 'nope' }))
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5610
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5611 a = DoPost(_REMOTE, '/instances', d, 'application/dicom',
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5612 headers = { 'Content-Encoding' : 'gzip' })
445f498bc1d4 test_upload_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	5613 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', a['ID'])
262 045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5614
045a45c3f945 test_log_level Sebastien Jodogne <s.jodogne@gmail.com> parents: 260 diff changeset	5615
263 a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5616 def test_study_series_find_inconsistency(self):
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5617 # 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	5618
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5619 def CountAnswers(query):
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5620 a = DoPost(_REMOTE, 'modalities/self/query', query)
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5621 return len(DoGet(_REMOTE, '%s/answers' % a['Path']))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5622
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5623 # 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	5624 # "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	5625 # the "main DICOM tags" of Orthanc.
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5626 UploadInstance(_REMOTE, 'Issue137.dcm')
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5627
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5628
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5629 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5630 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5631 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5632
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5633 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5634 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5635 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5636
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5637
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5638 ##
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5639 ## "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	5640 ## 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	5641 ##
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5642
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5643 # 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	5644 # is wiped out by the normalization
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5645 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5646 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5647 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5648 'SeriesDescription' : 'NOPE'
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5649 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5650 'Normalize' : False
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5651 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5652 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5653 # This test fails on Orthanc <= 1.5.8
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5654 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5655 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5656 'SeriesDescription' : '*' # 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	5657 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5658 'Normalize' : False
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5659 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5660 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5661 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5662 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5663 'SeriesDescription' : 'THIS^VALUE^IS^WIPED^OUT'
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5664 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5665 'Normalize' : True
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5666 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5667 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5668 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5669 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5670 'SeriesDescription' : '*' # Matches, as wiped out by the normalization
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5671 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5672 'Normalize' : True
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5673 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5674
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5675 for normalize in [ True, False ]:
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5676 # 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	5677 # normalization has no effect
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5678
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5679 # "Universal matching" will match all entities, including
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5680 # those with the missing tag
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5681 # 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	5682 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5683 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5684 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5685 'SeriesDescription' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5686 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5687 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5688 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5689 # "Universal matching" will match all entities, including
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5690 # those with the missing tag
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5691 # 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	5692 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5693 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5694 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5695 'SeriesDescription' : '*' # Wildcard matching
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5696 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5697 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5698 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5699 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5700 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5701 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5702 '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	5703 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5704 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5705 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5706 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5707 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5708 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5709 'SeriesDescription' : 'MISMATCHED^VALUE'
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5710 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5711 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5712 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5713
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5714 # Universal matching matches any instance, even if the
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5715 # 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	5716 # makes no sense
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5717 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5718 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5719 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5720 'SeriesDescription' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5721 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5722 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5723 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5724
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5725
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5726
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5727 ##
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5728 ## "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	5729 ##
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5730
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5731 # 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	5732 # is wiped out by the normalization
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5733 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5734 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5735 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5736 'ProtocolName' : 'NOPE'
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5737 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5738 'Normalize' : False
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5739 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5740 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5741 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5742 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5743 '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	5744 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5745 'Normalize' : False
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5746 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5747 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5748 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5749 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5750 'ProtocolName' : 'THIS^VALUE^IS^WIPED^OUT'
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5751 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5752 'Normalize' : True
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5753 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5754 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5755 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5756 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5757 'ProtocolName' : '*' # Matches, as wiped out by the normalization
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5758 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5759 'Normalize' : True
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5760 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5761
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5762 for normalize in [ True, False ]:
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5763 # 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	5764 # normalization has no effect
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5765
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5766 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5767 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5768 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5769 'ProtocolName' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5770 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5771 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5772 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5773 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5774 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5775 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5776 '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	5777 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5778 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5779 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5780 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5781 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5782 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5783 'ProtocolName' : 'MISMATCHED^VALUE'
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5784 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5785 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5786 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5787
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5788 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5789 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5790 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5791 'ProtocolName' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5792 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5793 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5794 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5795
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5796
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5797 ##
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5798 ## "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	5799 ##
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5800
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5801 for level in [ 'Study', 'Series' ] :
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5802 for normalize in [ True, False ]:
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5803 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5804 'Level' : level,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5805 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5806 'StudyInstanceUID' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5807 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5808 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5809 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5810 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5811 'Level' : level,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5812 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5813 'StudyInstanceUID' : 'MISMATCHED^VALUE'
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5814 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5815 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5816 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5817 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5818 'Level' : level,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5819 'Query' : {
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5820 '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	5821 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5822 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5823 }))
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5824
269 b2d8582b9181 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	5825 # 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	5826 # This test fails on Orthanc <= 1.5.8
269 b2d8582b9181 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	5827 self.assertRaises(Exception, lambda: CountAnswers({
263 a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5828 'Level' : level,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5829 'Query' : {
269 b2d8582b9181 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	5830 'StudyInstanceUID' : '*'
263 a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5831 },
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5832 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency Sebastien Jodogne <s.jodogne@gmail.com> parents: 262 diff changeset	5833 }))
265 8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5834
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5835
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5836 def test_rendered(self):
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5837 # New in Orthanc 1.6.0
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5838 i = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID']
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5839 im = GetImage(_REMOTE, '/instances/%s/rendered' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5840 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5841 self.assertEqual(41, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5842 self.assertEqual(41, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5843
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5844 # http://effbot.org/zone/pil-comparing-images.htm
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5845 truth = Image.open(GetDatabasePath('ColorTestMalaterre.png'))
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5846 self.assertTrue(ImageChops.difference(im, truth).getbbox() is None)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5847
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5848 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5849 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5850 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5851 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5852
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5853 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5854 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5855 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5856 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5857
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5858 im = GetImage(_REMOTE, '/instances/%s/rendered?height=128' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5859 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5860 self.assertEqual(128, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5861 self.assertEqual(128, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5862
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5863 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10&smooth=0' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5864 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5865 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5866 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5867
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5868 im = GetImage(_REMOTE, '/instances/%s/rendered?height=10&smooth=1' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5869 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5870 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5871 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5872
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5873 im = GetImage(_REMOTE, '/instances/%s/rendered?height=5&width=10' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5874 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5875 self.assertEqual(5, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5876 self.assertEqual(5, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5877
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5878
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5879 # Grayscale image
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5880 i = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5881 im = GetImage(_REMOTE, '/instances/%s/rendered' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5882 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5883 self.assertEqual(288, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5884 self.assertEqual(288, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5885 self.assertEqual(0, im.getpixel((0, 0)))
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5886
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5887 # Those are the original windowing parameters that are written
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5888 # inside the DICOM file
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5889 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	5890 self.assertEqual("L", im2.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5891 self.assertEqual(288, im2.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5892 self.assertEqual(288, im2.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5893 self.assertTrue(ImageChops.difference(im, im2).getbbox() is None)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5894
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5895 im = GetImage(_REMOTE, '/instances/%s/rendered?width=512&smooth=0' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5896 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5897 self.assertEqual(512, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5898 self.assertEqual(512, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5899
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5900 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&smooth=0' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5901 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5902 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5903 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5904
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5905 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&smooth=1' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5906 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5907 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5908 self.assertEqual(10, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5909
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5910 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	5911 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5912 self.assertEqual(1, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5913 self.assertEqual(1, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5914 self.assertEqual(255, im.getpixel((0, 0)))
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5915
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5916 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	5917 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5918 self.assertEqual(1, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5919 self.assertEqual(1, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5920 self.assertEqual(0, im.getpixel((0, 0)))
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5921
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5922
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5923 # Test monochrome 1
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5924 i = UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm')['ID']
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5925 im = GetImage(_REMOTE, '/instances/%s/rendered' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5926 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5927 self.assertEqual(2010, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5928 self.assertEqual(2446, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5929 self.assertEqual(0, im.getpixel((0, 0)))
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5930 im = GetImage(_REMOTE, '/instances/%s/rendered?width=20' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5931 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5932 self.assertEqual(20, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5933 self.assertEqual(24, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5934 im = GetImage(_REMOTE, '/instances/%s/rendered?height=24' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5935 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5936 self.assertEqual(20, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5937 self.assertEqual(24, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5938 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&height=24' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5939 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5940 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5941 self.assertEqual(12, im.size[1])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5942 im = GetImage(_REMOTE, '/instances/%s/rendered?width=40&height=24' % i)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5943 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5944 self.assertEqual(20, im.size[0])
8d63d035b837 test_rendered Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	5945 self.assertEqual(24, im.size[1])
268 c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5946
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5947
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5948 def test_bitbucket_issue_154(self):
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5949 # "Matching against list of UID-s by C-MOVE"
319 de6e73e4df60 leaving bitbucket Sebastien Jodogne <s.jodogne@gmail.com> parents: 318 diff changeset	5950 # 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	5951 a = UploadInstance(_REMOTE, 'Issue154-d1.dcm') ['ID']
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5952 b = UploadInstance(_REMOTE, 'Issue154-d2.dcm') ['ID']
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5953
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5954 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	5955 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	5956 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	5957
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5958 # C-FIND is working on list of UIDs
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5959 i = CallFindScu([ '-k', 'QueryRetrieveLevel=SERIES',
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5960 '-k', 'StudyInstanceUID=%s' % study,
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5961 '-k', 'SeriesInstanceUID=%s\\%s' % (series1, series2) ])
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5962 series = re.findall('$0020,000e$.?\[(.?)\]', i)
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5963 self.assertEqual(2, len(series))
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5964 self.assertTrue(series1 in series)
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5965 self.assertTrue(series2 in series)
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5966
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5967 # Individual retrieval is working in Orthanc < 1.6.0
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5968 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5969 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5970 '--study', '-k', 'QueryRetrieveLevel=SERIES',
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5971 '-k', 'StudyInstanceUID=%s' % study,
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5972 '-k', 'SeriesInstanceUID=%s' % series1,
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5973 ])))
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5974 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5975 '--study', '-k', 'QueryRetrieveLevel=SERIES',
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5976 '-k', 'StudyInstanceUID=%s' % study,
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5977 '-k', 'SeriesInstanceUID=%s' % series2,
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5978 ])))
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5979 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5980
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5981 DropOrthanc(_LOCAL)
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5982
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5983 # 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	5984 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5985 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5986 '--study', '-k', 'QueryRetrieveLevel=SERIES',
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5987 '-k', 'StudyInstanceUID=%s' % study,
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5988 '-k', 'SeriesInstanceUID=%s\\%s' % (series1, series2),
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5989 ])))
c8d79d8258cd test_bitbucket_issue_154 Sebastien Jodogne <s.jodogne@gmail.com> parents: 267 diff changeset	5990 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
279 31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	5991
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	5992
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	5993 def test_storage_commitment_api(self):
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	5994 # 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	5995
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	5996 def WaitTransaction(uid):
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	5997 while True:
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	5998 s = DoGet(_REMOTE, '/storage-commitment/%s' % uid)
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	5999 if s['Status'] != 'Pending':
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6000 return s
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6001 else:
342 bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	6002 time.sleep(0.01)
280 5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6003
281 99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6004 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')
279 31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6005 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	6006 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	6007
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6008 # Against self
281 99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6009 transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', {
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6010 "DicomInstances" : [ [ sopClassUid, sopInstanceUid ] ],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6011 }) ['ID']
279 31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6012 self.assertTrue(transaction.startswith('2.25.'))
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6013
280 5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6014 result = WaitTransaction(transaction)
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6015 self.assertEqual('ORTHANC', result['RemoteAET'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6016 self.assertEqual('Success', result['Status'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6017 self.assertEqual(1, len(result['Success']))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6018 self.assertEqual(0, len(result['Failures']))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6019 self.assertEqual(sopClassUid, result['Success'][0]['SOPClassUID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6020 self.assertEqual(sopInstanceUid, result['Success'][0]['SOPInstanceUID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6021
281 99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6022 tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', {
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6023 "DicomInstances" : [
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6024 { 'SOPClassUID' : sopClassUid,
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6025 'SOPInstanceUID' : sopInstanceUid },
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6026 ],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6027 })
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6028 self.assertEqual(tmp['Path'], '/storage-commitment/%s' % tmp['ID'])
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6029 self.assertEqual(result, WaitTransaction(transaction))
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6030
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6031 tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', {
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6032 "Resources" : [
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6033 instance['ID'],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6034 instance['ParentSeries'],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6035 instance['ParentStudy'],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6036 instance['ParentPatient'],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6037 ]
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6038 })
280 5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6039 self.assertEqual(tmp['Path'], '/storage-commitment/%s' % tmp['ID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6040 self.assertEqual(result, WaitTransaction(transaction))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6041
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6042
281 99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6043 transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', {
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6044 "DicomInstances" : [
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6045 [ 'nope', 'nope2' ],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6046 [ sopClassUid, sopInstanceUid ],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6047 ],
99acf0c17348 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 280 diff changeset	6048 }) ['ID']
279 31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6049 self.assertTrue(transaction.startswith('2.25.'))
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6050
280 5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6051 result = WaitTransaction(transaction)
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6052 self.assertEqual('ORTHANC', result['RemoteAET'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6053 self.assertEqual('Failure', result['Status'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6054 self.assertEqual(1, len(result['Success']))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6055 self.assertEqual(1, len(result['Failures']))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6056 self.assertEqual(sopClassUid, result['Success'][0]['SOPClassUID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6057 self.assertEqual(sopInstanceUid, result['Success'][0]['SOPInstanceUID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6058 self.assertEqual('nope', result['Failures'][0]['SOPClassUID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6059 self.assertEqual('nope2', result['Failures'][0]['SOPInstanceUID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6060 self.assertEqual(274, result['Failures'][0]['FailureReason'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6061
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6062 # Cannot remove items from a failed storage commitment transaction
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6063 self.assertRaises(Exception, lambda:
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6064 DoPost(_REMOTE, '/storage-commitment/%s/remove' % transaction))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6065
279 31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6066
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6067 # 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	6068 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	6069 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	6070 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	6071 "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	6072 [ 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	6073 ]
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	6074 }))
279 31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6075
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6076
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6077
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6078 def test_storage_commitment_store(self):
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6079 # 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	6080
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6081 def WaitTransaction(uid):
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6082 while True:
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6083 s = DoGet(_REMOTE, '/storage-commitment/%s' % uid)
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6084 if s['Status'] != 'Pending':
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6085 return s
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6086 else:
342 bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	6087 time.sleep(0.01)
280 5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6088
279 31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6089 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6090 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6091 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6092
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6093 # 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	6094 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	6095 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	6096 '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	6097 '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	6098 }))
279 31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6099
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6100 j = DoPost(_REMOTE, '/modalities/orthanctest/store', {
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6101 'Resources' : [ i ],
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6102 'StorageCommitment' : False,
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6103 })
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6104 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6105
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6106 j = DoPost(_REMOTE, '/modalities/self/store', {
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6107 'Resources' : [ i ],
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6108 'StorageCommitment' : True,
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6109 })
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6110
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6111 transaction = j['StorageCommitmentTransactionUID']
31e1e49df380 starting tests for storage commitment Sebastien Jodogne <s.jodogne@gmail.com> parents: 269 diff changeset	6112 self.assertTrue(transaction.startswith('2.25.'))
280 5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6113
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6114 result = WaitTransaction(transaction)
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6115 self.assertEqual('ORTHANC', result['RemoteAET'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6116 self.assertEqual('Success', result['Status'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6117 self.assertEqual(1, len(result['Success']))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6118 self.assertEqual(0, len(result['Failures']))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6119 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	6120 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	6121 result['Success'][0]['SOPInstanceUID'])
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6122
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6123 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6124 DoPost(_REMOTE, '/storage-commitment/%s/remove' % transaction)
5daa3896981c testing storage commitment reports Sebastien Jodogne <s.jodogne@gmail.com> parents: 279 diff changeset	6125 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
285 281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6126
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6127
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6128 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	6129 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6130 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6131
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6132 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f:
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6133 dicom = f.read()
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6134
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6135 self.assertRaises(Exception, lambda: DoPost(
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6136 _REMOTE, '/modalities/orthanctest/store-straight', 'nope', 'nope'))
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6137
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6138 answer = DoPost(_REMOTE, '/modalities/orthanctest/store-straight', dicom, 'nope')
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6139
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6140 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	6141 answer['SOPClassUID'])
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6142 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	6143 answer['SOPInstanceUID'])
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6144
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6145 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
281a32ecc5c1 test_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 281 diff changeset	6146 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
289 4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6147
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6148
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6149 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	6150 # Add a RLE-encoded DICOM file
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6151 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	6152 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6153 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6154 rleSize = len(DoGet(_REMOTE, '/instances/%s/file' % i))
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6155
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6156 # Export the instance, with transcoding: "_REMOTE" is the
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6157 # Orthanc server being tested
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6158 try:
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6159 DoDelete(_REMOTE, '/modalities/toto')
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6160 except:
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6161 pass
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6162
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6163 params = DoGet(_REMOTE, '/modalities?expand') ['orthanctest']
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6164 DoPut(_REMOTE, '/modalities/toto', params)
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6165 DoPost(_REMOTE, '/modalities/toto/store', str(i), 'text/plain')
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6166 j = DoGet(_LOCAL, '/instances')
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6167 self.assertEqual(1, len(j))
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6168 uncompressedSize = len(DoGet(_LOCAL, '/instances/%s/file' % j[0]))
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6169 self.assertTrue(uncompressedSize > rleSize / 2)
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6170
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	6171 # 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	6172 params['AllowTranscoding'] = False
4a70411ac9ad test_storescu_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 285 diff changeset	6173 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	6174 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	6175 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	6176 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	6177 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	6178 DoDelete(_REMOTE, '/modalities/toto')
290 b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6179
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6180
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6181 def test_bitbucket_issue_169(self):
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6182 with open(GetDatabasePath('Issue169.dcm.bz2'), 'rb') as f:
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6183 dicom = bz2.decompress(f.read())
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6184
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6185 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	6186
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6187 self.assertEqual(44350560, len(dicom))
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6188 i = DoPost(_REMOTE, '/instances', dicom, 'application/dicom') ['ID']
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6189
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6190 tags = DoGet(_REMOTE, '/instances/%s/tags' % i)
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6191 self.assertEqual('NORMAL', tags['1337,1001']['Value'])
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6192
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6193 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6194 DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6195 j = DoGet(_LOCAL, '/instances')
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6196 self.assertEqual(1, len(j))
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6197
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6198 # 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	6199 # 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	6200 # Little Endian" (1.2.840.10008.1.2)
291 cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6201 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(
cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6202 DoGet(_LOCAL, '/instances/%s/file' % j[0])))
290 b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6203
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6204 # 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	6205 # because of this transcoding
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6206 tags = DoGet(_LOCAL, '/instances/%s/tags' % j[0])
b5333f87065b test_bitbucket_issue_169 Sebastien Jodogne <s.jodogne@gmail.com> parents: 289 diff changeset	6207 self.assertEqual('NORMAL', tags['1337,1001']['Value'])
291 cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6208
cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6209
302 22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6210 def test_modify_transcode_instance(self):
291 cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6211 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6212 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(
cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6213 DoGet(_REMOTE, '/instances/%s/file' % i)))
cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6214
299 c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6215 a = ExtractDicomTags(DoGet(_REMOTE, '/instances/%s/file' % i), [ 'SOPInstanceUID' ]) [0]
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6216 self.assertTrue(len(a) > 20)
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6217
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6218 SYNTAXES = [
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6219 '1.2.840.10008.1.2',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6220 '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	6221 #'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	6222 '1.2.840.10008.1.2.2',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6223 '1.2.840.10008.1.2.4.50',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6224 '1.2.840.10008.1.2.4.51',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6225 '1.2.840.10008.1.2.4.57',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6226 '1.2.840.10008.1.2.4.70',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6227 ]
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6228
304 b8399213b840 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 302 diff changeset	6229 if HasGdcmPlugin(_REMOTE):
299 c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6230 SYNTAXES = SYNTAXES + [
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6231 '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	6232 '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	6233 '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	6234 '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	6235 ]
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6236
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6237 for syntax in SYNTAXES:
291 cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6238 transcoded = DoPost(_REMOTE, '/instances/%s/modify' % i, {
cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6239 'Transcode' : syntax,
299 c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6240 'Keep' : [ 'SOPInstanceUID' ],
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6241 'Force' : True,
291 cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6242 })
cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6243
cfa785074c64 test_modify_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 290 diff changeset	6244 self.assertEqual(syntax, GetTransferSyntax(transcoded))
292 e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6245
299 c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6246 b = ExtractDicomTags(transcoded, [ 'SOPInstanceUID' ]) [0]
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6247 self.assertTrue(len(b) > 20)
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6248 if syntax in [ '1.2.840.10008.1.2.4.50',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6249 '1.2.840.10008.1.2.4.51',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6250 '1.2.840.10008.1.2.4.81',
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6251 '1.2.840.10008.1.2.4.91' ]:
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6252 # Lossy transcoding: The SOP instance UID must have changed
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6253 self.assertNotEqual(a, b)
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6254 else:
c2144cf4bd83 HasGdcmPlugin() test Sebastien Jodogne <s.jodogne@gmail.com> parents: 293 diff changeset	6255 self.assertEqual(a, b)
292 e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6256
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6257 def test_archive_transcode(self):
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6258 info = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6259
293 032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6260 # GET on "/media"
292 e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6261 z = GetArchive(_REMOTE, '/patients/%s/media' % info['ParentPatient'])
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6262 self.assertEqual(2, len(z.namelist()))
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6263 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	6264
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6265 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	6266
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6267 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	6268 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	6269
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6270 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	6271 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	6272
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6273 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	6274 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	6275
293 032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6276
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6277 # POST on "/media"
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6278 self.assertRaises(Exception, lambda: PostArchive(
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6279 _REMOTE, '/patients/%s/media' % info['ParentPatient'], { 'Transcode' : 'nope' }))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6280
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6281 z = PostArchive(_REMOTE, '/patients/%s/media' % info['ParentPatient'], {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6282 'Transcode' : '1.2.840.10008.1.2.4.50',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6283 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6284 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	6285
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6286 z = PostArchive(_REMOTE, '/studies/%s/media' % info['ParentStudy'], {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6287 'Transcode' : '1.2.840.10008.1.2.4.51',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6288 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6289 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	6290
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6291 z = PostArchive(_REMOTE, '/series/%s/media' % info['ParentSeries'], {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6292 'Transcode' : '1.2.840.10008.1.2.4.57',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6293 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6294 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	6295
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6296
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6297 # GET on "/archive"
292 e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6298 z = GetArchive(_REMOTE, '/patients/%s/archive' % info['ParentPatient'])
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6299 self.assertEqual(1, len(z.namelist()))
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6300 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	6301
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6302 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	6303
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6304 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	6305 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	6306
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6307 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	6308 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	6309
e1827a4f5d3b test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 291 diff changeset	6310 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	6311 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	6312
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6313
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6314 # POST on "/archive"
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6315 self.assertRaises(Exception, lambda: PostArchive(
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6316 _REMOTE, '/patients/%s/archive' % info['ParentPatient'], { 'Transcode' : 'nope' }))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6317
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6318 z = PostArchive(_REMOTE, '/patients/%s/archive' % info['ParentPatient'], {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6319 'Transcode' : '1.2.840.10008.1.2.4.50',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6320 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6321 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	6322
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6323 z = PostArchive(_REMOTE, '/studies/%s/archive' % info['ParentStudy'], {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6324 'Transcode' : '1.2.840.10008.1.2.4.51',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6325 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6326 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	6327
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6328 z = PostArchive(_REMOTE, '/series/%s/archive' % info['ParentSeries'], {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6329 'Transcode' : '1.2.840.10008.1.2.4.57',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6330 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6331 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	6332
293 032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6333
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6334 # "/tools/create-*"
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6335 z = PostArchive(_REMOTE, '/tools/create-archive', {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6336 'Resources' : [ info['ParentStudy'] ],
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6337 'Transcode' : '1.2.840.10008.1.2.4.50',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6338 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6339 self.assertEqual(1, len(z.namelist()))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6340 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	6341
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6342 z = PostArchive(_REMOTE, '/tools/create-media', {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6343 'Resources' : [ info['ParentStudy'] ],
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6344 'Transcode' : '1.2.840.10008.1.2.4.51',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6345 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6346 self.assertEqual(2, len(z.namelist()))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6347 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	6348
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6349 z = PostArchive(_REMOTE, '/tools/create-media-extended', {
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6350 'Resources' : [ info['ParentStudy'] ],
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6351 'Transcode' : '1.2.840.10008.1.2.4.57',
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6352 })
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6353 self.assertEqual(2, len(z.namelist()))
032722c3e919 extended test_archive_transcode Sebastien Jodogne <s.jodogne@gmail.com> parents: 292 diff changeset	6354 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	6355
308 2565d39dd36c integration mainline->c-get Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 305 diff changeset	6356
301 6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6357 def test_modify_keep_source(self):
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6358 # 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	6359 i = UploadInstance(_REMOTE, 'DummyCT.dcm')
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6360 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6361
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6362 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], {
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6363 'Replace' : {
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6364 'StationName' : 'TEST',
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6365 },
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6366 'KeepSource' : True,
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6367 })
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6368
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6369 s = DoGet(_REMOTE, '/studies')
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6370 self.assertEqual(2, len(s))
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6371 self.assertTrue(i['ParentStudy'] in s)
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6372 self.assertTrue(j['ID'] in s)
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6373
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6374 DoDelete(_REMOTE, '/studies/%s' % j['ID'])
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6375 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6376
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6377 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], {
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6378 'Replace' : {
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6379 'StationName' : 'TEST',
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6380 },
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6381 'KeepSource' : False,
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6382 })
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6383
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6384 s = DoGet(_REMOTE, '/studies')
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6385 self.assertEqual(1, len(s))
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6386 self.assertFalse(i['ParentStudy'] in s)
6652d5720a45 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 300 diff changeset	6387 self.assertTrue(j['ID'] in s)
302 22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6388
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6389
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6390 def test_modify_transcode_study(self):
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6391 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6392 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	6393 DoGet(_REMOTE, '/instances/%s/file' % i['ID'])))
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6394
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6395 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6396 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], {
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6397 'Transcode' : '1.2.840.10008.1.2.4.50',
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6398 'KeepSource' : False
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6399 })
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6400
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6401 k = DoGet(_REMOTE, '/instances')
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6402 self.assertEqual(1, len(k))
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6403 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	6404 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	6405 DoGet(_REMOTE, '/instances/%s/file' % k[0])))
22b6dd0f8c84 test_modify_transcode_study Sebastien Jodogne <s.jodogne@gmail.com> parents: 301 diff changeset	6406
305 ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6407
498 62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6408 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	6409 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	6410 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	6411 'Replace' : replaceTags,
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6412 'Force': force,
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6413 'KeepSource' : keepSource
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6414 })
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6415
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6416 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	6417
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6418 i = UploadInstance(_REMOTE, 'DummyCT.dcm')
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6419 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	6420
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6421 # 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	6422 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	6423 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	6424
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6425 # 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	6426 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	6427 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	6428
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6429 # 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	6430 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	6431 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	6432
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6433
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6434 # 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	6435 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	6436 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	6437 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	6438
500 5386dfd854b3 fix Alain Mazy <am@osimis.io> parents: 498 diff changeset	6439 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	6440 # 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	6441 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	6442 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	6443 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	6444
62f37c13d4d0 new tests for modifications after sanity checks cleanup Alain Mazy <am@osimis.io> parents: 497 diff changeset	6445
504 16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6446 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	6447 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	6448 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	6449
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6450 if dropOrthanc:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6451 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6452
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6453 UploadFolder(_REMOTE, 'Knee/T1')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6454 UploadFolder(_REMOTE, 'Knee/T2')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6455
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6456 if dropOrthanc:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6457 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	6458
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6459 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	6460 'Replace' : replaceTags,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6461 'Force': force,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6462 'KeepSource' : keepSource
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6463 })
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6464 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	6465 return (modifyResponse, modifiedResource)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6466
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6467 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	6468 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	6469 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	6470 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	6471 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	6472 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	6473 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	6474
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6475 ####### study level tests #######
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6476
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6477 # 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	6478 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	6479 'StudyInstanceUID': kneeStudyInstanceUID,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6480 'StudyDescription': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6481 }, force=True, keepSource=True)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6482 self.assertEqual(kneeStudy, modifyResponse['ID'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6483 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	6484
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6485 # 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	6486 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	6487 'StudyInstanceUID': kneeStudyInstanceUID,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6488 'PatientName': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6489 }, force=True, keepSource=True)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6490 self.assertEqual(kneeStudy, modifyResponse['ID'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6491 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	6492 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	6493 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	6494
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6495 # 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	6496 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	6497 'StudyInstanceUID': kneeStudyInstanceUID,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6498 'PatientID': 'TOTO_ID',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6499 'PatientName': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6500 }, force=True, keepSource=True)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6501 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	6502 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	6503 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	6504 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	6505 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	6506 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	6507
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6508 ####### series level tests #######
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6509 # 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	6510 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	6511 'SeriesInstanceUID': kneeSeriesInstanceUIDT1,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6512 'StudyInstanceUID': kneeStudyInstanceUID,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6513 'SeriesDescription': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6514 }, force=True, keepSource=True)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6515 self.assertEqual(kneeSeriesT1, modifyResponse['ID'])
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6516 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	6517 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	6518
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6519
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6520 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	6521 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	6522
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6523 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	6524 patientDicomId = 'TEST_1'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6525 patientName = 'Test'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6526 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	6527 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	6528
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6529 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6530 UploadFolder(_REMOTE, 'PatientWith2studies')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6531
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6532 # 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	6533
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6534 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6535 # 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	6536 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	6537 'Replace' : {'PatientName': "TOTO"},
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6538 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6539 'KeepSource' : True
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6540 }))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6541
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6542 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6543 # 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	6544 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	6545 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6546 'PatientName': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6547 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6548 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6549 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6550 })
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6551 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	6552 # 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	6553 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	6554
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6555 # 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	6556 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	6557 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	6558 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	6559 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	6560 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	6561
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6562 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6563 # 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	6564 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6565 UploadFolder(_REMOTE, 'PatientWith2studies')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6566
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6567 # 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	6568 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	6569 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6570 'PatientName': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6571 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6572 'Keep': ['StudyInstanceUID', 'SeriesInstanceUID'],
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6573 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6574 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6575 })
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6576 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	6577 # 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	6578 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	6579
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6580 # 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	6581 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	6582 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	6583 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	6584 # 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	6585 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	6586 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	6587 # 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	6588 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	6589 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	6590
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6591 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6592 # 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	6593 # 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	6594 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	6595 'Replace' : {'PatientName': "TOTO"},
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6596 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6597 'Keep': ['StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID'],
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6598 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6599 }))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6600
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6601 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6602 # 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	6603 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6604 UploadFolder(_REMOTE, 'PatientWith2studies')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6605
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6606 # 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	6607 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	6608 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6609 'PatientName': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6610 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6611 'Keep': ['StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID'],
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6612 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6613 'KeepSource' : True
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6614 })
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6615 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	6616 # 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	6617 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	6618
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6619 # 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	6620 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	6621 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	6622 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	6623 # 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	6624 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	6625 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	6626 # 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	6627 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	6628 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	6629
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6630
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6631 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6632 # 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	6633 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6634 UploadFolder(_REMOTE, 'PatientWith2studies')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6635 UploadFolder(_REMOTE, 'Knee/T1')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6636
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6637 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	6638
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6639 # 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	6640
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6641 # 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	6642 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	6643 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6644 'PatientID': 'TEST_1'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6645 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6646 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6647 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6648 }))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6649
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6650 # 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	6651 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	6652 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6653 'PatientID': 'TEST_1',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6654 'PatientName': 'Test',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6655 'PatientBirthDate': '19000101',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6656 'PatientSex': 'F' # this is wrong !
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6657 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6658 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6659 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6660 }))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6661
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6662 # 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	6663 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	6664 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6665 'PatientID': 'TEST_1',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6666 'PatientName': 'Test',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6667 'PatientBirthDate': '19000101',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6668 'PatientSex': 'M',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6669 '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	6670 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6671 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6672 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6673 }))
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6674
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6675 # 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	6676 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	6677 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6678 'PatientID': 'TEST_1',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6679 'PatientName': 'Test',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6680 'PatientBirthDate': '19000101',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6681 'PatientSex': 'M'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6682 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6683 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6684 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6685 })
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6686 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	6687 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	6688 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	6689 # 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	6690 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	6691
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6692
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6693 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6694 # 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	6695 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6696 UploadFolder(_REMOTE, 'PatientWith2studies')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6697 UploadFolder(_REMOTE, 'Knee/T1')
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6698
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6699 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	6700 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	6701
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6702 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	6703
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6704 # 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	6705 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	6706 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6707 'PatientName': 'Test Knee',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6708 'StudyDescription': 'Knee study'
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6709 },
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6710 'Keep': ['StudyInstanceUID'],
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6711 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6712 'KeepSource' : False
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 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	6715 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	6716 # 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	6717 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	6718 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	6719
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6720 # 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	6721 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	6722 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6723 'PatientName': 'Test Knee 2',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6724 'PatientID': 'TEST_KNEE_2',
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6725 'StudyDescription': 'Knee study 2'
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 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6728 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6729 })
16ff0375835d new tests and modified tests for new DicomModificationJob features Alain Mazy <am@osimis.io> parents: 501 diff changeset	6730 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	6731 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	6732 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	6733 # 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	6734 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	6735 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	6736 # 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	6737 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	6738
305 ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6739 def test_store_peer_transcoding(self):
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6740 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6741
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6742 SYNTAXES = [
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6743 '1.2.840.10008.1.2',
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6744 '1.2.840.10008.1.2.1',
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6745 #'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	6746 '1.2.840.10008.1.2.2',
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6747 '1.2.840.10008.1.2.4.50',
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6748 '1.2.840.10008.1.2.4.51',
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6749 '1.2.840.10008.1.2.4.57',
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6750 '1.2.840.10008.1.2.4.70',
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6751 ]
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6752
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6753 if HasGdcmPlugin(_REMOTE):
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6754 SYNTAXES = SYNTAXES + [
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6755 '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	6756 '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	6757 '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	6758 '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	6759 ]
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6760
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6761 for syntax in SYNTAXES:
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6762 body = {
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6763 'Resources' : [ i ],
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6764 }
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6765
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6766 if syntax != '1.2.840.10008.1.2.1':
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6767 body['Transcode'] = syntax
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6768
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6769 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6770 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6771 DoPost(_REMOTE, '/peers/peer/store', body, 'text/plain')
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6772 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6773 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6774 self.assertEqual(syntax, GetTransferSyntax(
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6775 DoGet(_LOCAL, '/instances/%s/file' % DoGet(_LOCAL, '/instances') [0])))
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6776
ed20ead1a8b6 test_store_peer_transcoding Sebastien Jodogne <s.jodogne@gmail.com> parents: 304 diff changeset	6777 DropOrthanc(_LOCAL)
308 2565d39dd36c integration mainline->c-get Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 305 diff changeset	6778
2565d39dd36c integration mainline->c-get Sebastien Jodogne <s.jodogne@gmail.com> parents: 307 305 diff changeset	6779
295 946b2199f481 added test for c-get Alain Mazy <alain@mazy.be> parents: 285 diff changeset	6780 def test_getscu(self):
307 5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6781 def CleanTarget():
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6782 if os.path.isdir('/tmp/GETSCU'):
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6783 shutil.rmtree('/tmp/GETSCU')
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6784 os.makedirs('/tmp/GETSCU')
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6785
306 da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	6786 env = {}
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	6787 if _DOCKER:
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	6788 # 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	6789 # and running in a GNU/Linux distribution running DCMTK
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	6790 # 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	6791 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	6792
295 946b2199f481 added test for c-get Alain Mazy <alain@mazy.be> parents: 285 diff changeset	6793 # no transcoding required
307 5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6794 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6795
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6796 CleanTarget()
295 946b2199f481 added test for c-get Alain Mazy <alain@mazy.be> parents: 285 diff changeset	6797
306 da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	6798 subprocess.check_call([
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	6799 FindExecutable('getscu'),
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	6800 _REMOTE['Server'],
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	6801 str(_REMOTE['DicomPort']),
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	6802 '-aec', 'ORTHANC',
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	6803 '-aet', 'ORTHANCTEST', # pretend to be the other orthanc
307 5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6804 '-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	6805 '-k', '0008,0052=STUDY',
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	6806 '--output-directory', '/tmp/GETSCU/'
da2be3ff2db5 fix getscu binaries Sebastien Jodogne <s.jodogne@gmail.com> parents: 296 diff changeset	6807 ], env = env)
295 946b2199f481 added test for c-get Alain Mazy <alain@mazy.be> parents: 285 diff changeset	6808
311 07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	6809 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	6810 self.assertTrue(os.path.isfile(f1))
07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	6811 with open(f1, 'rb') as f:
543 8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 540 diff changeset	6812 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	6813
307 5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6814 CleanTarget()
295 946b2199f481 added test for c-get Alain Mazy <alain@mazy.be> parents: 285 diff changeset	6815
946b2199f481 added test for c-get Alain Mazy <alain@mazy.be> parents: 285 diff changeset	6816 # transcoding required
311 07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	6817 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	6818
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6819 subprocess.check_call([
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6820 FindExecutable('getscu'),
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6821 _REMOTE['Server'],
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6822 str(_REMOTE['DicomPort']),
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6823 '-aec', 'ORTHANC',
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6824 '-aet', 'ORTHANCTEST', # pretend to be the other orthanc
311 07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	6825 '-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	6826 '-k', '0008,0052=STUDY',
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6827 '--output-directory', '/tmp/GETSCU/'
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6828 ], env = env)
5be63aef39b1 fix test_getscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 306 diff changeset	6829
311 07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	6830 self.assertTrue(os.path.isfile(f1))
07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	6831 with open(f1, 'rb') as f:
543 8722f7f95a38 fix Alain Mazy <am@osimis.io> parents: 540 diff changeset	6832 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	6833
07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	6834 # 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	6835 # (LittleEndianExplicit is proposed by default by "getscu")
07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	6836 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	6837 self.assertTrue(os.path.isfile(f2))
07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	6838 with open(f2, 'rb') as f:
07e2adc4aead fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 308 diff changeset	6839 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	6840
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6841
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6842 def test_findscu_truncation(self):
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6843 # https://groups.google.com/forum/#!msg/orthanc-users/FkckWAHvso8/UbRBAhQ5CwAJ
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6844 # Fixed by: https://hg.orthanc-server.com/orthanc/rev/2724977419fb
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6845 UploadInstance(_REMOTE, 'Multiframe.dcm')
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6846 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6847
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6848 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	6849
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6850 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyInstanceUID' ])
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6851 result = re.findall('$0020,000d$.?\[(.?)\]', i)
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6852 self.assertEqual(2, len(result))
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6853
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6854 # 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	6855 # study, leading to a string of 249 characters
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6856 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k',
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6857 'StudyInstanceUID=%s\\%s\\%s\\%s\\%s' % (( study, ) * 5) ])
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6858 result = re.findall('$0020,000d$.?\[(.?)\]', i)
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6859 self.assertEqual(1, len(result))
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6860
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6861 # 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	6862 # study, leading to a string of 299 characters. In Orthanc <=
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6863 # 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	6864 # == 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	6865 # 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	6866 # "StudyInstanceUID" and returns all the available
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6867 # 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	6868 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k',
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6869 'StudyInstanceUID=%s\\%s\\%s\\%s\\%s\\%s' % (( study, ) * 6) ])
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6870 result = re.findall('$0020,000d$.?\[(.?)\]', i)
6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6871 self.assertEqual(1, len(result))
328 8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6872
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6873
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6874 def test_store_compressed(self):
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6875 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f:
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6876 dicom = f.read()
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6877 i = DoPost(_REMOTE, '/instances', dicom) ['ID']
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6878 sourceSize = len(dicom)
324 6164d39399ad test_findscu_truncation Sebastien Jodogne <s.jodogne@gmail.com> parents: 323 diff changeset	6879
328 8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6880 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6881 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6882
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6883 # 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	6884 jobId = MonitorJob2(_REMOTE, lambda: DoPost(
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6885 _REMOTE, '/peers/peer/store', {
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6886 'Resources' : [ i ],
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6887 'Synchronous' : False,
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6888 }))
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6889
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6890 job = DoGet(_REMOTE, '/jobs/%s' % jobId)
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6891 self.assertFalse(job['Content']['Compress'])
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6892 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	6893 self.assertEqual(str(sourceSize), job['Content']['Size'])
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6894
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6895 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6896 DropOrthanc(_LOCAL)
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6897
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	6898 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	6899 # 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	6900 # 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	6901 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/peers/peer/store', {
328 8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6902 'Resources' : [ i ],
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6903 'Compress' : True,
8a462f9c5a97 test_store_compressed Sebastien Jodogne <s.jodogne@gmail.com> parents: 327 diff changeset	6904 }))
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	6905 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	6906
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	6907 # 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	6908 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	6909 _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	6910 '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	6911 '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	6912 '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	6913 }))
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	6914
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	6915 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	6916 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	6917
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	6918 # 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	6919 self.assertLess(int(job['Content']['Size']), sourceSize / 2)
332 dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6920
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6921
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6922 def test_move_ambra(self):
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6923 # "Orthanc + Ambra: Query/Retrieve" (2020-08-25)
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6924 # 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	6925
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6926 UploadInstance(_REMOTE, '2019-06-17-VedranZdesic.dcm')
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6927
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6928 self.assertFalse(MonitorJob(_REMOTE, lambda: CallMoveScu([
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6929 '--study',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6930 '-k', 'StudyInstanceUID='
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6931 ])))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6932
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6933 self.assertFalse(MonitorJob(_REMOTE, lambda: CallMoveScu([
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6934 '--study',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6935 '-k', 'AccessionNumber=',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6936 ])))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6937
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6938 self.assertFalse(MonitorJob(_REMOTE, lambda: CallMoveScu([
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6939 '--study',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6940 '-k', 'AccessionNumber=',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6941 '-k', 'StudyInstanceUID='
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6942 ])))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6943
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6944 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6945 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6946 '--study',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6947 '-k', 'AccessionNumber=CT16000988',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6948 '-k', 'StudyInstanceUID=',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6949 ])))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6950 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6951 DropOrthanc(_LOCAL)
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6952
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6953 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6954 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6955 '--study',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6956 '-k', 'AccessionNumber=CT16000988',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6957 '-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	6958 ])))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6959 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6960 DropOrthanc(_LOCAL)
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6961
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6962 # This fails on Orthanc <= 1.7.3
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6963 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6964 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6965 '--study',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6966 '-k', 'AccessionNumber=',
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6967 '-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	6968 ])))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6969 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra Sebastien Jodogne <s.jodogne@gmail.com> parents: 328 diff changeset	6970 DropOrthanc(_LOCAL)
333 695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6971
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6972
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6973 def test_decode_elscint(self):
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6974 # 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	6975 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	6976 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	6977
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6978 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % a)
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6979 self.assertEqual("L", im.mode)
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6980 self.assertEqual(512, im.size[0])
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6981 self.assertEqual(512, im.size[1])
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6982
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6983 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % b)
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6984 self.assertEqual("L", im.mode)
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6985 self.assertEqual(512, im.size[0])
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6986 self.assertEqual(512, im.size[1])
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6987
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6988 # The two tests below fail on Orthanc <= 1.7.3
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6989 raw = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % a)
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6990 self.assertEqual(512 * 512 * 2, len(raw))
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6991
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6992 raw = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % b)
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6993 self.assertEqual(512 * 512 * 2, len(raw))
695be643b0f4 test_decode_elscint Sebastien Jodogne <s.jodogne@gmail.com> parents: 332 diff changeset	6994
334 971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	6995
971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	6996 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	6997 # 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	6998 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	6999 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	7000
335 96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7001 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	7002 modalitiesInStudy = re.findall('$0008,0061$.?\[(.?)\]', i)
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7003 self.assertEqual(1, len(modalitiesInStudy))
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7004 self.assertEqual('CT\\PT ', modalitiesInStudy[0])
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7005
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7006 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	7007 # 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	7008 # 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	7009
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7010 if i in [ 'UX', 'UX\\MR' ]:
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7011 expected = 0
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7012 else:
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7013 expected = 1
96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7014
334 971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	7015 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	7016 'Query' : { 'ModalitiesInStudy' : i }})
335 96718de2f29c simplification and fix of test_incoming_findscu Sebastien Jodogne <s.jodogne@gmail.com> parents: 334 diff changeset	7017 self.assertEqual(expected, len(a))
334 971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	7018
971ff285302b test_rest_modalities_in_study_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 333 diff changeset	7019 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	7020 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	7021 self.assertEqual(expected, len(studyInstanceUid))
337 ec13ace43bde trying webdav tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 335 diff changeset	7022
ec13ace43bde trying webdav tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 335 diff changeset	7023
ec13ace43bde trying webdav tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 335 diff changeset	7024 def test_webdav(self):
ec13ace43bde trying webdav tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 335 diff changeset	7025 self.assertRaises(Exception, lambda: DoPropFind(_REMOTE, '/webdav/', 2))
ec13ace43bde trying webdav tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 335 diff changeset	7026
342 bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7027 for suffix in [ '', '/' ]:
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7028 f = DoPropFind(_REMOTE, '/webdav' + suffix, 0)
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7029 self.assertEqual(1, len(f))
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7030 self.assertTrue('/webdav/' in f.keys())
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7031 self.assertTrue(f['/webdav/']['folder'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7032 self.assertEqual('webdav', f['/webdav/']['displayname'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7033
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7034 f = DoPropFind(_REMOTE, '/webdav' + suffix, 1)
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7035 self.assertEqual(6, len(f))
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7036 self.assertTrue(f['/webdav/']['folder'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7037 self.assertEqual('webdav', f['/webdav/']['displayname'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7038
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7039 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	7040 self.assertTrue(f['/webdav/%s' % i]['folder'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7041 self.assertEqual(i, f['/webdav/%s' % i]['displayname'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7042
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7043 for depth in [ 0, 1 ]:
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7044 for suffix2 in [ '', '/' ]:
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7045 g = DoPropFind(_REMOTE, '/webdav/%s%s' % (i, suffix2), depth)
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7046
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7047 if i == 'uploads':
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7048 # Empty folders might still exist in "/uploads/"
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7049 self.assertTrue('/webdav/uploads/' in g)
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7050 self.assertEqual('uploads', g['/webdav/uploads/']['displayname'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7051 for j in g.items():
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7052 self.assertTrue(g.items()[0][1]['folder'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7053 else:
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7054 self.assertEqual(1, len(g))
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7055 self.assertEqual('/webdav/%s/' % i, g.items()[0][0])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7056 self.assertTrue(g.items()[0][1]['folder'])
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7057 self.assertEqual(i, g.items()[0][1]['displayname'])
341 66a36befb208 extending Toolbox.DoPropFind() Sebastien Jodogne <s.jodogne@gmail.com> parents: 337 diff changeset	7058
342 bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7059 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7060 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f:
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7061 DoPut(_REMOTE, '/webdav/uploads/dummy', f.read(), 'text/plain')
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7062
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7063 while len(DoGet(_REMOTE, '/patients')) == 0:
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7064 time.sleep(0.01)
bf8369ea3ff1 more tests of webdav Sebastien Jodogne <s.jodogne@gmail.com> parents: 341 diff changeset	7065 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
337 ec13ace43bde trying webdav tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 335 diff changeset	7066
349 698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7067
698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7068 def test_log_categories(self):
350 8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7069 original = DoGet(_REMOTE, '/tools/log-level-http')
349 698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7070
350 8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7071 DoPut(_REMOTE, '/tools/log-level-http', 'default')
8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7072 self.assertEqual('default', DoGet(_REMOTE, '/tools/log-level-http'))
349 698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7073 DoGet(_REMOTE, '/system')
698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7074
350 8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7075 DoPut(_REMOTE, '/tools/log-level-http', 'verbose')
8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7076 self.assertEqual('verbose', DoGet(_REMOTE, '/tools/log-level-http'))
349 698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7077 DoGet(_REMOTE, '/system')
698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7078
350 8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7079 DoPut(_REMOTE, '/tools/log-level-http', 'trace')
8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7080 self.assertEqual('trace', DoGet(_REMOTE, '/tools/log-level-http'))
349 698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7081 DoGet(_REMOTE, '/system')
698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7082
350 8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7083 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	7084
698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7085 # Switch back to the original log level
350 8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7086 DoPut(_REMOTE, '/tools/log-level-http', original)
8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7087
8c072000d7ef fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 349 diff changeset	7088 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	7089 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	7090
698898a93a10 test_log_categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 348 diff changeset	7091 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	7092
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7093
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7094 def test_upload_zip(self):
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7095 f = StringIO()
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7096 with zipfile.ZipFile(f, 'w') as z:
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7097 z.writestr('hello/world/invalid.txt', 'Hello world')
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7098 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as g:
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7099 c = g.read()
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7100 z.writestr('hello/world/dicom1.dcm', c)
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7101 z.writestr('hello/world/dicom2.dcm', c)
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7102
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7103 f.seek(0)
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7104 i = DoPost(_REMOTE, '/instances', f.read())
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7105
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7106 self.assertEqual(2, len(i))
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7107 self.assertEqual(i[0], i[1])
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7108 self.assertEqual(6, len(i[0]))
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7109 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', i[0]['ID'])
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7110 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', i[0]['ParentSeries'])
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7111 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', i[0]['ParentStudy'])
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7112 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', i[0]['ParentPatient'])
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7113 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	7114
18597ca05e48 test_upload_zip Sebastien Jodogne <s.jodogne@gmail.com> parents: 355 diff changeset	7115 # 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	7116 self.assertEqual('Success', i[0]['Status'])
361 6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7117
6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7118
6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7119 def test_transfer_syntax_no_metaheader(self):
6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7120 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	7121 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % a)
6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7122 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	7123
6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7124 # This fails on Orthanc <= 1.8.1
6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7125 self.assertTrue('TransferSyntax' in m)
6cf5cc4d0a99 test_transfer_syntax_no_metaheader Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	7126 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	7127
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7128
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7129 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	7130 # 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	7131
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7132 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	7133 return (('--%s\r\n' +
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7134 '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	7135 '\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	7136
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7137 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	7138 dcm1 = f.read()
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7139
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7140 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	7141 dcm2 = f.read()
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7142
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7143 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	7144
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7145 boundary = '----WebKitFormBoundarypJDNQqJPoXiorRmQ'
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7146 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	7147 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	7148 '--' + boundary + '--'), headers = {
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7149 '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	7150 'X-Requested-With' : 'XMLHttpRequest',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7151 })
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7152
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7153 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	7154
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7155
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7156 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	7157 # 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	7158 # 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	7159 # "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	7160
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7161 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	7162 return (('--%s\r\n' +
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7163 '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	7164 '\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	7165
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7166 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	7167 dcm = f.read()
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7168
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7169 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	7170 dcm2 = f.read()
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7171
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7172 boundary = '----WebKitFormBoundarypJDNQqJPoXiorRmQ'
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7173
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7174 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	7175 m = DoPost(_REMOTE, '/instances',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7176 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	7177 headers = {
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7178 '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	7179 'X-Requested-With' : 'XMLHttpRequest',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7180 '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	7181 '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	7182 })
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7183
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7184 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	7185 m = DoPost(_REMOTE, '/instances',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7186 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	7187 headers = {
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7188 '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	7189 'X-Requested-With' : 'XMLHttpRequest',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7190 '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	7191 '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	7192 })
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7193 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	7194
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7195 m = DoPost(_REMOTE, '/instances',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7196 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	7197 headers = {
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7198 '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	7199 'X-Requested-With' : 'XMLHttpRequest',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7200 '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	7201 '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	7202 })
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7203
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7204 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	7205
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7206 # 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	7207 m = DoPost(_REMOTE, '/instances',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7208 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	7209 headers = {
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7210 '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	7211 'X-Requested-With' : 'XMLHttpRequest',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7212 '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	7213 '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	7214 })
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7215
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2 Sebastien Jodogne <s.jodogne@gmail.com> parents: 363 diff changeset	7216 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
377 cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7217
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7218
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7219 def test_pixel_data_offset(self):
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7220 # New in Orthanc 1.9.1
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7221 def Check(path, offset):
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7222 i = UploadInstance(_REMOTE, path) ['ID']
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7223 metadata = DoGetRaw(_REMOTE, '/instances/%s/metadata/PixelDataOffset' % i) [1]
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7224 self.assertEqual(offset, metadata)
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7225
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7226 Check('ColorTestMalaterre.dcm', str(0x03a0))
cc79fa4945da test_pixel_data_offset Sebastien Jodogne <s.jodogne@gmail.com> parents: 374 diff changeset	7227 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	7228 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	7229 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	7230 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	7231 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	7232 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	7233 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	7234 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	7235 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	7236 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	7237 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	7238 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	7239
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7240
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7241 def test_peer_store_straight(self):
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7242 self.assertEqual(0, len(DoGet(_LOCAL, '/exports')['Exports']))
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7243 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7244
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7245 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	7246 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	7247 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	7248 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	7249 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	7250 self.assertEqual('0.8.6', peer['Version'])
382 a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7251
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7252 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f:
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7253 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	7254
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7255 # 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	7256 # "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	7257 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	7258 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	7259 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	7260 self.assertEqual(6, len(j))
382 a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7261 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	7262 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	7263 self.assertEqual('Success', j['Status'])
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7264
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7265 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
a8dd562943a7 added test_peer_store_straight Sebastien Jodogne <s.jodogne@gmail.com> parents: 380 diff changeset	7266 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
383 05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7267
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7268
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7269 def test_cp246(self):
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7270 # This fails on Orthanc <= 1.9.0
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7271 a = UploadInstance(_REMOTE, '2021-02-19-MalaterreCP246.dcm')['ID']
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7272 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7273
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7274 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % a)
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7275 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	7276 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	7277 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	7278 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	7279
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7280 study = DoGet(_REMOTE, '/instances/%s/study' % a)
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7281 self.assertEqual(tags['0020,000d'], study['MainDicomTags']['StudyInstanceUID'])
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7282
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7283 series = DoGet(_REMOTE, '/instances/%s/series' % a)
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7284 self.assertEqual(tags['0020,000e'], series['MainDicomTags']['SeriesInstanceUID'])
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7285
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7286 instance = DoGet(_REMOTE, '/instances/%s' % a)
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7287 self.assertEqual(tags['0008,0018'], instance['MainDicomTags']['SOPInstanceUID'])
05d0d0c2623c added test_cp246 Sebastien Jodogne <s.jodogne@gmail.com> parents: 382 diff changeset	7288
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7289
392 5cbcb4a83b41 fix for revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 391 diff changeset	7290 def test_revisions_metadata(self):
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7291 # 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	7292 # 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	7293 # "CheckRevisions" is "False". Conventions for HTTP headers
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7294 # related to revisions mimic CouchDB:
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7295 # 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	7296 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7297
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7298 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7299 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	7300 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	7301 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	7302
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7303 (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	7304 '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	7305 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7306 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	7307
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7308 (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	7309 '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	7310 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7311 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	7312
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7313 (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	7314 'If-None-Match' : '"0-16de4d7060d0b9d102ef0fca8acc892a"'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7315 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7316 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	7317 self.assertEqual('"0-16de4d7060d0b9d102ef0fca8acc892a"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7318 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	7319
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7320 (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	7321 '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	7322 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7323 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	7324 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	7325 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	7326
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7327 (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	7328 '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	7329 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7330 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	7331 self.assertEqual('"0-16de4d7060d0b9d102ef0fca8acc892a"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7332 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	7333
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7334 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7335 self.assertEqual('403', headers['status']) # Forbidden (system metadata)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7336
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7337 (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	7338 self.assertEqual('403', headers['status']) # Forbidden (system metadata)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7339
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7340 (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	7341 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	7342 self.assertEqual('"0-%s"' % ComputeMD5('hello'), headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7343
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7344 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/1024' % i)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7345 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	7346 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7347 self.assertEqual('hello', body)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7348
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7349 (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	7350 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7351 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7352 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	7353 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7354 self.assertEqual('', body)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7355
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7356 (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	7357 'If-None-Match' : '"1-tata"'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7358 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7359 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	7360 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7361 self.assertEqual('hello', body)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7362 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	7363
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7364 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/metadata/1024' % i)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7365 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	7366
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7367 (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	7368 'If-Match' : '45-5d41402abc4b2a76b9719d911017c592'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7369 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7370 self.assertEqual('409', headers['status']) # Conflict, as bad revision
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7371
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7372 (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	7373 '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	7374 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7375 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	7376
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7377 (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	7378 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7379 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7380 self.assertEqual('200', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7381
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7382 (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	7383 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7384 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7385 self.assertEqual('404', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7386
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7387 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/1024' % i)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7388 self.assertEqual('404', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7389
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7390 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	7391
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7392 (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	7393 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	7394 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7395
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7396 (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	7397 self.assertEqual('409', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7398
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7399 (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	7400 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7401 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7402 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	7403 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7404 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	7405
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7406 (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	7407 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7408 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7409 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	7410 self.assertEqual('"1-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7411 self.assertEqual('', body)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7412
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7413 (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	7414 'If-None-Match' : headers['etag']
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7415 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7416
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7417 if headers['status'] == '200':
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7418 print("Your database backend doesn't store revisions")
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7419 (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	7420 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7421 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7422 self.assertEqual('409', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7423
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7424 (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	7425 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7426 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7427 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	7428 self.assertEqual('"1-6e809cbda0732ac4845916a59016f954"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7429 self.assertEqual('', body)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7430
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7431 elif headers['status'] == '304': # Revisions are supported
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7432 (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	7433 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7434 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7435 self.assertEqual('409', headers['status'])
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7436
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7437 (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	7438 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592'
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7439 })
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7440 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	7441 self.assertEqual('"2-6e809cbda0732ac4845916a59016f954"', headers['etag'])
391 227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7442 self.assertEqual('', body)
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7443
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7444 else:
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7445 raise Exception('Internal error')
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7446
227d9a932467 testing revisions in metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 390 diff changeset	7447 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	7448
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7449
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7450 def test_revisions_attachments(self):
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7451 # 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	7452 # was introduced in 1.9.2), or if configuration option
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7453 # "CheckRevisions" is "False". Conventions for HTTP headers
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7454 # related to revisions mimic CouchDB:
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7455 # https://docs.couchdb.org/en/stable/api/document/common.html
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7456 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7457
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	7458 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	7459 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	7460
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7461 # "/compress", "/uncompress" and "/verify-md5" are POST
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7462 # methods, and are not affected by revisions
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7463 for suffix in [ '', '/compressed-data', '/compressed-md5', '/compressed-size',
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7464 '/data', '/is-compressed', '/md5', '/size' ]:
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7465 (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	7466 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	7467 self.assertEqual('"0-%s"' % md5, headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7468
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7469 (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	7470 'If-None-Match' : '"0-3e29b869978b6db4886355a2b1132124"',
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7471 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7472 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	7473 self.assertEqual('"0-3e29b869978b6db4886355a2b1132124"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7474 self.assertEqual('', body) # Body must be empty on 304 status
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7475
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7476 (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	7477 '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	7478 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7479 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	7480
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7481 (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	7482 '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	7483 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7484 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	7485 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	7486
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7487 (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	7488 '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	7489 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7490 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	7491 self.assertEqual('"0-3e29b869978b6db4886355a2b1132124"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7492
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7493 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/attachments/dicom' % i)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7494 self.assertEqual('403', headers['status']) # Forbidden (system metadata)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7495
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7496 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/dicom' % i, 'hello')
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7497 self.assertEqual('403', headers['status']) # Forbidden (system metadata)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7498
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7499 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello')
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7500 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	7501 self.assertEqual('"0-%s"' % ComputeMD5('hello'), headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7502
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7503 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7504 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	7505 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7506 self.assertEqual('hello', body)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7507
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7508 (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	7509 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7510 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7511 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	7512 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7513 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	7514
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7515 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	7516 '"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	7517 (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	7518 '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	7519 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7520 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	7521 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	7522 self.assertEqual('hello', body)
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7523
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7524 (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	7525 'If-None-Match' : 'tata' # Bad header format
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7526 })
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	7527 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	7528 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	7529
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7530 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	7531
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7532 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/attachments/1024' % i)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7533 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	7534
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7535 (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	7536 'If-Match' : '45-5d41402abc4b2a76b9719d911017c592'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7537 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7538 self.assertEqual('409', headers['status']) # Conflict, as bad revision
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7539
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7540 (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	7541 '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	7542 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7543 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	7544
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 394 diff changeset	7545 (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	7546 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7547 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7548 self.assertEqual('200', headers['status'])
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7549
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7550 (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	7551 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7552 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7553 self.assertEqual('404', headers['status'])
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7554
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7555 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7556 self.assertEqual('404', headers['status'])
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7557
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7558 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	7559
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7560 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello')
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7561 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	7562 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7563
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7564 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello')
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7565 self.assertEqual('409', headers['status'])
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7566
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7567 (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	7568 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7569 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7570 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	7571 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7572 self.assertEqual('', body) # Body must be empty on 304 status
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7573
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7574 (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	7575 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7576 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7577 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	7578 self.assertEqual('"1-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7579 self.assertEqual('{}', body)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7580
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7581 (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	7582 'If-None-Match' : headers['etag']
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7583 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7584
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7585 if headers['status'] == '200':
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7586 print("Your database backend doesn't store revisions")
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7587 (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	7588 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7589 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7590 self.assertEqual('409', headers['status'])
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7591
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7592 (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	7593 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7594 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 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('"1-6e809cbda0732ac4845916a59016f954"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7597 self.assertEqual('{}', body)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7598
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7599 elif headers['status'] == '304': # Revisions are supported
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7600 (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	7601 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7602 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7603 self.assertEqual('409', headers['status'])
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7604
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7605 (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	7606 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592'
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7607 })
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7608 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	7609 self.assertEqual('"2-6e809cbda0732ac4845916a59016f954"', headers['etag'])
393 3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7610 self.assertEqual('{}', body)
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7611
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7612 else:
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7613 raise Exception('Internal error')
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7614
3019306499c5 test_revisions_attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 392 diff changeset	7615 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	7616
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7617
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7618 def test_issue_195(self):
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7619 # This fails on Orthanc <= 1.9.2
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7620 # https://bugs.orthanc-server.com/show_bug.cgi?id=195
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7621 a = UploadInstance(_REMOTE, 'Issue195.dcm')['ID']
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7622 b = DoGet(_REMOTE, '/instances/%s/file' % a,
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7623 headers = { 'Accept' : 'application/dicom+json' })
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7624
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7625 # 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	7626 self.assertEqual(5, len(b))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7627 self.assertEqual(2, len(b["00080018"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7628 self.assertEqual("UI", b["00080018"]["vr"])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7629 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	7630 b["00080018"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7631
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7632 self.assertEqual(2, len(b["0020000D"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7633 self.assertEqual("UI", b["0020000D"]["vr"])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7634 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	7635 b["0020000D"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7636
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7637 self.assertEqual(2, len(b["0020000E"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7638 self.assertEqual("UI", b["0020000E"]["vr"])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7639 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	7640 b["0020000E"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7641
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7642 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	7643 self.assertEqual("LO", b["00081030"]["vr"])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7644
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7645 self.assertEqual(2, len(b["0008103E"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7646 self.assertEqual("LO", b["0008103E"]["vr"])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7647 self.assertEqual("Hello1", b["0008103E"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7648
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7649 a = UploadInstance(_REMOTE, 'Issue195-bis.dcm')['ID']
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7650 b = DoGet(_REMOTE, '/instances/%s/file' % a,
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7651 headers = { 'Accept' : 'application/dicom+json' })
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7652
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7653 # 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	7654 self.assertEqual(5, len(b))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7655 self.assertEqual(2, len(b["00080018"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7656 self.assertEqual("UI", b["00080018"]["vr"])
424 934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7657 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	7658 b["00080018"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7659
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7660 self.assertEqual(2, len(b["0020000D"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7661 self.assertEqual("UI", b["0020000D"]["vr"])
424 934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7662 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	7663 b["0020000D"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7664
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7665 self.assertEqual(2, len(b["0020000E"]))
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7666 self.assertEqual("UI", b["0020000E"]["vr"])
424 934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7667 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	7668 b["0020000E"]["Value"][0])
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7669
424 934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7670 self.assertEqual(2, len(b["00084567"]))
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7671 self.assertEqual("UN", b["00084567"]["vr"])
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7672
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7673 # 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	7674 # $ echo -n 'QgA=' \| base64 -d \| hexdump -C
424 934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7675 self.assertEqual("QgA=", b["00084567"]["InlineBinary"])
399 dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7676
dd519677974d integration tests for issue 195 Sebastien Jodogne <s.jodogne@gmail.com> parents: 397 diff changeset	7677 # 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	7678 self.assertEqual(1, len(b["00084565"]))
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7679 self.assertEqual("UN", b["00084565"]["vr"])
402 cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7680
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7681
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7682 def test_modify_attribute(self):
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7683 # This fails on Orthanc <= 1.9.3 (not implemented)
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7684 # 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	7685 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7686
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7687 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % i)
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7688 self.assertFalse('0020,9165' in tags)
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7689
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7690 i = DoPost(_REMOTE, '/studies/b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0/modify', {
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7691 "Replace": {
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7692 "0020,9165": "0020,9056",
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7693 }
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7694 })
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7695 instances = DoGet(_REMOTE, '/studies/%s/instances' % i['ID'])
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7696 self.assertEqual(1, len(instances))
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7697
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7698 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % instances[0]['ID'])
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7699 self.assertTrue('0020,9165' in tags)
cc947ddc57c5 test_modify_attribute Sebastien Jodogne <s.jodogne@gmail.com> parents: 399 diff changeset	7700 self.assertEqual('0020,9056', tags['0020,9165'])
405 6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7701
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7702
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7703 def test_issue_146(self):
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7704 # "Update Anonyization to 2019c"
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7705 # https://bugs.orthanc-server.com/show_bug.cgi?id=146
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7706
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7707 def GetTags(study, params):
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7708 a = DoPost(_REMOTE, '/studies/%s/anonymize' % study, params) ['ID']
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7709 b = DoGet(_REMOTE, '/studies/%s/instances' % a)
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7710 self.assertEqual(1, len(b))
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7711 return DoGet(_REMOTE, '/instances/%s/tags?short' % b[0]['ID'])
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7712
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7713
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7714 UploadInstance(_REMOTE, 'Issue146.dcm')
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7715 study = '7c950970-321e4ab0-28446c5f-f94850f1-5c44634b'
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7716
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7717 self.assertRaises(Exception, lambda: GetTags(study, { 'DicomVersion' : 'nope' }))
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7718
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7719 tags2008 = GetTags(study, { 'DicomVersion' : '2008' })
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7720 tags2017c = GetTags(study, { 'DicomVersion' : '2017c' })
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7721 tags2021b = GetTags(study, { 'DicomVersion' : '2021b' })
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7722 tagsDefault = GetTags(study, {})
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7723
420 07fbbd3a3fac fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	7724 orthancVersion = DoGet(_REMOTE, '/system') ['Version']
07fbbd3a3fac fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 419 diff changeset	7725 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	7726 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	7727 self.assertEqual('Orthanc %s - PS 3.15-2021b Table E.1-1 Basic Profile' % orthancVersion, tags2021b['0012,0063'])
405 6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7728 self.assertEqual(tagsDefault['0012,0063'], tags2021b['0012,0063'])
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7729
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7730 for t in [ tags2008, tags2017c, tags2021b, tagsDefault ]:
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7731 self.assertTrue(t['0010,0010'].startswith('Anonymized'))
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7732 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	7733 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	7734 self.assertEqual('YES', t['0012,0062'])
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7735
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7736 for t in [ tags2008 ]:
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7737 self.assertEqual('20200101', t['0008,0020'])
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7738
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7739 for t in [ tags2017c, tags2021b, tagsDefault ]:
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7740 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	7741
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7742 for t in [ tags2008, tags2017c ]:
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7743 self.assertEqual('HELLO^C', t['0050,0020'])
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7744 self.assertEqual('HELLO^D', t['3006,0002'])
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7745
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7746 for t in [ tags2021b, tagsDefault ]:
6bbc89c2c2d1 test_issue_146 Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	7747 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	7748 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	7749
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7750
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7751 def test_anonymize_relationships_6(self):
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7752 # 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	7753 # 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	7754 # sequence containing StudyUID / Series UID of related series.
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7755 # [After anonymization,] this tag keep a reference of the
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7756 # original Study/Series UID.
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7757 # 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	7758 UploadInstance(_REMOTE, '2020-11-16-SalimKanounAnonymization.dcm')
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7759
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7760 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	7761 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	7762 tags['0008,1250'][0]['0020,000d'])
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7763 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	7764 tags['0008,1250'][0]['0020,000e'])
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7765
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7766 a = DoGet(_REMOTE, '/studies')
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7767 self.assertEqual(1, len(a))
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7768 b = DoPost(_REMOTE, '/studies/%s/anonymize' % a[0], {}) ['ID']
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7769
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7770 c = DoGet(_REMOTE, '/studies/%s/instances' % b)
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7771 self.assertEqual(1, len(c))
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7772 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	7773
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7774 # 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	7775 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	7776 tags['0008,1250'][0]['0020,000d'])
62ee5e57ee05 test_anonymize_relationships_6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 405 diff changeset	7777 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	7778 tags['0008,1250'][0]['0020,000e'])
407 ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7779
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7780
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7781 def test_modify_subsequences(self):
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7782 # New in Orthanc 1.9.4 (cf. LSD-629)
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7783 UploadInstance(_REMOTE, 'Issue22-NoPixelData.dcm')
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7784 studies = DoGet(_REMOTE, '/studies')
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7785 self.assertEqual(1, len(studies))
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7786
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7787 def GetTags(study):
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7788 instances = DoGet(_REMOTE, '/studies/%s/instances' % study)
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7789 self.assertEqual(1, len(instances))
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7790 return DoGet(_REMOTE, '/instances/%s/tags?short' % instances[0]['ID'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7791
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7792 tags1 = GetTags(studies[0])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7793
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7794 a = DoPost(_REMOTE, '/studies/%s/modify' % studies[0], {
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7795 'Replace' : {
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7796 'PatientName' : 'Hello1',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7797 'DimensionIndexSequence[1].DimensionDescriptionLabel' : 'Hello2',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7798 'DimensionIndexSequence[*].PatientName' : 'Hello3',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7799 '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	7800 'DimensionOrganizationSequence[0].DimensionOrganizationUID' : '1.2.3.4',
407 ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7801 },
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7802 'Remove' : [
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7803 'ReferencedPerformedProcedureStepSequence',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7804 'PerformedProtocolCodeSequence[0].CodeValue',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7805 'SharedFunctionalGroupsSequence[].ReferencedImageSequence[].ReferencedSOPInstanceUID',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7806 'SharedFunctionalGroupsSequence[*].ReferencedImageSequence[1].ReferencedSOPClassUID',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7807 'SharedFunctionalGroupsSequence[2].ReferencedImageSequence', # Inexistent tag
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7808 ]
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7809 })
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7810 tags2 = GetTags(a['ID'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7811
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7812 self.assertEqual('Anonymized1', tags1['0010,0010'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7813 self.assertEqual('Hello1', tags2['0010,0010'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7814
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7815 self.assertEqual('Stack ID', tags1['0020,9222'][0]['0020,9421'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7816 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	7817 self.assertEqual('Stack ID', tags2['0020,9222'][0]['0020,9421'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7818 self.assertEqual('Hello2', tags2['0020,9222'][1]['0020,9421'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7819
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7820 for i in range(3):
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7821 self.assertFalse('0010,0010' in tags1['0020,9222'][i])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7822 self.assertEqual('Hello3', tags2['0020,9222'][i]['0010,0010'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7823
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7824 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	7825 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	7826 self.assertEqual('Hello4',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7827 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	7828 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	7829 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	7830
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7831 self.assertTrue('0008,1111' in tags1)
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7832 self.assertFalse('0008,1111' in tags2)
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7833 self.assertTrue('0008,0100' in tags1['0040,0260'][0])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7834 self.assertFalse('0008,0100' in tags2['0040,0260'][0])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7835
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7836 for i in range(3):
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7837 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	7838 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	7839 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	7840
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7841 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	7842 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	7843 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	7844
408 4e0b9fddbc71 test "Replace" for UID in subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	7845 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	7846 tags1['0020,9221'][0]['0020,9164'])
4e0b9fddbc71 test "Replace" for UID in subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	7847 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	7848
407 ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7849 a = DoPost(_REMOTE, '/studies/%s/anonymize' % studies[0], {
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7850 'Replace' : {
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7851 'DimensionIndexSequence[1].DimensionDescriptionLabel' : 'Hello1',
408 4e0b9fddbc71 test "Replace" for UID in subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 407 diff changeset	7852 'DimensionOrganizationSequence[0].DimensionOrganizationUID' : '1.2.3.4',
407 ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7853 },
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7854 'Remove' : [
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7855 'SharedFunctionalGroupsSequence[].ReferencedImageSequence[].ReferencedSOPInstanceUID', # 5200,9229
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7856 ],
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7857 'Keep' : [
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7858 'ReferencedImageEvidenceSequence', # 0008,9092
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7859 'DimensionIndexSequence', # 0020,9222
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7860 'PerFrameFunctionalGroupsSequence[].2005,140f[].SOPInstanceUID', # 5200,9230
424 934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7861 '(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	7862 '(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	7863 ],
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	7864 'KeepPrivateTags' : True # Compatibility with Orthanc 1.9.4
407 ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7865 })
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7866 tags3 = GetTags(a['ID'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7867
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7868 # UIDs
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7869 for i in [ '0008,0018',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7870 '0010,0020',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7871 '0008,0018',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7872 '0010,0020' ]:
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7873 self.assertNotEqual(tags1[i], tags3[i])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7874
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7875 self.assertNotEqual(tags1['0020,9221'][0]['0020,9164'],
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7876 tags3['0020,9221'][0]['0020,9164'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7877
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7878 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	7879 tags3['5200,9229'][0]['2005,140e'][0]['0008,0014'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7880
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7881 # 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	7882 # Removals (X)
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7883 for i in [ '0008,0021',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7884 '0008,002a',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7885 '0008,0031',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7886 '0008,1030',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7887 '0008,103e',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7888 '0008,1111',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7889 '0010,21c0',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7890 '0040,0006',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7891 '0040,0241',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7892 '0040,0244',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7893 '0040,0245',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7894 '0040,0250',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7895 '0040,0251',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7896 '0040,0253',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7897 '0040,0254',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7898 '0040,0555',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7899 ]:
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7900 self.assertTrue(i in tags1)
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7901 self.assertFalse(i in tags3)
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7902
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7903 # Clearings (Z)
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7904 for i in [ '0008,0020',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7905 '0008,0023',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7906 '0008,0030',
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7907 '0008,0033' ]:
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7908 self.assertNotEqual('', tags1[i])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7909 self.assertEqual('', tags3[i])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7910
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7911 # Replace
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7912 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	7913 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	7914 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	7915
407 ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7916 # "Keep" on DimensionIndexSequence
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7917 for i in range(3):
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7918 self.assertEqual(tags1['0020,9222'][i]['0020,9164'],
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7919 tags3['0020,9222'][i]['0020,9164'])
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7920
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7921 # "Keep" on ReferencedImageEvidenceSequence
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7922 self.assertEqual(json.dumps(tags1['0008,9092']),
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7923 json.dumps(tags3['0008,9092']))
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7924
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7925 # "Keep" on PerFrameFunctionalGroupsSequence
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7926 self.assertEqual(json.dumps(tags1['5200,9230']),
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7927 json.dumps(tags3['5200,9230']))
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7928
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7929 # "Remove" on SharedFunctionalGroupsSequence
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7930 for i in range(3):
ad98466353c6 test_modify_subsequences Sebastien Jodogne <s.jodogne@gmail.com> parents: 406 diff changeset	7931 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	7932 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	7933
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7934
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7935 def test_bulk_modify(self):
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7936 # New in Orthanc 1.9.4
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7937
411 8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	7938 def GetModified(lst, resourceType, expectedCount = None):
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	7939 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	7940 if expectedCount != None:
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7941 self.assertEqual(expectedCount, len(m))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7942 return m
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7943
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7944 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7945 series = DoGet(_REMOTE, '/series') [0]
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7946 study = DoGet(_REMOTE, '/studies') [0]
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7947 patient = DoGet(_REMOTE, '/patients') [0]
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7948
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7949 a = DoPost(_REMOTE, '/tools/bulk-modify', {
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7950 'Resources' : [ instance ]
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7951 })
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7952
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7953 self.assertNotEqual(instance, GetModified(a, 'Instance', 1) [0])
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7954 self.assertEqual(series, GetModified(a, 'Series', 1) [0])
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7955 self.assertEqual(study, GetModified(a, 'Study', 1) [0])
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7956 self.assertEqual(patient, GetModified(a, 'Patient', 1) [0])
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7957
411 8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	7958 b = DoPost(_REMOTE, '/tools/bulk-anonymize', {
410 d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7959 'Resources' : [ instance ]
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7960 })
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7961
411 8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	7962 self.assertNotEqual(instance, GetModified(b, 'Instance', 1) [0])
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	7963 self.assertNotEqual(series, GetModified(b, 'Series', 1) [0])
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	7964 self.assertNotEqual(study, GetModified(b, 'Study', 1) [0])
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	7965 self.assertNotEqual(patient, GetModified(b, 'Patient', 1) [0])
410 d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7966
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7967 self.assertEqual(3, len(DoGet(_REMOTE, '/instances')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7968 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7969 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7970 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
411 8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	7971
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	7972 DoPost(_REMOTE, '/tools/bulk-delete', {
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	7973 'Resources' : GetModified(b, 'Patient', 1) + GetModified(a, 'Instance', 1)
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	7974 })
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	7975
410 d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7976 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID']
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7977 knee2 = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') ['ID']
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7978 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID']
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7979
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7980 self.assertEqual(4, len(DoGet(_REMOTE, '/instances')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7981 self.assertEqual(4, len(DoGet(_REMOTE, '/series')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7982 self.assertEqual(3, len(DoGet(_REMOTE, '/studies')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7983 self.assertEqual(3, len(DoGet(_REMOTE, '/patients')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7984
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7985 a = DoPost(_REMOTE, '/tools/bulk-modify', {
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7986 'Resources' : [ knee1, brainix ]
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7987 })
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7988
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7989 self.assertEqual(6, len(DoGet(_REMOTE, '/instances')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7990 self.assertEqual(4, len(DoGet(_REMOTE, '/series')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7991 self.assertEqual(3, len(DoGet(_REMOTE, '/studies')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7992 self.assertEqual(3, len(DoGet(_REMOTE, '/patients')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7993
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7994 for i in GetModified(a, 'Instance', 2):
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7995 self.assertTrue(not i in [ instance, knee1, knee2, brainix ])
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7996 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	7997
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7998 b = GetModified(a, 'Series', 2)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	7999 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	8000 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	8001 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	8002 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	8003
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8004 b = GetModified(a, 'Study', 2)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8005 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	8006 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	8007 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	8008 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	8009
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8010 b = GetModified(a, 'Patient', 2)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8011 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	8012 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	8013 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	8014 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	8015
411 8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8016 DoPost(_REMOTE, '/tools/bulk-delete', {
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8017 'Resources' : GetModified(a, 'Instance', 2)
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8018 })
410 d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8019
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8020 sourceInstances = DoGet(_REMOTE, '/instances')
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8021 sourceSeries = DoGet(_REMOTE, '/series')
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8022 sourceStudies = DoGet(_REMOTE, '/studies')
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8023 sourcePatients = DoGet(_REMOTE, '/patients')
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8024 self.assertEqual(4, len(sourceInstances))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8025 self.assertEqual(4, len(sourceSeries))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8026 self.assertEqual(3, len(sourceStudies))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8027 self.assertEqual(3, len(sourcePatients))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8028
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8029 a = DoPost(_REMOTE, '/tools/bulk-anonymize', {
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8030 'Resources' : [ knee1, brainix ]
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8031 })
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8032
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8033 self.assertEqual(6, len(DoGet(_REMOTE, '/instances')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8034 self.assertEqual(6, len(DoGet(_REMOTE, '/series')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8035 self.assertEqual(5, len(DoGet(_REMOTE, '/studies')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8036 self.assertEqual(5, len(DoGet(_REMOTE, '/patients')))
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8037
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8038 for i in GetModified(a, 'Instance', 2):
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8039 self.assertFalse(i in sourceInstances)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8040 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	8041
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8042 for i in GetModified(a, 'Series', 2):
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8043 self.assertFalse(i in sourceSeries)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8044 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	8045
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8046 for i in GetModified(a, 'Study', 2):
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8047 self.assertFalse(i in sourceStudies)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8048 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	8049
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8050 for i in GetModified(a, 'Patient', 2):
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8051 self.assertFalse(i in sourcePatients)
d0c6afc1ff68 test_bulk_modify Sebastien Jodogne <s.jodogne@gmail.com> parents: 408 diff changeset	8052 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	8053
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8054 DoPost(_REMOTE, '/tools/bulk-delete', {
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8055 'Resources' : GetModified(a, 'Patient', 2)
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8056 })
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8057
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8058 self.assertEqual(4, len(DoGet(_REMOTE, '/instances')))
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8059 self.assertEqual(4, len(DoGet(_REMOTE, '/series')))
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8060 self.assertEqual(3, len(DoGet(_REMOTE, '/studies')))
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8061 self.assertEqual(3, len(DoGet(_REMOTE, '/patients')))
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8062
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8063 DoPost(_REMOTE, '/tools/bulk-delete', {
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8064 'Resources' : [ instance,
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8065 DoGet(_REMOTE, '/instances/%s/patient' % knee1) ['ID'],
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8066 DoGet(_REMOTE, '/instances/%s/series' % brainix) ['ID'] ]
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8067 })
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8068
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8069 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8070 self.assertEqual(0, len(DoGet(_REMOTE, '/series')))
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8071 self.assertEqual(0, len(DoGet(_REMOTE, '/studies')))
8cf866641fa7 testing bulk deletion Sebastien Jodogne <s.jodogne@gmail.com> parents: 410 diff changeset	8072 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
412 cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8073
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8074
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8075 def test_dicom_to_json_format(self):
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8076 # 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	8077 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8078 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID']
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8079 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8080 series = DoGet(_REMOTE, '/instances/%s/series' % instance) ['ID']
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8081
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8082 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	8083 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	8084 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	8085 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	8086 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	8087 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	8088
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8089 # Test "GetInstanceHeader()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8090 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	8091 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	8092 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	8093 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	8094 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	8095 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	8096
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8097 # Test "ListResources()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8098 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	8099 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	8100 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	8101 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	8102
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8103 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	8104 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	8105 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	8106 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	8107
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8108 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	8109 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	8110 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	8111 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	8112
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8113 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	8114 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	8115 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	8116 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	8117
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8118 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	8119 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	8120 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	8121 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	8122
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8123 # Test "GetSingleResource()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8124 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	8125 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	8126 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	8127 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	8128
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8129 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	8130 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	8131 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	8132 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	8133
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8134 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	8135 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	8136 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	8137 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	8138
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8139 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	8140 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	8141 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	8142 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	8143
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8144 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	8145 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	8146 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	8147 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	8148
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8149 # Test "Find()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8150 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	8151 self.assertEqual('20070101', a[0]['MainDicomTags']['StudyDate'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8152 self.assertEqual('KNIX', a[0]['PatientMainDicomTags']['PatientName'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8153
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8154 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	8155 self.assertEqual('20070101', a[0]['MainDicomTags']['0008,0020'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8156 self.assertEqual('KNIX', a[0]['PatientMainDicomTags']['0010,0010'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8157
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8158 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	8159 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	8160 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	8161 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	8162 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	8163
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8164 # Test "GetChildResources()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8165 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	8166 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	8167 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	8168 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	8169
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8170 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	8171 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	8172 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	8173 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	8174
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8175 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	8176 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	8177 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	8178 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	8179
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8180 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	8181 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	8182 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	8183 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	8184
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8185 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	8186 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	8187 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	8188 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	8189
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8190 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	8191 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	8192 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	8193 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	8194
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8195 # Test "GetParentResource()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8196 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	8197 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	8198 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	8199 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	8200
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8201 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	8202 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	8203 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	8204 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	8205
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8206 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	8207 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	8208 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	8209 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	8210
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8211 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	8212 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	8213 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	8214 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	8215
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8216 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	8217 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	8218 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	8219 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	8220
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8221 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	8222 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	8223 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	8224 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	8225
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8226 # Test "GetChildInstancesTags()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8227 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	8228 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	8229 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	8230 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	8231
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8232 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	8233 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	8234 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	8235 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	8236
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8237 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	8238 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	8239 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	8240 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	8241
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8242 # Test "GetSharedTags()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8243 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	8244 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	8245 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	8246 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	8247
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8248 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	8249 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	8250 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	8251 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	8252
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8253 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	8254 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	8255 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	8256 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	8257
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8258 # Test "GetModule()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8259 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	8260 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	8261 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	8262
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8263 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	8264 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	8265 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	8266
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8267 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	8268 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	8269 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	8270
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8271 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	8272 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	8273 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	8274
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8275 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	8276 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	8277 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	8278 DoGet(_REMOTE, '/instances/%s/module?simplify' % instance) ['SOPInstanceUID'])
cd9da28451cc test_dicom_to_json_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 411 diff changeset	8279 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	8280 DoGet(_REMOTE, '/instances/%s/module?short' % instance) ['0008,0018'])
413 b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8281
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8282 # Test "ListQueryAnswers()" in "OrthancRestModalities.cpp"
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8283 a = DoPost(_REMOTE, '/modalities/self/query', { 'Level' : 'Study',
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8284 'Query' : { 'PatientID' : '*' }}) ['ID']
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8285
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8286 self.assertEqual(1, len(DoGet(_REMOTE, '/queries/%s/answers' % a)))
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8287 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	8288 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	8289 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	8290 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	8291
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8292 # Test "GetQueryOneAnswer()" in "OrthancRestModalities.cpp"
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8293 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	8294 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	8295 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	8296 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	8297
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8298 # Test "GetQueryArguments()" in "OrthancRestModalities.cpp"
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8299 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query' % a) ['0010,0020']['Value'])
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8300 self.assertEqual('PatientID', DoGet(_REMOTE, '/queries/%s/query' % a) ['0010,0020']['Name'])
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8301 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query?simplify' % a) ['PatientID'])
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8302 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query?short' % a) ['0010,0020'])
b8bff333edaf cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 412 diff changeset	8303
414 a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8304 # Test "BulkContent()" in "OrthancRestResources.cpp"
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8305 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	8306 self.assertEqual(4, len(a))
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8307 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['PatientID'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8308 self.assertEqual('Knee (R)', a[1]['MainDicomTags']['StudyDescription'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8309 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['PatientName'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8310 self.assertEqual('AX. FSE PD', a[2]['MainDicomTags']['SeriesDescription'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8311 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	8312 a[3]['MainDicomTags']['SOPInstanceUID'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8313
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8314 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	8315 'Short': True })
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8316 self.assertEqual(4, len(a))
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8317 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['0010,0020'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8318 self.assertEqual('Knee (R)', a[1]['MainDicomTags']['0008,1030'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8319 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['0010,0010'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8320 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	8321 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	8322 a[3]['MainDicomTags']['0008,0018'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8323
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8324 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	8325 'Full': True })
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8326 self.assertEqual(4, len(a))
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8327 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['0010,0020']['Value'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8328 self.assertEqual('PatientID', a[0]['MainDicomTags']['0010,0020']['Name'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8329 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	8330 self.assertEqual('StudyDescription', a[1]['MainDicomTags']['0008,1030']['Name'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8331 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['0010,0010']['Value'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8332 self.assertEqual('PatientName', a[1]['PatientMainDicomTags']['0010,0010']['Name'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8333 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	8334 self.assertEqual('SeriesDescription', a[2]['MainDicomTags']['0008,103e']['Name'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8335 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	8336 a[3]['MainDicomTags']['0008,0018']['Value'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8337 self.assertEqual('SOPInstanceUID', a[3]['MainDicomTags']['0008,0018']['Name'])
a2beea45a53d test /tools/bulk-content Sebastien Jodogne <s.jodogne@gmail.com> parents: 413 diff changeset	8338
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8339
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8340 def test_bulk_content(self):
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8341 # New in Orthanc 1.9.4
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8342 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID']
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8343 knee2 = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') ['ID']
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8344 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID']
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8345
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8346 brainixHierarchy = [
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8347 DoGet(_REMOTE, '/instances/%s/patient' % brainix) ['ID'],
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8348 DoGet(_REMOTE, '/instances/%s/study' % brainix) ['ID'],
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8349 DoGet(_REMOTE, '/instances/%s/series' % brainix) ['ID'],
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8350 brainix,
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8351 ]
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8352
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8353 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : brainixHierarchy })
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8354 self.assertEqual(4, len(a))
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8355 b = map(lambda x: x['ID'], a)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8356 for i in range(4):
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8357 self.assertEqual(brainixHierarchy[i], b[i])
418 8a3d67a40083 test "Metadata" in "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 417 diff changeset	8358 self.assertTrue('Metadata' in a[i])
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8359
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8360 for (level, index) in [
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8361 ('Patient', 0),
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8362 ('Study', 1),
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8363 ('Series', 2),
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8364 ('Instance', 3),
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8365 ]:
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8366 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : brainixHierarchy,
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8367 'Level' : level })
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8368 self.assertEqual(1, len(a))
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8369 self.assertEqual(level, a[0]['Type'])
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8370 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	8371 self.assertTrue('Metadata' in a[0])
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8372
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8373 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	8374 'Level' : level,
8a3d67a40083 test "Metadata" in "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 417 diff changeset	8375 'Metadata' : False })
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8376 self.assertEqual(1, len(a))
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8377 self.assertEqual(level, a[0]['Type'])
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8378 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	8379 self.assertFalse('Metadata' in a[0])
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8380
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8381 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, knee2, brainix ] })
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8382 self.assertEqual(3, len(a))
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8383 for item in a:
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8384 self.assertEqual('Instance', item['Type'])
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8385 b = map(lambda x: x['ID'], a)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8386 self.assertTrue(knee1 in b)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8387 self.assertTrue(knee2 in b)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8388 self.assertTrue(brainix in b)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8389
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8390 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, knee2 ],
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8391 'Level' : 'Series' })
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8392 self.assertEqual(2, len(a))
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8393 for item in a:
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8394 self.assertEqual('Series', item['Type'])
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8395 b = map(lambda x: x['ID'], a)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8396 self.assertTrue(DoGet(_REMOTE, '/instances/%s' % knee1) ['ParentSeries'] in b)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8397 self.assertTrue(DoGet(_REMOTE, '/instances/%s' % knee2) ['ParentSeries'] in b)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8398
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8399 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	8400 'Level' : 'Study',
8a3d67a40083 test "Metadata" in "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 417 diff changeset	8401 'Metadata' : False })
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8402 self.assertEqual(1, len(a))
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8403 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	8404 self.assertEqual('Study', a[0]['Type'])
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8405 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	8406 self.assertFalse('Metadata' in a[0])
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8407
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8408 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	8409 'Level' : 'Patient',
8a3d67a40083 test "Metadata" in "/tools/bulk-content" Sebastien Jodogne <s.jodogne@gmail.com> parents: 417 diff changeset	8410 'Metadata' : True })
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8411 self.assertEqual(1, len(a))
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8412 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	8413 self.assertEqual('Patient', a[0]['Type'])
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8414 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	8415 self.assertTrue('Metadata' in a[0])
451 33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	8416 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	8417 self.assertEqual(2, len(a[0]['Metadata']))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	8418 self.assertTrue('MainDicomTagsSignature' in a[0]['Metadata'])
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	8419 else:
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	8420 self.assertEqual(1, len(a[0]['Metadata']))
33051f9ac850 new metadata MainDicomTagsSignature Alain Mazy <am@osimis.io> parents: 449 diff changeset	8421 self.assertTrue('LastUpdate' in a[0]['Metadata'])
415 fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8422
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8423 for level in [ 'Instance', 'Series', 'Study', 'Patient' ]:
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8424 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, brainix ],
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8425 'Level' : level })
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8426 self.assertEqual(2, len(a))
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8427 for item in a:
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8428 self.assertEqual(level, item['Type'])
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8429 b = map(lambda x: x['ID'], a)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8430 if level == 'Instance':
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8431 self.assertTrue(knee1 in b)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8432 self.assertTrue(brainix in b)
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8433 else:
fa6c4b82c027 test_bulk_content Sebastien Jodogne <s.jodogne@gmail.com> parents: 414 diff changeset	8434 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	8435 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	8436
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8437
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8438 def test_split_instances(self):
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8439 # New in 1.9.4
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8440 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID']
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8441 knee2 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') ['ID']
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8442 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8443 series = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8444
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8445 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8446 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8447 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8448
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8449 instances = DoGet(_REMOTE, '/instances')
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8450 self.assertEqual(2, len(instances))
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8451 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	8452 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	8453 for i in [ knee1, knee2 ]:
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8454 self.assertEqual(series, DoGet(_REMOTE, '/instances/%s/series' % i) ['ID'])
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8455 self.assertEqual(study, DoGet(_REMOTE, '/instances/%s/study' % i) ['ID'])
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8456
417 a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8457 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, {
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8458 'KeepSource' : False
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8459 })) # Neither "Instances", nor "Series"
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8460
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8461 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, {
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8462 'KeepSource' : False,
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8463 'Instances' : [ ],
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8464 'Series' : [ ]
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8465 })) # Empty "Instances" and "Series"
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8466
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8467 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, {
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8468 'Instances' : [ 'nope' ],
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8469 'KeepSource' : False
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8470 }))
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8471
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8472 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, {
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8473 'Series' : [ 'nope' ],
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8474 'KeepSource' : False
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8475 }))
a5b6a8f2dd98 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 416 diff changeset	8476
416 80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8477 result = DoPost(_REMOTE, '/studies/%s/split' % study, {
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8478 'Instances' : [ knee1 ],
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8479 'KeepSource' : False
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8480 })
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8481
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8482 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8483 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8484 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8485
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8486 instances = DoGet(_REMOTE, '/instances')
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8487 self.assertEqual(2, len(instances))
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8488
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8489 self.assertFalse(knee1 in instances)
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8490 self.assertTrue(knee2 in instances)
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8491 instances.remove(knee2)
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8492 self.assertEqual(series, DoGet(_REMOTE, '/instances/%s/series' % knee2) ['ID'])
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8493 self.assertEqual(study, DoGet(_REMOTE, '/instances/%s/study' % knee2) ['ID'])
80164728c038 test_split_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 415 diff changeset	8494 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	8495 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	8496 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	8497
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8498
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8499 def test_merge_instances(self):
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8500 # New in Orthanc 1.9.4
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8501 knee = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID']
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8502 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID']
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8503 brainixStudy = DoGet(_REMOTE, '/instances/%s/study' % brainix) ['ID']
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8504
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8505 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8506 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8507 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8508 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8509
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8510 instances = DoGet(_REMOTE, '/instances')
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8511 self.assertEqual(2, len(instances))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8512 self.assertTrue(brainix in instances)
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8513 self.assertTrue(knee in instances)
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8514
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8515 result = DoPost(_REMOTE, '/studies/%s/merge' % brainixStudy, {
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8516 'Resources' : [ knee ]
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8517 })
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8518
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8519 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8520 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8521 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8522 self.assertEqual(brainixStudy, DoGet(_REMOTE, '/studies')[0])
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8523
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8524 instances = DoGet(_REMOTE, '/instances')
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8525 self.assertEqual(2, len(instances))
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8526 self.assertTrue(brainix in instances)
6a57c4efe38a test_merge_instances Sebastien Jodogne <s.jodogne@gmail.com> parents: 418 diff changeset	8527 self.assertFalse(knee in instances)
423 cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8528
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8529
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8530 def test_query_retrieve_format(self):
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8531 # New in Orthanc 1.9.5
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8532 # 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	8533 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	8534 study = DoGet(_REMOTE, '/instances/%s/study' % i) ['MainDicomTags']['StudyInstanceUID']
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8535
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8536 a = DoPost(_REMOTE, '/modalities/self/query', {
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8537 'Level' : 'Study',
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8538 'Query' : {}
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8539 })
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8540
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8541 b = DoGet(_REMOTE, a['Path'] + '/answers')
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8542 self.assertEqual(1, len(b))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8543 self.assertEqual('0', b[0])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8544
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8545 b = DoGet(_REMOTE, a['Path'] + '/answers?expand')
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8546 self.assertEqual(1, len(b))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8547 self.assertEqual(6, len(b[0]))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8548 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	8549 self.assertEqual('SpecificCharacterSet', b[0]['0008,0005']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8550 self.assertEqual('A10003245599', b[0]['0008,0050']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8551 self.assertEqual('AccessionNumber', b[0]['0008,0050']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8552 self.assertEqual('STUDY', b[0]['0008,0052']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8553 self.assertEqual('QueryRetrieveLevel', b[0]['0008,0052']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8554 self.assertEqual('ORTHANC', b[0]['0008,0054']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8555 self.assertEqual('RetrieveAETitle', b[0]['0008,0054']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8556 self.assertEqual('887', b[0]['0010,0020']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8557 self.assertEqual('PatientID', b[0]['0010,0020']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8558 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	8559 self.assertEqual('StudyInstanceUID', b[0]['0020,000d']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8560
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8561 for (key, value) in b[0].items():
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8562 self.assertEqual('String', value['Type'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8563
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8564 self.assertEqual(json.dumps(b[0]),
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8565 json.dumps(DoGet(_REMOTE, a['Path'] + '/answers/0/content')))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8566
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8567 # 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	8568
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8569 b = DoGet(_REMOTE, a['Path'] + '/answers?expand&short')
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8570 self.assertEqual(1, len(b))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8571 self.assertEqual(6, len(b[0]))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8572 self.assertEqual('ISO_IR 100', b[0]['0008,0005'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8573 self.assertEqual('A10003245599', b[0]['0008,0050'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8574 self.assertEqual('STUDY', b[0]['0008,0052'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8575 self.assertEqual('ORTHANC', b[0]['0008,0054'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8576 self.assertEqual('887', b[0]['0010,0020'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8577 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	8578 self.assertEqual(json.dumps(b[0]),
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8579 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	8580
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8581 b = DoGet(_REMOTE, a['Path'] + '/answers?expand&simplify')
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8582 self.assertEqual(1, len(b))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8583 self.assertEqual(6, len(b[0]))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8584 self.assertEqual('ISO_IR 100', b[0]['SpecificCharacterSet'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8585 self.assertEqual('A10003245599', b[0]['AccessionNumber'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8586 self.assertEqual('STUDY', b[0]['QueryRetrieveLevel'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8587 self.assertEqual('ORTHANC', b[0]['RetrieveAETitle'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8588 self.assertEqual('887', b[0]['PatientID'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8589 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	8590 self.assertEqual(json.dumps(b[0]),
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8591 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	8592
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8593 b = DoPost(_REMOTE, '/queries/%s/retrieve' % a['ID'], {})
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8594 self.assertEqual('REST API', b['Description'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8595 self.assertEqual('ORTHANC', b['LocalAet'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8596 self.assertEqual('ORTHANC', b['RemoteAet'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8597 self.assertEqual(1, len(b['Query']))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8598 self.assertEqual(4, len(b['Query'][0]))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8599 self.assertEqual('A10003245599', b['Query'][0]['0008,0050'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8600 self.assertEqual('STUDY', b['Query'][0]['0008,0052'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8601 self.assertEqual('887', b['Query'][0]['0010,0020'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8602 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	8603
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8604 # 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	8605
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8606 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	8607 self.assertEqual('REST API', b['Description'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8608 self.assertEqual('ORTHANC', b['LocalAet'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8609 self.assertEqual('ORTHANC', b['RemoteAet'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8610 self.assertEqual(1, len(b['Query']))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8611 self.assertEqual(4, len(b['Query'][0]))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8612 self.assertEqual('A10003245599', b['Query'][0]['0008,0050']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8613 self.assertEqual('STUDY', b['Query'][0]['0008,0052']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8614 self.assertEqual('887', b['Query'][0]['0010,0020']['Value'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8615 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	8616 self.assertEqual('AccessionNumber', b['Query'][0]['0008,0050']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8617 self.assertEqual('QueryRetrieveLevel', b['Query'][0]['0008,0052']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8618 self.assertEqual('PatientID', b['Query'][0]['0010,0020']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8619 self.assertEqual('StudyInstanceUID', b['Query'][0]['0020,000d']['Name'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8620
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8621 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	8622 self.assertEqual('REST API', b['Description'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8623 self.assertEqual('ORTHANC', b['LocalAet'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8624 self.assertEqual('ORTHANC', b['RemoteAet'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8625 self.assertEqual(1, len(b['Query']))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8626 self.assertEqual(4, len(b['Query'][0]))
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8627 self.assertEqual('A10003245599', b['Query'][0]['AccessionNumber'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8628 self.assertEqual('STUDY', b['Query'][0]['QueryRetrieveLevel'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8629 self.assertEqual('887', b['Query'][0]['PatientID'])
cef3847dc8af test_query_retrieve_format Sebastien Jodogne <s.jodogne@gmail.com> parents: 420 diff changeset	8630 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	8631
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8632
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8633 def test_anonymize_nested(self):
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8634 # New in Orthanc 1.9.5
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8635
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8636 tags = {
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8637 'MappingResourceIdentificationSequence' : [
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8638 {
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8639 # Test "DicomModification::RelationshipsVisitor::GetDefaultAction()"
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8640 '0009,1002' : 'ABCD', # Private tag not registered in dictionary
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8641 '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	8642 '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	8643
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8644 # Test "DicomModification::RelationshipsVisitor::VisitString()"
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8645 'StudyDescription' : 'Hello', # Removed
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8646 'StudyDate' : '20210705', # Cleared
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8647 '0009,1001' : '-1234', # Private tag whose VR is DS
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8648
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8649 # Test anonymization of nested sequences
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8650 'ReferencedStudySequence' : [
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8651 {
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8652 'PatientID' : 'HELLO'
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8653 }
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8654 ],
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8655
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8656 # Non-anonymized tags
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8657 'CodeMeaning' : 'MEANING1',
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8658 'EquivalentCodeSequence' : [
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8659 {
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8660 'CodeMeaning' : 'MEANING2',
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8661 }
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8662 ],
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8663 }
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8664 ],
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8665 }
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8666
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8667 a = DoPost(_REMOTE, '/tools/create-dicom',
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8668 json.dumps({
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8669 'Tags' : tags,
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8670 'PrivateCreator' : 'Lunit',
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8671 })) ['ID']
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8672
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8673 study = DoGet(_REMOTE, '/instances/%s/study' % a) ['ID']
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8674 b = DoPost(_REMOTE, '/studies/%s/anonymize' % study, {}) ['ID']
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8675 c = DoGet(_REMOTE, '/studies/%s/instances' % b)
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8676 self.assertEqual(1, len(c))
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8677
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8678 tags1 = DoGet(_REMOTE, '/instances/%s/tags?short' % a)
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8679 tags2 = DoGet(_REMOTE, '/instances/%s/tags?short' % c[0]['ID'])
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8680
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8681 # Only "StudyDate" must be present in
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8682 # "MappingResourceIdentificationSequence" after anonymization
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8683 self.assertEqual(1, len(tags1['0008,0124']))
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8684 self.assertEqual(1, len(tags2['0008,0124']))
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8685 self.assertEqual(9, len(tags1['0008,0124'][0]))
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8686 self.assertEqual(3, len(tags2['0008,0124'][0]))
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8687 self.assertEqual('', tags2['0008,0124'][0]['0008,0020'])
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8688 self.assertEqual('MEANING1', tags2['0008,0124'][0]['0008,0104'])
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8689 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	8690
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8691 self.assertTrue('0008,1110' in tags1['0008,0124'][0])
934f505677da test_anonymize_nested Sebastien Jodogne <s.jodogne@gmail.com> parents: 423 diff changeset	8692 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	8693
77455e156112 integration test for issue 200 Sebastien Jodogne <s.jodogne@gmail.com> parents: 424 diff changeset	8694
77455e156112 integration test for issue 200 Sebastien Jodogne <s.jodogne@gmail.com> parents: 424 diff changeset	8695 def test_issue_200(self):
77455e156112 integration test for issue 200 Sebastien Jodogne <s.jodogne@gmail.com> parents: 424 diff changeset	8696 # https://groups.google.com/g/orthanc-users/c/9CTLsL-JqDw/m/2I0xgyYHBAAJ
77455e156112 integration test for issue 200 Sebastien Jodogne <s.jodogne@gmail.com> parents: 424 diff changeset	8697 # https://bugs.orthanc-server.com/show_bug.cgi?id=200
428 d68dabf3d784 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	8698 self.assertEqual(0, len(DoGet(_REMOTE, '/changes') ['Changes']))
d68dabf3d784 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	8699 self.assertEqual(0, len(DoGet(_REMOTE, '/changes?last') ['Changes']))
429 f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8700 u = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
427 77455e156112 integration test for issue 200 Sebastien Jodogne <s.jodogne@gmail.com> parents: 424 diff changeset	8701
77455e156112 integration test for issue 200 Sebastien Jodogne <s.jodogne@gmail.com> parents: 424 diff changeset	8702 for change in DoGet(_REMOTE, '/changes') ['Changes']:
77455e156112 integration test for issue 200 Sebastien Jodogne <s.jodogne@gmail.com> parents: 424 diff changeset	8703 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	8704 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	8705
d68dabf3d784 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	8706 last = DoGet(_REMOTE, '/changes?last') ['Changes']
d68dabf3d784 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	8707 self.assertEqual(1, len(last))
d68dabf3d784 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 427 diff changeset	8708 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	8709 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	8710
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8711 self.assertEqual(0, len(DoGet(_REMOTE, '/exports') ['Exports']))
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8712 self.assertEqual(0, len(DoGet(_REMOTE, '/exports?last') ['Exports']))
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8713 DoPost(_REMOTE, '/modalities/self/store', [ u ])
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8714
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8715 for change in DoGet(_REMOTE, '/exports') ['Exports']:
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8716 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	8717 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	8718
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8719 last = DoGet(_REMOTE, '/exports?last') ['Exports']
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8720 self.assertEqual(1, len(last))
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8721 self.assertEqual('ozp00SjY2xG', last[0]['PatientID'])
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8722 self.assertEqual('self', last[0]['RemoteModality'])
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8723 self.assertEqual('Instance', last[0]['ResourceType'])
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8724 self.assertEqual('/instances/%s' % last[0]['ID'], last[0]['Path'])
f42c610234b0 test exports Sebastien Jodogne <s.jodogne@gmail.com> parents: 428 diff changeset	8725 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	8726 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	8727 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	8728 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	8729 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	8730
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8731
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8732 def test_upload_dicomdir_archive(self):
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8733 # This test fails on Orthanc <= 1.9.6
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8734 # 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	8735
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8736 # Create a ZIP archive with a DICOMDIR
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8737 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8738 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8739 media = DoGet(_REMOTE, '/studies/%s/media' % study)
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8740 DoDelete(_REMOTE, '/instances/%s' % instance)
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8741
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8742 result = DoPost(_REMOTE, '/instances', media)
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8743 self.assertEqual(1, len(result))
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8744 self.assertEqual(instance, result[0]['ID'])
e665c493e23e test_upload_dicomdir_archive Sebastien Jodogne <s.jodogne@gmail.com> parents: 429 diff changeset	8745 self.assertEqual('Success', result[0]['Status'])
432 f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8746
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8747
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8748 def test_modify_keep_source(self):
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8749 # 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	8750 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8751 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8752 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8753
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8754 a = DoPost(_REMOTE, '/studies/%s/anonymize' % study, {}) ['ID']
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8755 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8756 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8757 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8758
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8759 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	8760 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8761 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8762 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8763
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8764 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	8765 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8766 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8767 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8768
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8769 UploadInstance(_REMOTE, 'DummyCT.dcm')
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8770 a = DoPost(_REMOTE, '/studies/%s/modify' % study, { 'Replace' : { } }) ['ID']
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8771 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8772 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8773 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8774
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8775 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	8776 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8777 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8778 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8779
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8780 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	8781 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8782 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8783 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8784
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8785 def GetStudy(a):
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8786 b = filter(lambda x: x['Type'] == 'Study', a['Resources'])
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8787 if len(b) == 1:
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8788 return b[0]['ID']
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8789 else:
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8790 raise Exception()
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8791
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8792 UploadInstance(_REMOTE, 'DummyCT.dcm')
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8793 a = GetStudy(DoPost(_REMOTE, '/tools/bulk-anonymize', { 'Resources' : [ study ]}))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8794 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8795 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8796 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8797
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8798 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	8799 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8800 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8801 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8802
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8803 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	8804 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8805 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8806 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8807
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8808 UploadInstance(_REMOTE, 'DummyCT.dcm')
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8809 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	8810 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8811 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8812 # 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	8813 # 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	8814 # the original instance
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8815 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8816
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8817 # 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	8818 # introduced in 1.9.7
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8819
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8820 UploadInstance(_REMOTE, 'DummyCT.dcm')
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8821 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	8822 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8823 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8824 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8825
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8826 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	8827 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8828 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8829 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8830
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8831 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	8832 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8833 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source Sebastien Jodogne <s.jodogne@gmail.com> parents: 431 diff changeset	8834 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
433 cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8835
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8836
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8837 def test_multiframe_windowing(self):
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8838 # Fixed in Orthanc 1.9.7
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8839 a = UploadInstance(_REMOTE, 'MultiframeWindowing.dcm') ['ID']
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8840
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8841 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	8842 self.assertEqual(0x00, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8843 self.assertEqual(0x10, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8844 self.assertEqual(0x20, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8845 self.assertEqual(0x30, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8846
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8847 # 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	8848 # mid-level value (i.e. 127)
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8849 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	8850 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8851 self.assertEqual(127, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8852 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8853 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8854
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8855 # 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	8856 im = GetImage(_REMOTE, '/instances/%s/frames/0/rendered' % a)
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8857 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8858 self.assertEqual(127, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8859 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8860 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8861
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8862 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	8863 self.assertEqual(100, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8864 self.assertEqual(116, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8865 self.assertEqual(132, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8866 self.assertEqual(148, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8867
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8868 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	8869 self.assertEqual(0, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8870 self.assertEqual(32, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8871 self.assertEqual(64, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8872 self.assertEqual(96, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8873
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8874 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	8875 self.assertEqual(100, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8876 self.assertEqual(132, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8877 self.assertEqual(164, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8878 self.assertEqual(196, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8879
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8880 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	8881 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8882 self.assertEqual(127, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8883 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8884 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	8885
436 9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8886
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8887 def test_dicom_seg(self):
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8888 # This test fails in Orthanc <= 1.9.7
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8889 a = UploadInstance(_REMOTE, 'DicomSeg.dcm') ['ID']
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8890
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8891 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	8892 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	8893
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8894 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	8895 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	8896
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8897 for i in range(96):
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8898 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	8899 self.assertEqual('L', im.mode)
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8900 self.assertEqual(256, im.size[0])
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8901 self.assertEqual(256, im.size[1])
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8902
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8903 e = im.getextrema()
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8904 self.assertEqual(0, e[0])
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8905
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8906 if e[1] == 0:
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8907 self.assertFalse(i in nonEmptyFrames)
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8908 else:
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8909 self.assertTrue(i in nonEmptyFrames)
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8910
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8911 im1 = GetImage(_REMOTE, '/instances/%s/frames/44/preview' % a)
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8912
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8913 # 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	8914 im2 = Image.open(GetDatabasePath('DicomSeg-Frame45.pgm'))
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8915 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	8916
9f87d5b2b382 added test_dicom_seg Sebastien Jodogne <s.jodogne@gmail.com> parents: 433 diff changeset	8917 self.assertTrue(ImageChops.difference(im1, im2).getbbox() is None)
440 3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8918
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8919
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8920 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	8921 # New in Orthanc 1.10.0
440 3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8922 a = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8923 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm')
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8924 b = UploadInstance(_REMOTE, 'DicomSeg.dcm') ['ID']
441 21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8925 d = UploadInstance(_REMOTE, 'Issue124.dcm') ['ID']
440 3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8926
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8927 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	8928 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8929 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8930 self.assertEqual((288, 288, 1), c.shape)
441 21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8931 self.assertAlmostEqual(0, c.min())
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8932 self.assertAlmostEqual(536, c.max())
440 3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8933
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8934 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	8935 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8936 self.assertEqual(numpy.uint16, c.dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8937 self.assertEqual((288, 288, 1), c.shape)
441 21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8938 self.assertEqual(0, c.min())
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8939 self.assertEqual(536, c.max())
440 3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8940
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8941 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	8942 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8943 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8944 self.assertEqual((1, 288, 288, 1), c.shape)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8945
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8946 series = DoGet(_REMOTE, '/instances/%s/series' % a)['ID']
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8947 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	8948 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8949 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8950 self.assertEqual((2, 288, 288, 1), c.shape)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8951
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8952 series = DoGet(_REMOTE, '/instances/%s/series' % a)['ID']
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8953 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	8954 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8955 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8956 self.assertEqual((2, 288, 288, 1), c.shape)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8957
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8958 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	8959 self.assertTrue(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8960 self.assertEqual(1, len(c.files))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8961 self.assertEqual(numpy.float32, c['arr_0'].dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8962 self.assertEqual((1, 288, 288, 1), c['arr_0'].shape)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8963
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8964 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	8965 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8966 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8967 self.assertEqual((256, 256, 1), c.shape)
441 21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8968 self.assertAlmostEqual(0, c.min())
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8969 self.assertAlmostEqual(0, c.max())
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8970
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8971 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	8972 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8973 self.assertEqual(numpy.float32, c.dtype)
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8974 self.assertEqual((256, 256, 1), c.shape)
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8975 self.assertAlmostEqual(0, c.min())
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8976 self.assertAlmostEqual(255, c.max())
440 3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8977
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8978 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	8979 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8980 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8981 self.assertEqual((96, 256, 256, 1), c.shape)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8982
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8983 series = DoGet(_REMOTE, '/instances/%s/series' % b)['ID']
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8984 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	8985 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8986 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 439 diff changeset	8987 self.assertEqual((96, 256, 256, 1), c.shape)
441 21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8988
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8989 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	8990 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8991 self.assertEqual(numpy.float32, c.dtype)
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8992 self.assertEqual((512, 512, 1), c.shape)
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8993 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	8994 self.assertAlmostEqual(2374, c.max())
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8995
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8996 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	8997 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8998 self.assertEqual(numpy.int16, c.dtype)
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	8999 self.assertEqual((512, 512, 1), c.shape)
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9000 self.assertEqual(-2000, c.min())
21a45ddc9256 expanded test_numpy Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	9001 self.assertEqual(3398, c.max())
442 af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9002
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9003
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9004 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	9005 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	9006
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9007 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	9008 "Replace" : {
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9009 "PatientName" : "MyName[*]",
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9010 "PatientID": "test_brackets"
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9011 },
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9012 "Force": True
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9013 }),
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9014 'application/json')
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9015
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9016 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	9017
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9018 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	9019 'Query' : { 'PatientName' : 'MyName[*]' }})
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9020 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9021
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9022 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	9023 'Query' : { 'PatientName' : 'MyName[*]' }})
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9024 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9025
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9026 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	9027 'Query' : { 'PatientName' : 'MyName*' }})
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9028 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9029
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9030 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	9031 'Query' : { 'PatientName' : 'MyName*' }})
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9032 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9033
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9034 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	9035 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	9036
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9037 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	9038 "Replace" : {
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9039 "PatientName" : "MyName2[]",
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9040 "PatientID": "test_brackets2"
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9041 },
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9042 "Force": True
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9043 }),
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9044 'application/json')
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9045
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9046 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	9047
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9048 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	9049 'Query' : { 'PatientName' : 'MyName2[*]' }})
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9050 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9051
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9052 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	9053 'Query' : { 'PatientName' : 'MyName2[*]' }})
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9054 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9055
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9056 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	9057 'Query' : { 'PatientName' : 'MyName2*' }})
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9058 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9059
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9060 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	9061 'Query' : { 'PatientName' : 'MyName2*' }})
af57603438b3 added tests for patient names with square brackets Alain Mazy <am@osimis.io> parents: 441 diff changeset	9062 self.assertEqual(1, len(a))
455 f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9063
f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9064
452 45dd181b0f17 added test for requestedTags in tools/find + list-resources Alain Mazy <am@osimis.io> parents: 451 diff changeset	9065 def test_rest_find_requested_tags(self):
486 6144ef431512 new tests for sequences in ExtraMainDicomTags Alain Mazy <am@osimis.io> parents: 482 diff changeset	9066 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	9067
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9068 # Upload instances
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9069 for i in range(2):
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9070 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	9071
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9072 # Patient level
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9073 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9074 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9075 'Query' : { 'PatientName' : 'BRAINIX' },
486 6144ef431512 new tests for sequences in ExtraMainDicomTags Alain Mazy <am@osimis.io> parents: 482 diff changeset	9076 'RequestedTags' : [ 'PatientName', 'PatientID', 'PatientSex', 'PatientBirthDate'],
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9077 'Expand': True
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9078 })
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9079 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9080 self.assertIn('PatientName', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9081 self.assertIn('PatientID', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9082 self.assertIn('PatientSex', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9083 self.assertIn('PatientBirthDate', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9084
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9085 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9086 self.assertEqual('5Yp0E', a[0]['RequestedTags']['PatientID'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9087 self.assertEqual('0000', a[0]['RequestedTags']['PatientSex'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9088 self.assertEqual('19490301', a[0]['RequestedTags']['PatientBirthDate'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9089
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9090 # Study level, request patient tags too
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9091 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9092 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9093 'Query' : { 'PatientName' : 'BRAINIX' },
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9094 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID'],
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9095 'Expand': True
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9096 })
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9097 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9098 self.assertIn('PatientName', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9099 self.assertIn('StudyInstanceUID', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9100
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9101 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9102 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	9103
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9104
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9105 # Series level, request patient and study tags too
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9106 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9107 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9108 'Query' : { 'PatientName' : 'BRAINIX' },
486 6144ef431512 new tests for sequences in ExtraMainDicomTags Alain Mazy <am@osimis.io> parents: 482 diff changeset	9109 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SeriesInstanceUID', 'RequestAttributesSequence'],
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9110 'Expand': True
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9111 })
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9112 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9113 self.assertIn('PatientName', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9114 self.assertIn('StudyInstanceUID', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9115 self.assertIn('SeriesInstanceUID', a[0]['RequestedTags'])
486 6144ef431512 new tests for sequences in ExtraMainDicomTags Alain Mazy <am@osimis.io> parents: 482 diff changeset	9116 self.assertIn('RequestAttributesSequence', a[0]['RequestedTags'])
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9117
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9118 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9119 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	9120 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	9121 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	9122
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9123
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9124 # 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	9125 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9126 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9127 'Query' : { 'PatientName' : 'BRAINIX' },
486 6144ef431512 new tests for sequences in ExtraMainDicomTags Alain Mazy <am@osimis.io> parents: 482 diff changeset	9128 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'PhotometricInterpretation', 'RequestAttributesSequence'],
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9129 'Expand': True
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9130 })
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9131 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9132 self.assertIn('PatientName', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9133 self.assertIn('StudyInstanceUID', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9134 self.assertIn('SeriesInstanceUID', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9135 self.assertIn('PhotometricInterpretation', a[0]['RequestedTags'])
486 6144ef431512 new tests for sequences in ExtraMainDicomTags Alain Mazy <am@osimis.io> parents: 482 diff changeset	9136 self.assertIn('RequestAttributesSequence', a[0]['RequestedTags'])
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9137
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9138 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9139 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	9140 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	9141 self.assertEqual('MONOCHROME2', a[0]['RequestedTags']['PhotometricInterpretation'])
486 6144ef431512 new tests for sequences in ExtraMainDicomTags Alain Mazy <am@osimis.io> parents: 482 diff changeset	9142 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	9143
45dd181b0f17 added test for requestedTags in tools/find + list-resources Alain Mazy <am@osimis.io> parents: 451 diff changeset	9144
453 46ae8fb09254 test computed tags for tools/find and list-resources Alain Mazy <am@osimis.io> parents: 452 diff changeset	9145 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	9146 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9147 # Upload instances
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9148 for i in range(2):
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9149 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	9150
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9151
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9152 # Patient level
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9153 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9154 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9155 'Query' : { 'PatientName' : 'BRAINIX' },
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9156 'RequestedTags' : [ 'PatientName', 'NumberOfPatientRelatedStudies', 'NumberOfPatientRelatedSeries', 'NumberOfPatientRelatedInstances'],
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9157 'Expand': True
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9158 })
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9159 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9160
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9161 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9162 self.assertEqual('1', a[0]['RequestedTags']['NumberOfPatientRelatedStudies'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9163 self.assertEqual('1', a[0]['RequestedTags']['NumberOfPatientRelatedSeries'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9164 self.assertEqual('2', a[0]['RequestedTags']['NumberOfPatientRelatedInstances'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9165
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9166 # Study level
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9167 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9168 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9169 'Query' : { 'PatientName' : 'BRAINIX' },
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9170 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'ModalitiesInStudy', 'SOPClassesInStudy', 'NumberOfStudyRelatedInstances', 'NumberOfStudyRelatedSeries'],
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9171 'Expand': True
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9172 })
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9173 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9174
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9175 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9176 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	9177 self.assertEqual('MR', a[0]['RequestedTags']['ModalitiesInStudy'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9178 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	9179 self.assertEqual('2', a[0]['RequestedTags']['NumberOfStudyRelatedInstances'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9180 self.assertEqual('1', a[0]['RequestedTags']['NumberOfStudyRelatedSeries'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9181
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9182 # Series level
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9183 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9184 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9185 'Query' : { 'PatientName' : 'BRAINIX' },
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9186 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'NumberOfSeriesRelatedInstances'],
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9187 'Expand': True
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9188 })
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9189 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9190
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9191 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9192 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	9193 self.assertEqual('2', a[0]['RequestedTags']['NumberOfSeriesRelatedInstances'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9194
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9195 # Instance level
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9196 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9197 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9198 'Query' : { 'PatientName' : 'BRAINIX' },
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9199 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SOPInstanceUID', 'InstanceAvailability'],
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9200 'Expand': True
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9201 })
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9202 self.assertEqual(2, len(a))
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9203
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9204 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9205 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	9206 self.assertEqual('ONLINE', a[0]['RequestedTags']['InstanceAvailability'])
456 0d7c0bbe6c90 fix Alain Mazy <am@osimis.io> parents: 454 diff changeset	9207
452 45dd181b0f17 added test for requestedTags in tools/find + list-resources Alain Mazy <am@osimis.io> parents: 451 diff changeset	9208 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	9209
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9210 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9211 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9212 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9213 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9214
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9215 # 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	9216 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	9217
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9218 self.assertEqual('2D', a[0]['RequestedTags']['MRAcquisitionType'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9219 self.assertEqual('MR', a[0]['RequestedTags']['Modality'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9220 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9221 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	9222
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9223 # list studies and request patient and studies tags
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9224 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	9225
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9226 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	9227 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9228
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9229
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9230 # 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	9231 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	9232
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9233 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	9234 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	9235 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	9236 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9237 self.assertEqual('512', a[0]['RequestedTags']['Rows'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9238 self.assertEqual('512', a[0]['RequestedTags']['Columns'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9239 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	9240
453 46ae8fb09254 test computed tags for tools/find and list-resources Alain Mazy <am@osimis.io> parents: 452 diff changeset	9241
46ae8fb09254 test computed tags for tools/find and list-resources Alain Mazy <am@osimis.io> parents: 452 diff changeset	9242 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	9243
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9244 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9245 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9246 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9247 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9248
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9249 # 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	9250 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	9251
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9252 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	9253 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9254 self.assertEqual('MR', a[0]['RequestedTags']['ModalitiesInStudy'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9255 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	9256 self.assertEqual('1', a[0]['RequestedTags']['NumberOfStudyRelatedInstances'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9257 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	9258
46ae8fb09254 test computed tags for tools/find and list-resources Alain Mazy <am@osimis.io> parents: 452 diff changeset	9259
46ae8fb09254 test computed tags for tools/find and list-resources Alain Mazy <am@osimis.io> parents: 452 diff changeset	9260 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	9261
471 1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9262 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9263 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9264 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9265 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9266
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9267 # 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	9268 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	9269
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9270 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	9271 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version Alain Mazy <am@osimis.io> parents: 469 diff changeset	9272 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	9273
455 f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9274 def test_dicomweb_jpeg2k_implicit(self):
f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9275 # 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	9276 # 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	9277 # representation. Support introduced in Orthanc 1.10.1.
f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9278 # 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	9279 a = UploadInstance(_REMOTE, '2022-03-08-RicSmi.dcm') ['ID']
f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9280 b = DoGet(_REMOTE, '/instances/%s/file' % a,
f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9281 headers = { 'Accept' : 'application/dicom+json' })
f53cd250becc test_dicomweb_jpeg2k_implicit Sebastien Jodogne <s.jodogne@gmail.com> parents: 449 diff changeset	9282 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	9283 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	9284
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	9285 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	9286 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	9287 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	9288
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	9289 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	9290 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	9291 '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	9292 '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	9293 '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	9294 '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	9295 }))
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	9296
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	9297 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	9298 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	9299
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	9300 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	9301 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	9302
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	9303 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	9304 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	9305
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	9306 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	9307 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	9308 self.assertEqual(j['ID'], i['ID'])
501 1b1bb8621021 /store: allows overriding CalledAet, Host, Port Alain Mazy <am@osimis.io> parents: 500 diff changeset	9309
1b1bb8621021 /store: allows overriding CalledAet, Host, Port Alain Mazy <am@osimis.io> parents: 500 diff changeset	9310 def test_storescu_custom_host_ip_port(self):
510 fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9311 if IsOrthancVersionAbove(_REMOTE, 1, 11, 3):
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9312 DropOrthanc(_LOCAL)
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9313 DropOrthanc(_REMOTE)
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9314
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9315 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9316
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9317 # upload to self -> orthanctest shall not receive any content
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9318 DoPost(_REMOTE, '/modalities/self/store', {
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9319 'Resources' : [ a['ID']]
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9320 })
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9321 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9322
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9323 # 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	9324 c = DoGet(_REMOTE, '/modalities/orthanctest/configuration')
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9325 DoPost(_REMOTE, '/modalities/self/store', {
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9326 'LocalAet' : 'YOP',
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9327 'CalledAet' : c['AET'],
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9328 'Port' : c['Port'],
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9329 'Host' : c['Host'],
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9330 'Resources' : [ a['ID']]
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9331 })
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9332
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9333 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9334
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9335 DropOrthanc(_REMOTE)
fb900401be28 fix Alain Mazy <am@osimis.io> parents: 509 diff changeset	9336 DropOrthanc(_LOCAL)
503 138d5efd4407 added test_rle_planar_configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 502 diff changeset	9337
138d5efd4407 added test_rle_planar_configuration Sebastien Jodogne <s.jodogne@gmail.com> parents: 502 diff changeset	9338 def test_rle_planar_configuration(self):
531 8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9339 if IsOrthancVersionAbove(_REMOTE, 1, 11, 2):
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9340 # https://groups.google.com/g/orthanc-users/c/CSVWfRasSR0/m/y1XDRXVnAgAJ
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9341 a = UploadInstance(_REMOTE, '2022-11-14-RLEPlanarConfiguration.dcm') ['ID']
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9342 uri = '/instances/%s/preview' % a
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9343 im = GetImage(_REMOTE, uri)
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9344 self.assertEqual('RGB', im.mode)
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9345 self.assertEqual(1475, im.size[0])
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9346 self.assertEqual(1475, im.size[1])
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9347 self.assertEqual('c684b0050dc2523041240bf2d26dc85e', ComputeMD5(DoGet(_REMOTE, uri)))
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9348
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9349 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9350 a = UploadInstance(_REMOTE, '2023-04-21-RLEPlanarConfigurationYBR_FULL.dcm') ['ID']
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9351 uri = '/instances/%s/preview' % a
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9352 im = GetImage(_REMOTE, uri)
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9353 pprint.pprint(im)
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9354 self.assertEqual('RGB', im.mode)
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9355 self.assertEqual(1260, im.size[0])
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9356 self.assertEqual(910, im.size[1])
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9357 self.assertEqual('07a3ea7ea08d54362f744cc5945e8743', ComputeMD5(DoGet(_REMOTE, uri)))
8a920ab91cf4 YBR_FULL RLE Alain Mazy <am@osimis.io> parents: 530 diff changeset	9358
512 e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	9359
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	9360 def test_rest_api_write_to_file_system(self):
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	9361 if IsOrthancVersionAbove(_REMOTE, 1, 12, 0):
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	9362 a = UploadInstance(_REMOTE, '2022-11-14-RLEPlanarConfiguration.dcm') ['ID']
e2ce0edb9002 /system Alain Mazy <am@osimis.io> parents: 511 diff changeset	9363 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	9364
515 5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9365 def test_overwrite_generates_stable_study(self):
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9366
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9367 # 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	9368 # 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	9369 # 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	9370 # 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	9371 # 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	9372
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9373
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9374 def GetAllStableStudyChangesIds(studyId, timeout):
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9375 # 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	9376 fromSeq = DoGet(_REMOTE, '/changes')["Last"]
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9377
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9378 endTime = time.time() + timeout
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9379 newStableStudyFound = False
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9380 while not newStableStudyFound and time.time() < endTime:
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9381 time.sleep(0.1)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9382 changes = DoGet(_REMOTE, '/changes')
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9383 stableStudyChangesIds = []
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9384
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9385 for change in changes["Changes"]:
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9386 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	9387 stableStudyChangesIds.append(change["Seq"])
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9388 if change["Seq"] > fromSeq:
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9389 newStableStudyFound = True
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9390
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9391 return stableStudyChangesIds
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9392
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9393 if True:
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9394 DropOrthanc(_REMOTE)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9395 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	9396 # 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	9397 changes1 = GetAllStableStudyChangesIds(upload1["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9398 self.assertEqual(1, len(changes1))
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9399
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9400 # 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	9401 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	9402 changes1b = GetAllStableStudyChangesIds(upload1b["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9403 self.assertEqual(1, len(changes1b))
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9404 self.assertNotEqual(changes1[0], changes1b[0])
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9405
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9406 if True:
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9407 DropOrthanc(_REMOTE)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9408 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	9409 # 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	9410 changes1 = GetAllStableStudyChangesIds(upload1["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9411 self.assertEqual(1, len(changes1))
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9412
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9413 # 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	9414 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	9415 json.dumps({
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9416 "Replace" : {
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9417 "InstitutionName" : "hello",
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9418 "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	9419 },
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9420 "Force": True
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9421 }),
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9422 'application/json')
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9423 upload1b = DoPost(_REMOTE, '/instances', modified, 'application/dicom')
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9424 changes1b = GetAllStableStudyChangesIds(upload1b["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9425 self.assertEqual(upload1["ParentStudy"], upload1b["ParentStudy"])
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9426 self.assertEqual(1, len(changes1b))
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9427 self.assertNotEqual(changes1[0], changes1b[0])
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9428
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9429
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9430 if True:
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9431 DropOrthanc(_REMOTE)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9432 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	9433 # 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	9434 changes1 = GetAllStableStudyChangesIds(upload1["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9435 self.assertEqual(1, len(changes1))
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9436
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9437 # 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	9438 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	9439 changes2 = GetAllStableStudyChangesIds(upload2["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9440 self.assertEqual(upload1["ParentStudy"], upload2["ParentStudy"])
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9441 self.assertEqual(2, len(changes2))
5dca7ef42156 added a non-regression test wrt StableStudy Alain Mazy <am@osimis.io> parents: 512 diff changeset	9442 self.assertEqual(changes1[0], changes2[0])
516 3a8e4de5aff7 merge Alain Mazy <am@osimis.io> parents: 515 514 diff changeset	9443
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9444 def test_labels(self):
523 767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9445 def CheckAllLabels(expected):
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9446 actual = DoGet(_REMOTE, '/tools/labels')
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9447 self.assertEqual(len(actual), len(expected))
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9448 for i in expected:
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9449 self.assertTrue(i in actual)
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9450 for i in actual:
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9451 self.assertTrue(i in expected)
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9452
517 692f2956ddab test HasLabels in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 516 diff changeset	9453 if (IsOrthancVersionAbove(_REMOTE, 1, 12, 0) and
692f2956ddab test HasLabels in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 516 diff changeset	9454 DoGet(_REMOTE, '/system') ['HasLabels']):
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9455 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9456 patient = DoGet(_REMOTE, '/instances/%s/patient' % u) ['ID']
5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9457 study = DoGet(_REMOTE, '/instances/%s/study' % u) ['ID']
5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9458 series = DoGet(_REMOTE, '/instances/%s/series' % u) ['ID']
5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9459
5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9460 for base in [ '/instances/%s' % u,
5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9461 '/series/%s' % series,
5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9462 '/studies/%s' % study,
519 b1991073e4d1 test alphanumeric labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 518 diff changeset	9463 '/patients/%s' % patient ]:
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9464
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9465 # no tags by default
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9466 self.assertEqual(0, len(DoGet(_REMOTE, base) ['Labels']))
523 767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9467 CheckAllLabels([])
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9468
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9469 # 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	9470 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '%s/labels/hello' % base))
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9471
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9472 # 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	9473 self.assertEqual('', DoDelete(_REMOTE, '%s/labels/hello' % base))
5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9474 self.assertEqual(0, len(DoGet(_REMOTE, base) ['Labels']))
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9475
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9476 # Not an alphanumeric label -> 400
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9477 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '%s/labels/@' % base))
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9478
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9479 # add a tag
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9480 self.assertEqual('', DoPut(_REMOTE, '%s/labels/hello' % base))
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9481 self.assertEqual(1, len(DoGet(_REMOTE, base) ['Labels']))
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9482 self.assertEqual('hello', DoGet(_REMOTE, base) ['Labels'][0])
523 767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9483 CheckAllLabels([ 'hello' ])
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9484
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9485 # double tagging does not generate any error
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9486 self.assertEqual('', DoPut(_REMOTE, '%s/labels/hello' % base))
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9487 self.assertEqual('', DoGet(_REMOTE, '%s/labels/hello' % base))
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9488 self.assertEqual(1, len(DoGet(_REMOTE, base) ['Labels']))
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9489 self.assertEqual('hello', DoGet(_REMOTE, base) ['Labels'][0])
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9490
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9491 # add a second tag
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9492 self.assertEqual('', DoPut(_REMOTE, '%s/labels/world' % base))
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9493 self.assertEqual('', DoGet(_REMOTE, '%s/labels/world' % base))
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9494 self.assertEqual('', DoGet(_REMOTE, '%s/labels/hello' % base))
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9495 self.assertEqual(2, len(DoGet(_REMOTE, base) ['Labels']))
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9496 self.assertIn(DoGet(_REMOTE, base) ['Labels'][0], ['hello', 'world'])
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9497 self.assertIn(DoGet(_REMOTE, base) ['Labels'][1], ['hello', 'world'])
523 767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9498 CheckAllLabels([ 'hello', 'world' ])
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9499
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9500 # delete the first tag
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9501 self.assertEqual('', DoDelete(_REMOTE, '%s/labels/hello' % base))
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9502 self.assertEqual(1, len(DoGet(_REMOTE, base) ['Labels']))
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9503 self.assertEqual('world', DoGet(_REMOTE, base) ['Labels'][0])
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9504 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	9505 CheckAllLabels([ 'world' ])
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9506
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9507 # delete the second tag
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9508 self.assertEqual('', DoDelete(_REMOTE, '%s/labels/world' % base))
513 5824f0545d5b added test_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 512 diff changeset	9509 self.assertEqual(0, len(DoGet(_REMOTE, base) ['Labels']))
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9510 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	9511 CheckAllLabels([ ])
521 8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9512
8114f67e0f7f labels: doc Alain Mazy <am@osimis.io> parents: 519 diff changeset	9513 # test all valid chars
523 767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9514 VALID = r'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-'
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9515 self.assertEqual('', DoPut(_REMOTE, '%s/labels/%s' % (base, VALID)))
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9516 CheckAllLabels([ VALID ])
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9517 DoDelete(_REMOTE, '%s/labels/%s' % (base, VALID))
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9518 CheckAllLabels([ ])
767840cb4d3f test /tools/labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 522 diff changeset	9519
517 692f2956ddab test HasLabels in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 516 diff changeset	9520 else:
692f2956ddab test HasLabels in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 516 diff changeset	9521 print("Your database backend doesn't support labels")
518 43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9522
43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9523 def test_find_labels(self):
548 3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9524 def Execute(labels, constraint, query = { }, level='Instance'):
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9525 return DoPost(_REMOTE, '/tools/find', { 'Level' : level,
525 b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9526 'Query' : query,
522 fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9527 'Labels' : labels,
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9528 'LabelsConstraint' : constraint, })
518 43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9529
43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9530 if (IsOrthancVersionAbove(_REMOTE, 1, 12, 0) and
43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9531 DoGet(_REMOTE, '/system') ['HasLabels']):
548 3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9532 u = UploadInstance(_REMOTE, 'DummyCT.dcm')
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9533 studyId = u["ParentStudy"]
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9534 seriesId = u["ParentSeries"]
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9535 patientId = u["ParentPatient"]
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9536 u = u["ID"]
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9537 self.assertEqual(1, len(Execute([ 'a' ], 'None')))
518 43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9538
522 fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9539 # The instance has no label
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9540 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	9541 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	9542 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	9543 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	9544 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	9545 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	9546 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	9547 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	9548 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	9549 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	9550 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	9551 self.assertEqual(1, len(Execute([ 'a', 'b' ], 'None')))
518 43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9552
43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9553 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	9554 # The instance has label "a"
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9555 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	9556 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	9557 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	9558 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	9559 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	9560 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	9561 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	9562 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	9563 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	9564 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	9565 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	9566 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'None')))
518 43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9567
525 b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9568 self.assertEqual(0, len(Execute([ 'a' ], 'All', { 'PatientID' : 'nope' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9569 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'PatientID' : '' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9570 self.assertEqual(0, len(Execute([ 'a' ], 'All', { 'StudyInstanceUID' : 'nope' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9571 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'StudyInstanceUID' : '' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9572 self.assertEqual(0, len(Execute([ 'a' ], 'All', { 'SeriesInstanceUID' : 'nope' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9573 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'SeriesInstanceUID' : '' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9574 self.assertEqual(0, len(Execute([ 'a' ], 'All', { 'SOPInstanceUID' : 'nope' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9575 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'SOPInstanceUID' : '' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9576
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9577 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'PatientID' : 'ozp00SjY2xG' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9578
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9579 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	9580 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	9581 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	9582 self.assertEqual(1, len(Execute([ 'a' ], 'All', {
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9583 'PatientID' : 'ozp00SjY2xG',
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9584 '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	9585 '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	9586 '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	9587 })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9588
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9589 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'PatientID' : 'nope' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9590 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'PatientID' : '' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9591 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'StudyInstanceUID' : 'nope' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9592 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'StudyInstanceUID' : '' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9593 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SeriesInstanceUID' : 'nope' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9594 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SeriesInstanceUID' : '' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9595 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SOPInstanceUID' : 'nope' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9596 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SOPInstanceUID' : '' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9597
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9598 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'PatientID' : 'ozp00SjY2xG' })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9599 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	9600 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	9601 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	9602 self.assertEqual(0, len(Execute([ 'b' ], 'All', {
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9603 'PatientID' : 'ozp00SjY2xG',
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9604 '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	9605 '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	9606 '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	9607 })))
b60a0cc28c34 added test Sebastien Jodogne <s.jodogne@gmail.com> parents: 523 diff changeset	9608
518 43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9609 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	9610 # 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	9611 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	9612 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	9613 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	9614 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	9615 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	9616 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	9617 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	9618 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	9619 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	9620 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	9621 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	9622 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'None')))
524 0699890b9961 more tests for label Alain Mazy <am@osimis.io> parents: 523 diff changeset	9623 self.assertEqual(0, len(Execute([ 'b', 'c' ], 'All')))
0699890b9961 more tests for label Alain Mazy <am@osimis.io> parents: 523 diff changeset	9624 self.assertEqual(1, len(Execute([ 'b', 'c' ], 'Any')))
0699890b9961 more tests for label Alain Mazy <am@osimis.io> parents: 523 diff changeset	9625 self.assertEqual(0, len(Execute([ 'b', 'c' ], 'None')))
0699890b9961 more tests for label Alain Mazy <am@osimis.io> parents: 523 diff changeset	9626 self.assertEqual(0, len(Execute([ 'c', 'd' ], 'All')))
0699890b9961 more tests for label Alain Mazy <am@osimis.io> parents: 523 diff changeset	9627 self.assertEqual(0, len(Execute([ 'c', 'd' ], 'Any')))
0699890b9961 more tests for label Alain Mazy <am@osimis.io> parents: 523 diff changeset	9628 self.assertEqual(1, len(Execute([ 'c', 'c' ], 'None')))
518 43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9629
43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9630 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	9631 # The instance has label "b"
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9632 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	9633 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	9634 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	9635 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	9636 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	9637 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	9638 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	9639 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	9640 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	9641 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	9642 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	9643 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	9644
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 521 diff changeset	9645 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	9646 # 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	9647 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	9648 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	9649 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	9650 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	9651 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	9652 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	9653 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	9654 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	9655 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	9656 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	9657 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	9658 self.assertEqual(1, len(Execute([ 'a', 'b' ], 'None')))
548 3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9659
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9660
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9661 # 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	9662 DoPut(_REMOTE, '/series/%s/labels/b' % seriesId)
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9663 self.assertEqual(1, len(Execute([ 'a' ], 'None', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9664 '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	9665 }, 'Series')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9666 self.assertEqual(0, len(Execute([ 'a' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9667 '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	9668 }, 'Series')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9669 self.assertEqual(1, len(Execute([ 'b' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9670 '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	9671 }, 'Series')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9672 self.assertEqual(1, len(Execute([ 'b' ], 'All', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9673 '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	9674 }, 'Series')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9675 self.assertEqual(1, len(Execute([ 'a' ], 'None', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9676 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9677 }, 'Series')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9678 self.assertEqual(0, len(Execute([ 'a' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9679 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9680 }, 'Series')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9681 self.assertEqual(1, len(Execute([ 'b' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9682 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9683 }, 'Series')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9684 self.assertEqual(1, len(Execute([ 'b' ], 'All', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9685 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9686 }, 'Series')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9687
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9688 # 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	9689 DoPut(_REMOTE, '/studies/%s/labels/b' % studyId)
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9690 self.assertEqual(1, len(Execute([ 'a' ], 'None', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9691 '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	9692 }, 'Study')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9693 self.assertEqual(0, len(Execute([ 'a' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9694 '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	9695 }, 'Study')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9696 self.assertEqual(1, len(Execute([ 'b' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9697 '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	9698 }, 'Study')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9699 self.assertEqual(1, len(Execute([ 'b' ], 'All', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9700 '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	9701 }, 'Study')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9702 self.assertEqual(1, len(Execute([ 'a' ], 'None', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9703 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9704 }, 'Study')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9705 self.assertEqual(0, len(Execute([ 'a' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9706 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9707 }, 'Study')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9708 self.assertEqual(1, len(Execute([ 'b' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9709 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9710 }, 'Study')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9711 self.assertEqual(1, len(Execute([ 'b' ], 'All', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9712 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9713 }, 'Study')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9714
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9715 # tests at patient levels
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9716 DoPut(_REMOTE, '/patients/%s/labels/b' % patientId)
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9717 self.assertEqual(1, len(Execute([ 'a' ], 'None', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9718 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9719 }, 'Patient')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9720 self.assertEqual(0, len(Execute([ 'a' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9721 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9722 }, 'Patient')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9723 self.assertEqual(1, len(Execute([ 'b' ], 'Any', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9724 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9725 }, 'Patient')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9726 self.assertEqual(1, len(Execute([ 'b' ], 'All', {
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9727 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9728 }, 'Patient')))
3933237d1958 more tools/find tests Alain Mazy <am@osimis.io> parents: 547 diff changeset	9729
518 43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9730 else:
43a323de0b02 added test_find_labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 517 diff changeset	9731 print("Your database backend doesn't support labels")
527 86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9732
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9733
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9734 def test_numeric_metadata(self):
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9735 if IsOrthancVersionAbove(_REMOTE, 1, 12, 0):
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9736 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9737 study = DoGet(_REMOTE, '/instances/%s/study' % instance)['ID']
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9738
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9739 m = DoGet(_REMOTE, '/studies/%s/metadata' % study)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9740 self.assertEqual(2, len(m))
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9741 self.assertTrue('LastUpdate' in m)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9742 self.assertTrue('MainDicomTagsSignature' in m)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9743 lastUpdate = DoGet(_REMOTE, '/studies/%s/metadata/%s' % (study, 'LastUpdate'))
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9744 signature = DoGet(_REMOTE, '/studies/%s/metadata/%s' % (study, 'MainDicomTagsSignature'))
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9745
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9746 m = DoGet(_REMOTE, '/studies/%s/metadata?numeric' % study)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9747 self.assertEqual(2, len(m))
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9748 self.assertTrue(7 in m) # MetadataType_LastUpdate
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9749 self.assertTrue(15 in m) # MetadataType_MainDicomTagsSignature
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9750 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	9751 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	9752
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9753 m = DoGet(_REMOTE, '/studies/%s/metadata?expand' % study)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9754 self.assertEqual(2, len(m))
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9755 self.assertTrue('LastUpdate' in m)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9756 self.assertTrue('MainDicomTagsSignature' in m)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9757 self.assertEqual(lastUpdate, m['LastUpdate'])
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9758 self.assertEqual(signature, m['MainDicomTagsSignature'])
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9759
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9760 m = DoGet(_REMOTE, '/studies/%s/metadata?expand&numeric' % study)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9761 self.assertEqual(2, len(m))
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9762 self.assertTrue('7' in m)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9763 self.assertTrue('15' in m)
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9764 self.assertEqual(lastUpdate, m['7'])
86456045ac80 added test_numeric_metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 526 diff changeset	9765 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	9766
31f70bfd86a7 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 533 diff changeset	9767 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	9768 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	9769 (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	9770 self.assertEqual('404', headers['status'])
538 7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9771
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9772 def test_delete_updates_parents_last_update_metadata(self):
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9773 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9774 i = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9775 j = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0002.dcm')
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9776
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9777 #instanceLastUpdate1 = DoGet(_REMOTE, '/instances/%s/metadata/LastUpdate' % i['ID'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9778 seriesLastUpdate1 = DoGet(_REMOTE, '/series/%s/metadata/LastUpdate' % i['ParentSeries'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9779 studyLastUpdate1 = DoGet(_REMOTE, '/studies/%s/metadata/LastUpdate' % i['ParentStudy'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9780 patientLastUpdate1 = DoGet(_REMOTE, '/patients/%s/metadata/LastUpdate' % i['ParentPatient'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9781
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9782 time.sleep(1.01)
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9783 DoDelete(_REMOTE, '/instances/%s' % j['ID'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9784
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9785 #instanceLastUpdate2 = DoGet(_REMOTE, '/instances/%s/metadata/LastUpdate' % i['ID'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9786 seriesLastUpdate2 = DoGet(_REMOTE, '/series/%s/metadata/LastUpdate' % i['ParentSeries'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9787 studyLastUpdate2 = DoGet(_REMOTE, '/studies/%s/metadata/LastUpdate' % i['ParentStudy'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9788 patientLastUpdate2 = DoGet(_REMOTE, '/patients/%s/metadata/LastUpdate' % i['ParentPatient'])
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9789
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9790 #self.assertEqual(instanceLastUpdate1, instanceLastUpdate2)
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9791 self.assertNotEqual(seriesLastUpdate1, seriesLastUpdate2)
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9792 self.assertNotEqual(studyLastUpdate1, studyLastUpdate2)
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9793 self.assertNotEqual(patientLastUpdate1, patientLastUpdate2)
7a83a8f087c7 LastUpdate when deleting resources Alain Mazy <am@osimis.io> parents: 535 diff changeset	9794

Mercurial > hg > orthanc-tests

annotate Tests/Tests.py @ 551:c8d2775f0d02