annotate Tests/Tests.py @ 565:855c3720902a Orthanc-1.12.1

added test_encapsulate_stl
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 02 Jul 2023 16:13:18 +0200
parents 1cdb14a679f2
children 31ab8bb2ac5a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
1 #!/usr/bin/env python
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2 # -*- coding: utf-8 -*-
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
3
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
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
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
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
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
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
54 def ExtractDicomTags(rawDicom, tags):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
55 with tempfile.NamedTemporaryFile(delete = True) as f:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
56 f.write(rawDicom)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
57 f.flush()
45
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 44
diff changeset
58 data = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ])
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
59
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
60 result = []
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
61 for tag in tags:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
62 match = re.search('<element[^>]+name="%s">([^>]*)</element>' % tag, data)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
63 if match == None:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
64 result.append('')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
65 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
66 result.append(match.group(1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
67
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
68 return result
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
69
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
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
90 if a.keys() == b.keys():
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
91 return True
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
92 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
93 print('Mismatch in tags: %s' % str(set(a.keys()) ^ set(b.keys())))
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
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
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
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
254 if True:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
255 # New test for Orthanc 1.4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
256 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', u['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
257 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', u['ParentStudy'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 182
diff changeset
258 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', u['ParentPatient'])
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
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
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
Alain Mazy <am@osimis.io>
parents: 529
diff changeset
605
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
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
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
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
Alain Mazy <am@osimis.io>
parents: 529
diff changeset
621 # we count only the events since before the upload of 2 Knee series !
Alain Mazy <am@osimis.io>
parents: 529
diff changeset
622 self.assertEqual(50, countInstances)
Alain Mazy <am@osimis.io>
parents: 529
diff changeset
623 self.assertEqual(1, countPatients)
Alain Mazy <am@osimis.io>
parents: 529
diff changeset
624 self.assertEqual(1, countStudies)
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
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
632 knee = 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
633
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
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
644 brainix = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
645
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
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
648
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
649 z = PostArchive(_REMOTE, '/tools/create-archive', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
650 'Resources' : [ brainix, knee ]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 191
diff changeset
651 })
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
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
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
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
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
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
694
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
695
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
696 def test_protection(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
697 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
698 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
699 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
700 a = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
701 b = DoGet(_REMOTE, '/patients')[1]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
702 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
703 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
704 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
705 DoPut(_REMOTE, '/patients/%s/protected' % a, '1', 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
706 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
707 DoPut(_REMOTE, '/patients/%s/protected' % a, '0', 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
708 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
709
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
710
12
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
711 def test_raw_tags(self):
10
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
712 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
713
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
714 dicom = DoGet(_REMOTE, '/instances/%s/file' % i)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
715 self.assertEqual('1a7c56cb02d6e742cc9c856a8ac182e3', ComputeMD5(dicom))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
716
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
717 s = '/instances/%s/content/' % i
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
718
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
719 self.assertEqual('LOGIQBOOK', DoGet(_REMOTE, s + '0008-1010').strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
720 self.assertRaises(Exception, lambda: DoGet(_REMOTE, s + '0008-1011'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
721
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())
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())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
724
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
725 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
726 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
727 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
728 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
729
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
730 for i in DoGet(_REMOTE, '/instances'):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
731 aid = DoGet(_REMOTE, '/instances/%s' % i)['MainDicomTags']['SOPInstanceUID']
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), ''))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
733
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
734
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
735 def test_raw_tags_mdn(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
736 # Bug reported by Cyril Paulus
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
737 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
738 self.assertAlmostEqual(0.000027, DoGet(_REMOTE, '/instances/%s/content/7053-1000' % i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
739
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
740
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
741 def test_modify_instance(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
742 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
743 modified = DoPost(_REMOTE, '/instances/%s/modify' % i,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
744 json.dumps({
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
745 "Replace" : {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
746 "PatientName" : "hello",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
747 #"PatientID" : "world"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
748 },
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
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
751 }),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
752 'application/json')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
753 j = DoPost(_REMOTE, '/instances', modified, 'application/dicom')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
754
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
755 self.assertNotEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip())
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
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
758 DoGet(_REMOTE, '/instances/%s/content/6003-1010' % i) # Some private tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
759
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
760 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
761 #self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/0010-0020' % j).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
762 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
763 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/6003-1010' % j))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
765
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
766 def test_modify_series(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
767 # Upload 4 images from the same series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
768 for i in range(4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
769 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
770
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
771 origSeries = DoGet(_REMOTE, '/series')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
772 newSeries = DoPost(_REMOTE, '/series/%s/modify' % origSeries,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
773 '{"Replace":{"PatientName":"Jodogne"}}',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
774 'application/json')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
775
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
776 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['ModifiedFrom'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
777 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
778 self.assertEqual(4, len(instances))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
779 for i in instances:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
780 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
781 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
782 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
783
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
784 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
785 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
786
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
787
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
788 def test_modify_study(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
789 # Upload 4 images from the 2 series of the same study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
790 for i in range(4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
791 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
792 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
793
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
794 origStudy = DoGet(_REMOTE, '/studies')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
795 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
796 '{"Replace":{"PatientName":"Jodogne"}}',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
797 'application/json')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
798
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
799 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['ModifiedFrom'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
800 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
801 self.assertEqual(2, len(series))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
802 for s in series:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
803 ss = DoGet(_REMOTE, '/series/%s' % s)['ModifiedFrom']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
804 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
805 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
806
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
807 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
808 for i in instances:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
809 j = DoGet(_REMOTE, '/instances/%s' % i)['ModifiedFrom']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
810 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
811 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
812
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
813 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
814 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
815
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
816
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
817 def test_anonymize_series(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
818 # Upload 4 images from the same series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
819 for i in range(4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
820 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
821
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
822 origSeries = DoGet(_REMOTE, '/series')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
823 newSeries = DoPost(_REMOTE, '/series/%s/anonymize' % origSeries,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
824 '{}',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
825 'application/json')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
826
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
827 self.assertEqual(origSeries, DoGet(_REMOTE, '/series/%s' % newSeries)['AnonymizedFrom'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
828 instances = DoGet(_REMOTE, '/series/%s' % newSeries)['Instances']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
829 self.assertEqual(4, len(instances))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
830 for i in instances:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
831 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
832 self.assertEqual(newSeries, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
833 self.assertEqual(origSeries, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
834
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
835 DoGet(_REMOTE, '/instances/%s/content/0008-1010' % j)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
836 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/0008-1010' % i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
837
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
838
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
839 def test_anonymize_study(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
840 # Upload 4 images from the 2 series of the same study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
841 for i in range(4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
842 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
843 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
844
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
845 origStudy = DoGet(_REMOTE, '/studies')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
846 newStudy = DoPost(_REMOTE,'/studies/%s/anonymize' % origStudy,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
847 '{"Replace":{"PatientName":"Jodogne"}}',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
848 'application/json')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
849
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
850 self.assertEqual(origStudy, DoGet(_REMOTE, '/studies/%s' % newStudy)['AnonymizedFrom'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
851 series = DoGet(_REMOTE, '/studies/%s' % newStudy)['Series']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
852 self.assertEqual(2, len(series))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
853 for s in series:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
854 ss = DoGet(_REMOTE, '/series/%s' % s)['AnonymizedFrom']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
855 self.assertEqual(newStudy, DoGet(_REMOTE, '/series/%s' % s)['ParentStudy'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
856 self.assertEqual(origStudy, DoGet(_REMOTE, '/series/%s' % ss)['ParentStudy'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
857
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
858 instances = DoGet(_REMOTE, '/series/%s' % s)['Instances']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
859 for i in instances:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
860 j = DoGet(_REMOTE, '/instances/%s' % i)['AnonymizedFrom']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
861 self.assertEqual(s, DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
862 self.assertEqual(ss, DoGet(_REMOTE, '/instances/%s' % j)['ParentSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
863
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
864 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % i).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 8
diff changeset
865 self.assertNotEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % j).strip())
11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
866
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
867
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
868
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
869 def test_storescu(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
870 # Check emptiness
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
871 e = DoGet(_REMOTE, '/exports')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
872 self.assertEqual(0, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
873 self.assertEqual(0, e['Last'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
874 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
875 e = DoGet(_REMOTE, '/exports?last')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
876 self.assertEqual(0, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
877 self.assertEqual(0, e['Last'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
878 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
879
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
880 # Add 1 instance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
881 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
882 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
883
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
884 # Export the instance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
885 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') # instance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
886 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
887 self.assertEqual(1, len(DoGet(_LOCAL, '/studies')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
888 self.assertEqual(1, len(DoGet(_LOCAL, '/series')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
889 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
890
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
891 e = DoGet(_REMOTE, '/exports')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
892 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
893 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
894 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
895 e = DoGet(_REMOTE, '/exports?limit=1')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
896 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
897 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
898 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
899 e = DoGet(_REMOTE, '/exports?last')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
900 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
901 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
902 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
903 seqInstance = e['Last']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
904
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
905 # Export the series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
906 j = DoPost(_REMOTE, '/modalities/orthanctest/store', 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
907
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
908 e = DoGet(_REMOTE, '/exports')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
909 self.assertEqual(2, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
910 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
911 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
912 seqSeries = e['Last']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
913 self.assertNotEqual(seqInstance, seqSeries)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
914 e = DoGet(_REMOTE, '/exports?limit=1&since=0')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
915 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
916 self.assertFalse(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
917 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
918 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
919 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
920 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
921 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
922 e = DoGet(_REMOTE, '/exports?last')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
923 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
924 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
925 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
926
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
927 # Export the study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
928 j = DoPost(_REMOTE, '/modalities/orthanctest/store', 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
929 seqStudy = DoGet(_REMOTE, '/exports')['Last']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
930
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
931 # Export the patient
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
932 j = DoPost(_REMOTE, '/modalities/orthanctest/store', '6816cb19-844d5aee-85245eba-28e841e6-2414fae2', 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
933 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
934 self.assertEqual(1, len(DoGet(_LOCAL, '/studies')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
935 self.assertEqual(1, len(DoGet(_LOCAL, '/series')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
936 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
937
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
938 e = DoGet(_REMOTE, '/exports')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
939 self.assertEqual(4, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
940 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
941 self.assertEqual(e['Exports'][-1]['Seq'], e['Last'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
942 seqPatient = e['Last']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
943 self.assertNotEqual(seqInstance, seqSeries)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
944 self.assertNotEqual(seqSeries, seqStudy)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
945 self.assertNotEqual(seqStudy, seqPatient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
946 self.assertTrue(seqInstance < seqSeries)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
947 self.assertTrue(seqSeries < seqStudy)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
948 self.assertTrue(seqStudy < seqPatient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
949 e = DoGet(_REMOTE, '/exports?limit=1&since=0')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
950 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
951 self.assertFalse(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
952 self.assertEqual(e['Exports'][-1]['Seq'], seqInstance)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
953 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqInstance))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
954 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
955 self.assertFalse(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
956 self.assertEqual(e['Exports'][-1]['Seq'], seqSeries)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
957 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqSeries))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
958 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
959 self.assertFalse(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
960 self.assertEqual(e['Exports'][-1]['Seq'], seqStudy)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
961 e = DoGet(_REMOTE, '/exports?limit=1&since=' + str(seqStudy))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
962 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
963 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
964 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
965 e = DoGet(_REMOTE, '/exports?last')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
966 self.assertEqual(1, len(e['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
967 self.assertTrue(e['Done'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
968 self.assertEqual(e['Exports'][-1]['Seq'], seqPatient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
969
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
970
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
971 # Check the content of the logged information
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
972 e = DoGet(_REMOTE, '/exports')['Exports']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
973
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
974 if 'PatientID' in e[0]:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
975 # Since Orthanc 0.8.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
976 patient = 'PatientID'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
977 study = 'StudyInstanceUID'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
978 series = 'SeriesInstanceUID'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
979 instance = 'SOPInstanceUID'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
980 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
981 # Up to Orthanc 0.8.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
982 patient = 'PatientId'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
983 study = 'StudyInstanceUid'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
984 series = 'SeriesInstanceUid'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
985 instance = 'SopInstanceUid'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
986
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
987 for k in range(4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
988 self.assertTrue('Date' in e[k])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
989 self.assertTrue('Seq' in e[k])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
990 self.assertEqual('orthanctest', e[k]['RemoteModality'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
991
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
992 self.assertEqual(10, len(e[0]))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
993 self.assertEqual('Instance', e[0]['ResourceType'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
994 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
995 self.assertEqual('/instances/66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', e[0]['Path'])
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])
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])
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])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
999 self.assertEqual('ozp00SjY2xG', e[0][patient])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1000
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1001 self.assertEqual(9, len(e[1]))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1002 self.assertEqual('Series', e[1]['ResourceType'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1003 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1004 self.assertEqual('/series/f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', e[1]['Path'])
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])
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])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1007 self.assertEqual('ozp00SjY2xG', e[1][patient])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1009 self.assertEqual(8, len(e[2]))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1010 self.assertEqual('Study', e[2]['ResourceType'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1011 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1012 self.assertEqual('/studies/b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', e[2]['Path'])
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])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1014 self.assertEqual('ozp00SjY2xG', e[2][patient])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1015
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1016 self.assertEqual(7, len(e[3]))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1017 self.assertEqual('Patient', e[3]['ResourceType'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1018 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1019 self.assertEqual('/patients/6816cb19-844d5aee-85245eba-28e841e6-2414fae2', e[3]['Path'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1020 self.assertEqual('ozp00SjY2xG', e[3][patient])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1021
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1022 DropOrthanc(_REMOTE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1023 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1024
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1025
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1026 def test_store_peer(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1027 self.assertEqual(0, len(DoGet(_LOCAL, '/exports')['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1028 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1029
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1030 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1031 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1032 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1033
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1034 j = DoPost(_REMOTE, '/peers/peer/store', str(i), 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1035 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1036 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1037
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1038 self.assertEqual(1, len(DoGet(_REMOTE, '/exports')['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1039
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1040 DropOrthanc(_REMOTE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1041 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1042
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1043
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1044 def test_bulk_storescu(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1045 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1046
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1047 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1048 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1049
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1050 j = DoPost(_REMOTE, '/modalities/orthanctest/store', [ a['ID'], b['ID'] ], 'application/json')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1051 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1052
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1053 DropOrthanc(_LOCAL)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1054
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1055 # Send using patient's UUID
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1056 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1057 j = DoPost(_REMOTE, '/modalities/orthanctest/store',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1058 [ 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17' ], 'application/json')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1059 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1060
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1061
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1062 def test_color(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1063 i = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1064 im = GetImage(_REMOTE, '/instances/%s/preview' % i)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1065 self.assertEqual("RGB", im.mode)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1066 self.assertEqual(41, im.size[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1067 self.assertEqual(41, im.size[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1068
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1069 # http://effbot.org/zone/pil-comparing-images.htm
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1070 truth = Image.open(GetDatabasePath('ColorTestMalaterre.png'))
11
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1071 self.assertTrue(ImageChops.difference(im, truth).getbbox() is None)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1072
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 10
diff changeset
1073
12
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1074 def test_faking_ruby_put(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1075 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1076 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1077 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1078 a = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1079 b = DoGet(_REMOTE, '/patients')[1]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1080 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1081 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1082 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1083 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '1')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1084 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1085 DoGet(_REMOTE, '/patients/%s/protected' % a, data = { '_method' : 'PUT' }, body = '0')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1086 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1087
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1088
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1089 def test_faking_ruby_delete(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1090 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1091 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1092 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1093 a = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1094 b = DoGet(_REMOTE, '/patients')[1]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1095 DoGet(_REMOTE, '/patients/%s' % a, data = { '_method' : 'DELETE' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1096 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1097 DoGet(_REMOTE, '/patients/%s' % b, data = { '_method' : 'DELETE' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1098 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1099
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1100
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1101 def test_faking_google_put(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1102 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1103 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1104 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1105 a = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1106 b = DoGet(_REMOTE, '/patients')[1]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1107 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
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')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1109 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
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')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1111 self.assertEqual(1, DoGet(_REMOTE, '/patients/%s/protected' % a))
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')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1113 self.assertEqual(0, DoGet(_REMOTE, '/patients/%s/protected' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1114
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1115
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1116 def test_faking_google_delete(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1117 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1118 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1119 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1120 a = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1121 b = DoGet(_REMOTE, '/patients')[1]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1122 DoPost(_REMOTE, '/patients/%s' % a, headers = { 'X-HTTP-Method-Override' : 'DELETE' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1123 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1124 DoPost(_REMOTE, '/patients/%s' % b, headers = { 'X-HTTP-Method-Override' : 'DELETE' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1125 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1126
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1127
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1128 def test_lua(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1129 self.assertEqual(42, DoPost(_REMOTE, '/tools/execute-script', 'print(42)'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1130 self.assertTrue(IsDefinedInLua(_REMOTE, 'PrintRecursive'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1131 self.assertFalse(IsDefinedInLua(_REMOTE, 'HelloWorld'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1132
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1133
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1134 def test_metadata(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1135 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1136 p = DoGet(_REMOTE, '/patients')[0]
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
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1139
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
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
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1173 m = DoGet(_REMOTE, '/instances/%s/metadata' % i)
554
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
1174 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
451
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1175 self.assertEqual(10, len(m))
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1176 elif IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
379
097329b67509 fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 378
diff changeset
1177 self.assertEqual(9, len(m))
547
7de5fd295025 testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 543
diff changeset
1178 else:
7de5fd295025 testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 543
diff changeset
1179 self.assertEqual(8, len(m))
7de5fd295025 testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 543
diff changeset
1180
7de5fd295025 testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 543
diff changeset
1181 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
7de5fd295025 testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 543
diff changeset
1182 self.assertTrue('MainDicomTagsSignature' in m)
7de5fd295025 testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 543
diff changeset
1183
7de5fd295025 testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 543
diff changeset
1184 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
379
097329b67509 fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 378
diff changeset
1185 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
1186 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
1187
12
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1188 self.assertTrue('IndexInSeries' in m)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1189 self.assertTrue('ReceptionDate' in m)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1190 self.assertTrue('RemoteAET' in m)
63
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1191 self.assertTrue('Origin' in m)
89
74b7b9aed5f8 test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
1192 self.assertTrue('TransferSyntax' in m)
95
a807a4699eb4 testing of metadata SopClassUid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 92
diff changeset
1193 self.assertTrue('SopClassUid' in m)
145
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 144
diff changeset
1194 self.assertTrue('RemoteIP' in m)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 144
diff changeset
1195 self.assertTrue('HttpUsername' in m)
63
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1196 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
1197 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
1198 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
1199 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
1200 self.assertEqual(DoGet(_REMOTE, '/instances/%s/metadata/SopClassUid' % i), '1.2.840.10008.5.1.4.1.1.4')
12
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1201
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1202 # Play with custom metadata
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
1203 (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
1204 self.assertEqual('200', headers['status'])
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
1205 self.assertEqual('', body)
394
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1206
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1207 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
1208 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
1209 else:
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1210 self.assertFalse('ETag' in headers)
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1211 self.assertFalse('etag' in headers)
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1212
12
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1213 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
451
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1214 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1215 self.assertEqual(3, len(m))
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1216 self.assertTrue('MainDicomTagsSignature' in m)
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1217 else:
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1218 self.assertEqual(2, len(m))
12
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1219 self.assertTrue('LastUpdate' in m)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1220 self.assertTrue('5555' in m)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1221 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
1222
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1223 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1224 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
1225 'If-Match' : headers['etag']
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1226 })
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1227 else:
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1228 DoPut(_REMOTE, '/patients/%s/metadata/5555' % p, 'hello')
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
1229
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
1230 (headers, body) = DoGetRaw(_REMOTE, '/patients/%s/metadata/5555' % p)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
1231 self.assertEqual('200', headers['status'])
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
1232 self.assertEqual('hello', body)
394
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 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1235 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p, headers = {
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1236 'If-Match' : headers['etag']
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1237 })
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1238 else:
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1239 DoDelete(_REMOTE, '/patients/%s/metadata/5555' % p)
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1240
12
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1241 m = DoGet(_REMOTE, '/patients/%s/metadata' % p)
451
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1242 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1243 self.assertEqual(2, len(m))
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1244 self.assertTrue('MainDicomTagsSignature' in m)
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1245 else:
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1246 self.assertEqual(1, len(m))
12
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 11
diff changeset
1247 self.assertTrue('LastUpdate' in m)
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1248
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1249
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1250 def test_statistics(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1251 # Upload 16 instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1252 for i in range(4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1253 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1254 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1255 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1256 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1257
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1258 s = DoGet(_REMOTE, '/statistics')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1259 self.assertEqual(16, s['CountInstances'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1260 self.assertEqual(2, s['CountPatients'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1261 self.assertEqual(2, s['CountStudies'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1262 self.assertEqual(4, s['CountSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1263 d = int(s['TotalUncompressedSize'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1264
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1265 e = 0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1266 for patient in DoGet(_REMOTE, '/patients'):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1267 s = DoGet(_REMOTE, '/patients/%s/statistics' % patient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1268 self.assertEqual(8, s['CountInstances'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1269 self.assertEqual(1, s['CountStudies'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1270 self.assertEqual(2, s['CountSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1271 e += int(s['UncompressedSize'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1272
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1273 for study in DoGet(_REMOTE, '/studies'):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1274 s = DoGet(_REMOTE, '/studies/%s/statistics' % study)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1275 self.assertEqual(8, s['CountInstances'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1276 self.assertEqual(2, s['CountSeries'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1277 e += int(s['UncompressedSize'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1278
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1279 for series in DoGet(_REMOTE, '/series'):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1280 s = DoGet(_REMOTE, '/series/%s/statistics' % series)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1281 self.assertEqual(4, s['CountInstances'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1282 e += int(s['UncompressedSize'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1283
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1284 self.assertEqual(3 * d, e)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1285
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1286
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1287 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
1288 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
1289
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1290 patient = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1291 instance = DoGet(_REMOTE, '/instances')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1292 size = int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1293 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1294
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1295 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1296 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
1297
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
1298 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
1299 if IsDicomUntilPixelDataStored(_REMOTE):
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
1300 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
1301 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
1302
448
63f475995400 Orthanc 1.9.8 is now known as Orthanc 1.10.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 447
diff changeset
1303 # New in Orthanc 1.10.0
443
97fca09bf849 test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 442
diff changeset
1304 a = DoGet(_REMOTE, '/instances/%s/attachments?full' % instance)
97fca09bf849 test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 442
diff changeset
1305 self.assertEqual(2, len(a))
97fca09bf849 test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 442
diff changeset
1306 self.assertEqual(1, a['dicom'])
97fca09bf849 test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 442
diff changeset
1307 self.assertEqual(3, a['dicom-until-pixel-data'])
97fca09bf849 test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 442
diff changeset
1308
380
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
1309 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
1310 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
1311
448
63f475995400 Orthanc 1.9.8 is now known as Orthanc 1.10.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 447
diff changeset
1312 # New in Orthanc 1.10.0
443
97fca09bf849 test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 442
diff changeset
1313 a = DoGet(_REMOTE, '/instances/%s/attachments?full' % instance)
97fca09bf849 test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 442
diff changeset
1314 self.assertEqual(1, len(a))
97fca09bf849 test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 442
diff changeset
1315 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
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(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
1318 self.assertTrue('dicom-as-json' in DoGet(_REMOTE, '/instances/%s/attachments' % instance))
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1319
448
63f475995400 Orthanc 1.9.8 is now known as Orthanc 1.10.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 447
diff changeset
1320 # New in Orthanc 1.10.0
443
97fca09bf849 test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 442
diff changeset
1321 self.assertRaises(Exception, lambda: DoGet(
97fca09bf849 test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 442
diff changeset
1322 _REMOTE, '/instances/%s/attachments?full' % instance))
97fca09bf849 test ?full in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 442
diff changeset
1323
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1324 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/patients/%s/attachments/22' % patient, 'hello'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1325 hello = 'hellohellohellohellohellohellohellohellohello'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1326 DoPut(_REMOTE, '/patients/%s/attachments/1025' % patient, hello)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1327 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1328 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1329 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1330 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1331
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1332 DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1333 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1334 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1335 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1336 size +
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1337 int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient)) +
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1338 int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1339
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1340 self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1341 self.assertEqual(hello, DoGet(_REMOTE, '/patients/%s/attachments/1025/data' % patient))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1342 self.assertEqual('world', DoGet(_REMOTE, '/patients/%s/attachments/1026/data' % patient))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1343 DoPost(_REMOTE, '/patients/%s/attachments/1025/verify-md5' % patient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1344 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
1345 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
1346 'If-Match' : '0-%s' % ComputeMD5('world'),
392
5cbcb4a83b41 fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 391
diff changeset
1347 })
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
1348
394
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1349 (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
1350 self.assertEqual('200', headers['status'])
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
1351 self.assertEqual('world2', body)
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1352
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1353 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
1354 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
1355 'If-Match' : '0-%s' % ComputeMD5(hello),
392
5cbcb4a83b41 fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 391
diff changeset
1356 })
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1357 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1358 int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1359 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1360 size + int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1361
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1362 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
1363
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1364 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1365 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient, headers = {
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1366 'If-Match' : headers['etag']
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1367 })
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1368 else:
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1369 self.assertFalse('etag' in headers)
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1370 DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient)
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
1371
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1372 self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1373
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1374 self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), size)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1375 self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1376
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1377
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1378 def test_incoming_storescu(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1379 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
45
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 44
diff changeset
1380 subprocess.check_call([ FindExecutable('storescu'),
44
ffa542cce638 Toolbox.FindExecutable()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 43
diff changeset
1381 _REMOTE['Server'], str(_REMOTE['DicomPort']),
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1382 GetDatabasePath('ColorTestImageJ.dcm') ])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1383 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1384
63
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1385 i = DoGet(_REMOTE, '/instances')
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1386 self.assertEqual(1, len(i))
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1387 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
1388
554
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
1389 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
451
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1390 self.assertEqual(10, len(m))
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1391 elif IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
379
097329b67509 fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 378
diff changeset
1392 self.assertEqual(9, len(m))
097329b67509 fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 378
diff changeset
1393 else:
097329b67509 fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 378
diff changeset
1394 self.assertEqual(8, len(m))
547
7de5fd295025 testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 543
diff changeset
1395
7de5fd295025 testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 543
diff changeset
1396 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
7de5fd295025 testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 543
diff changeset
1397 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
1398
7de5fd295025 testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 543
diff changeset
1399 if IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
7de5fd295025 testing instance metadata "PixelDataVR"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 543
diff changeset
1400 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
1401 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
1402
63
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1403 self.assertTrue('IndexInSeries' in m)
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1404 self.assertTrue('ReceptionDate' in m)
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1405 self.assertTrue('RemoteAET' in m)
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1406 self.assertTrue('Origin' in m)
89
74b7b9aed5f8 test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
1407 self.assertTrue('TransferSyntax' in m)
95
a807a4699eb4 testing of metadata SopClassUid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 92
diff changeset
1408 self.assertTrue('SopClassUid' in m)
145
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 144
diff changeset
1409 self.assertTrue('RemoteIP' in m)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 144
diff changeset
1410 self.assertTrue('CalledAET' in m)
63
2652d562267a test Origin metadata of instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 62
diff changeset
1411 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
1412 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
1413 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
1414 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
1415 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
1416
369
24d93b42873a test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 368
diff changeset
1417 series = DoGet(_REMOTE, '/series')[0]
24d93b42873a test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 368
diff changeset
1418 m = DoGet(_REMOTE, '/series/%s/metadata' % series)
451
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1419 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1420 self.assertEqual(3, len(m))
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1421 self.assertTrue('MainDicomTagsSignature' in m)
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1422 else:
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
1423 self.assertEqual(2, len(m))
369
24d93b42873a test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 368
diff changeset
1424 self.assertTrue('LastUpdate' in m)
24d93b42873a test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 368
diff changeset
1425 self.assertTrue('RemoteAET' in m)
24d93b42873a test "RemoteAET" metadata at series level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 368
diff changeset
1426 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
1427 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
1428 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
1429
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1430
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1431 def test_incoming_findscu(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1432 UploadInstance(_REMOTE, 'Multiframe.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1433 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1434
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1435 i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', '0010,0010' ])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1436 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1437 self.assertEqual(2, len(patientNames))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1438 self.assertTrue('Test Patient BG ' in patientNames)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1439 self.assertTrue('Anonymized' in patientNames)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1440
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1441 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0008,0021' ])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1442 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1443 self.assertEqual(2, len(series))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1444 self.assertTrue('20070208' in series)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1445 self.assertTrue('19980312' in series)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1446
335
96718de2f29c simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 334
diff changeset
1447 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
1448 series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i)
1059b8de42de ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 55
diff changeset
1449 self.assertEqual(1, len(series))
1059b8de42de ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 55
diff changeset
1450 self.assertTrue('19980312' in series)
1059b8de42de ModalitiesInStudy subtest
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 55
diff changeset
1451
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1452 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=Anonymized' ])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1453 series = re.findall('\(0010,0010\).*?\[\s*(.*?)\s*\]', i)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1454 self.assertEqual(1, len(series))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1455
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1456 # Test the "CaseSentitivePN" flag (false by default)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1457 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=anonymized' ])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1458 series = re.findall('\(0010,0010\).*?\[\s*(.*?)\s*\]', i)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1459 self.assertEqual(1, len(series))
66
821d9eb73c45 Test returning sequence values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
1460
70
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1461 # Test range search (buggy if Orthanc <= 0.9.6)
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1462 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-' ])
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1463 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i)
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1464 self.assertEqual(2, len(studies))
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1465 self.assertTrue('20070208' in studies)
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1466 self.assertTrue('19980312' in studies)
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1467 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=19980312-19980312' ])
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1468 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i)
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1469 self.assertEqual(1, len(studies))
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1470 self.assertTrue('19980312' in studies)
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1471 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyDate=-19980312' ])
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1472 studies = re.findall('\(0008,0020\).*?\[\s*(.*?)\s*\]', i)
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1473 self.assertEqual(1, len(studies))
9e7b5809481f test range search
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 69
diff changeset
1474 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
1475
05f48c19c60d Test "Retrieve AE Title" is returned by C-FIND SCP
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 324
diff changeset
1476 # 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
1477 # 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
1478 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
1479 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
1480 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
1481 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
1482 self.assertEqual('ORTHANC', instances[1].strip())
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1483
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1484
191
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1485 def test_incoming_findscu_2(self):
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1486 # This test fails if "LookupMode_DatabaseOnly" is used
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1487 # (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
1488 # DICOM tags are returned)
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1489 UploadInstance(_REMOTE, 'Multiframe.dcm')
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1490 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1491
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1492 # 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
1493 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
1494 sequences = re.findall('\(0008,2112\)', i)
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1495 self.assertEqual(1, len(sequences))
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1496
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1497 # Test returning a non-main DICOM tag,
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1498 # "SecondaryCaptureDeviceID" (0018,1010), whose value is
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1499 # "MEDPC" in "ColorTestImageJ.dcm"
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1500 i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0018,1010' ])
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1501 tags = re.findall('\(0018,1010\).*MEDPC', i)
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1502 self.assertEqual(1, len(tags))
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1503
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1504
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1505 def test_incoming_findscu_3(self):
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1506 # This test fails if "LookupMode_DatabaseOnly" or
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1507 # "LookupMode_DiskOnAnswer" is used, as
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1508 # "SecondaryCaptureDeviceID" (0018,1010) is not a main DICOM
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1509 # 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
1510 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1511
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1512 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
1513 sequences = re.findall('\(0018,1010\)', i)
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1514 self.assertEqual(1, len(sequences))
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1515
bc8bc83465dc testing C-FIND optimization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 189
diff changeset
1516
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1517 def test_incoming_movescu(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1518 UploadInstance(_REMOTE, 'Multiframe.dcm')
137
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
1519
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
1520 # No matching patient, so no job is created
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
1521 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
1522 CallMoveScu([ '--patient', '-k', '0008,0052=PATIENT', '-k', 'PatientID=none' ])
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1523 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
137
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
1524
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
1525 # 1 Matching patient, track the job
138
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
1526 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
1527 '--patient',
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
1528 '-k', '0008,0052=PATIENT',
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
1529 '-k', 'PatientID=12345678'
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
1530 ])))
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1531 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1532
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1533
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1534 def test_findscu(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1535 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1536 j = UploadInstance(_REMOTE, 'Issue22.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1537 k = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1538 DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1539
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1540 # Test the "find-patient" level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1541 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1542 self.assertEqual(1, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1543 self.assertEqual('ozp00SjY2xG', p[0]['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1544
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1545 # Test wildcards constraints. The "LO" value representation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1546 # for PatientID is always case-sensitive, but the "PN" for
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1547 # PatientName might depend on the implementation:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1548 # "GenerateConfigurationForTests.py" will force it to be case
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1549 # insensitive (which was the default until Orthanc 0.8.6).
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1550 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'K*' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1551 self.assertEqual(1, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1552
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1553 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'k*' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1554 self.assertEqual(1, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1556 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'ozp*' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1557 self.assertEqual(1, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1559 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'o?p*' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1560 self.assertEqual(1, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1561
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1562 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : '0?q*' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1563 self.assertEqual(0, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1564
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1565 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'B*' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1566 self.assertEqual(0, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1567
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1568 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'b*' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1569 self.assertEqual(0, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1570
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1571 DoPost(_REMOTE, '/modalities/orthanctest/store', str(j), 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1572 DoPost(_REMOTE, '/modalities/orthanctest/store', str(k), 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1573 DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1574 self.assertEqual(3, len(DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { })))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1575
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1576 p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'A*' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1577 self.assertEqual(2, len(p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1578
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1579 # Test the "find-study" level. This is the instance "ColorTestImageJ.dcm"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1580 s = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1581 self.assertEqual(1, len(s))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1582 self.assertEqual('20070208', s[0]['StudyDate'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1583
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1584 # Test range searches
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1585 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1586 'StudyDate' : '-20070101' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1587 self.assertEqual(0, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1588
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1589 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1590 'StudyDate' : '20090101-' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1591 self.assertEqual(0, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1592
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1593 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1594 'StudyDate' : '20070101-' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1595 self.assertEqual(1, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1596
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1597 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1598 'StudyDate' : '-20090101' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1599 self.assertEqual(1, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1600
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1601 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1602 'StudyDate' : '20070207-20070207' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1603 self.assertEqual(0, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1604
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1605 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1606 'StudyDate' : '20070208-20070208' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1607 self.assertEqual(1, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1608
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1609 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1610 'StudyDate' : '20070209-20070209' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1611 self.assertEqual(0, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1612
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1613 # Test the ModalitiesInStudy tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1614 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1615 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1616 'ModalitiesInStudy' : 'US' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1617 self.assertEqual(0, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1618
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1619 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1620 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1621 'ModalitiesInStudy' : 'CT' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1622 self.assertEqual(1, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1623
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1624 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1625 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1626 'ModalitiesInStudy' : 'US\\CT' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1627 self.assertEqual(1, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1628
466
28a2c9452ec9 extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents: 462
diff changeset
1629 t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', {
28a2c9452ec9 extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents: 462
diff changeset
1630 'PatientID' : 'B9uTHKOZ',
28a2c9452ec9 extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents: 462
diff changeset
1631 'ModalitiesInStudy' : '' })
28a2c9452ec9 extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents: 462
diff changeset
1632 self.assertEqual(1, len(t))
28a2c9452ec9 extra test with empty filter ModalitiesInStudy
Alain Mazy <am@osimis.io>
parents: 462
diff changeset
1633
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1634 # Test the "find-series" level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1635 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1636 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1637 'StudyInstanceUID' : s[0]['StudyInstanceUID'] })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1638 self.assertEqual(1, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1639
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1640 # Test "\" separator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1641 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1642 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1643 'StudyInstanceUID' : s[0]['StudyInstanceUID'],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1644 'Modality' : 'MR\\CT\\US' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1645 self.assertEqual(1, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1646
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1647 t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1648 'PatientID' : 'B9uTHKOZ',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1649 'StudyInstanceUID' : s[0]['StudyInstanceUID'],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1650 'Modality' : 'MR\\US' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1651 self.assertEqual(0, len(t))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1652
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1653
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1654 def test_update_modalities(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1655 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
1656 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/modalities/toto'))
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1657 DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000 ])
116
4a196ebc7a4f updated tests for issue #31
amazy
parents: 112
diff changeset
1658 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
1659 DoDelete(_REMOTE, '/modalities/tata')
124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 123
diff changeset
1660 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoUniversalWildcard' ])
121
1a19f953f53c also test GenericNoWildcardInDates
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 120
diff changeset
1661 DoDelete(_REMOTE, '/modalities/tata')
1a19f953f53c also test GenericNoWildcardInDates
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 120
diff changeset
1662 DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'GenericNoWildcardInDates' ])
128
a9fdfcb696e6 added tests for ?expand in /peers and /modalities
amazy
parents: 127
diff changeset
1663 modalitiesReadback = DoGet(_REMOTE, '/modalities?expand')
182
7a6b532853ab modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
1664 self.assertEqual('STORESCP', modalitiesReadback['tata']['AET'])
7a6b532853ab modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
1665 self.assertEqual('localhost', modalitiesReadback['tata']['Host'])
7a6b532853ab modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
1666 self.assertEqual(2000, modalitiesReadback['tata']['Port'])
7a6b532853ab modalities are now described as JSON objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 181
diff changeset
1667 self.assertEqual('GenericNoWildcardInDates', modalitiesReadback['tata']['Manufacturer'])
116
4a196ebc7a4f updated tests for issue #31
amazy
parents: 112
diff changeset
1668 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000, 'InvalidManufacturerName' ]))
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1669 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/toto'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1670 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
1671
429cc9d03610 test access to the configuration of one single peer or modality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 350
diff changeset
1672 # 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
1673 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
1674 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
1675
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1676 DoDelete(_REMOTE, '/modalities/toto')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1677 DoDelete(_REMOTE, '/modalities/tata')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1678 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/toto'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1679 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/tata'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1680
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1681
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1682 def test_update_peers(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1683 # curl -X PUT http://localhost:8042/peers/toto -d '["http://localhost:8042/"]' -v
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1684 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
1685 self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/peers/toto'))
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1686 DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/' ])
214
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1687 DoPut(_REMOTE, '/peers/tata', { 'Url': 'http://localhost:8042/',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1688 'Username': 'user',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1689 'Password' : 'pass',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1690 'RemoteSelf' : 'self' })
128
a9fdfcb696e6 added tests for ?expand in /peers and /modalities
amazy
parents: 127
diff changeset
1691 self.assertTrue('tata' in DoGet(_REMOTE, '/peers'))
a9fdfcb696e6 added tests for ?expand in /peers and /modalities
amazy
parents: 127
diff changeset
1692 peersReadback = DoGet(_REMOTE, '/peers?expand')
a9fdfcb696e6 added tests for ?expand in /peers and /modalities
amazy
parents: 127
diff changeset
1693 self.assertEqual('http://localhost:8042/', peersReadback['tata']['Url'])
a9fdfcb696e6 added tests for ?expand in /peers and /modalities
amazy
parents: 127
diff changeset
1694 self.assertEqual('user', peersReadback['tata']['Username'])
214
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1695
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1696 if IsOrthancVersionAbove(_REMOTE, 1, 5, 4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1697 self.assertEqual(None, peersReadback['tata']['Password']) # make sure no sensitive data is included
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1698 self.assertFalse(peersReadback['tata']['Pkcs11']) # make sure no sensitive data is included
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1699 self.assertEqual('self', peersReadback['tata']['RemoteSelf'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1700 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1701 self.assertFalse('Password' in peersReadback['tata']) # make sure no sensitive data is included
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1702 self.assertFalse('Pkcs11' in peersReadback['tata']) # make sure no sensitive data is included
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1703 self.assertFalse('RemoteSelf' in peersReadback['tata'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1704
128
a9fdfcb696e6 added tests for ?expand in /peers and /modalities
amazy
parents: 127
diff changeset
1705 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
1706 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
1707 self.assertFalse('CertificateKeyPassword' in peersReadback['tata']) # make sure no sensitive data is included
214
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 213
diff changeset
1708
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1709 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a' ]))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1710 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a', 'b', 'c' ]))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1711 self.assertTrue('store' in DoGet(_REMOTE, '/peers/toto'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1712 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
1713
429cc9d03610 test access to the configuration of one single peer or modality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 350
diff changeset
1714 # 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
1715 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
1716 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
1717
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1718 DoDelete(_REMOTE, '/peers/toto')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1719 DoDelete(_REMOTE, '/peers/tata')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1720 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1721 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/tata'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1722
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1723
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1724 def test_mesterhazy_modification(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1725 # When I modify a series ( eg. curl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1726 # http://localhost:8042/series/uidhere/modify -X POST -d
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1727 # '{"Replace":{"SeriesDate":"19990101"}}' ) the modified
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1728 # series is added to a new Study, instead of the existing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1729 # Study. Fixed in Orthanc 0.7.5
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1730
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1731 u = UploadInstance(_REMOTE, 'DummyCT.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1732 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1733 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1734
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1735 modified = DoPost(_REMOTE, '/series/%s/modify' % series,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1736 json.dumps({ "Replace" : { "SeriesDate" : "19990101" }}))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1737
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1738 self.assertEqual(study, DoGet(_REMOTE, '/series/%s' % modified['ID']) ['ParentStudy'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1739
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1740
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1741 def test_create(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1742 i = DoPost(_REMOTE, '/tools/create-dicom',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1743 json.dumps({
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1744 'PatientName' : 'Jodogne',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1745 'Modality' : 'CT',
58
b5518378e23b fix test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
1746 'SOPClassUID' : '1.2.840.10008.5.1.4.1.1.1',
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1747 'PixelData' : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==' # red dot in RGBA
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1748 }))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1749
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1750 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1751 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1752
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1753 png = GetImage(_REMOTE, '/instances/%s/preview' % i['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1754 self.assertEqual((5, 5), png.size)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1755
38
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
1756 j = DoGet(_REMOTE, i['Path'])
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
1757 self.assertEqual('Instance', j['Type'])
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
1758 self.assertEqual(j['ID'], i['ID'])
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
1759
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1760
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1761 def test_pilates(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1762 # "SCU failed error when accessing orthanc with osirix" by
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1763 # Pilates Agentur (Mar 10, 2014 at 9:33 PM)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1764 i = UploadInstance(_REMOTE, 'PilatesArgenturGEUltrasoundOsiriX.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1765 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1766 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1767 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1768
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1769
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1770 def test_shared_tags(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1771 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1772 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1773 p = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1774
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1775 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1776 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
1777 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
1778
5634ef96fcc5 testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 133
diff changeset
1779 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
1780 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
1781 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
1782
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1783 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1784 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1785 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1786 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1787 self.assertFalse('0008,0018' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1788 self.assertFalse('SOPInstanceUID' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1789
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1790 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/tags' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1791 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/tags?simplify' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1792
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1793
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1794 def test_modules(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1795 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1796 p = DoGet(_REMOTE, '/patients')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1797 s = DoGet(_REMOTE, '/studies')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1798 t = DoGet(_REMOTE, '/series')[0]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1799
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1800 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/module' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1801 self.assertTrue('PatientName' in DoGet(_REMOTE, '/patients/%s/module?simplify' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1802 self.assertTrue('0010,0010' in DoGet(_REMOTE, '/studies/%s/module-patient' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1803 self.assertTrue('PatientName' in DoGet(_REMOTE, '/studies/%s/module-patient?simplify' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1804 self.assertTrue('0008,1030' in DoGet(_REMOTE, '/studies/%s/module' % s))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1805 self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/studies/%s/module?simplify' % s))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1806 self.assertTrue('0008,103e' in DoGet(_REMOTE, '/series/%s/module' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1807 self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/series/%s/module?simplify' % p))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1808 self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/module' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1809 self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/module?simplify' % a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1810
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1811
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1812 def test_auto_directory(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1813 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1814 self.assertTrue('now' in DoGet(_REMOTE, '/tools'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1815 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
1816 self.assertTrue('invalidate-tags' in DoGet(_REMOTE, '/tools'))
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1817 self.assertTrue(len(DoGet(_REMOTE, '/tools/dicom-conformance')) > 1000)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1818 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1819 self.assertTrue('echo' in DoGet(_REMOTE, '/modalities/orthanctest'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1820 self.assertTrue('find' in DoGet(_REMOTE, '/modalities/orthanctest'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1821 self.assertTrue('find-instance' in DoGet(_REMOTE, '/modalities/orthanctest'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1822 self.assertTrue('find-patient' in DoGet(_REMOTE, '/modalities/orthanctest'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1823 self.assertTrue('find-series' in DoGet(_REMOTE, '/modalities/orthanctest'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1824 self.assertTrue('find-study' in DoGet(_REMOTE, '/modalities/orthanctest'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1825 self.assertTrue('store' in DoGet(_REMOTE, '/modalities/orthanctest'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1826 self.assertTrue('store' in DoGet(_REMOTE, '/peers/peer'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1827 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
1828 self.assertTrue('raw' in DoGet(_REMOTE, '/instances/%s/frames/0' % a))
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1829 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/tools/nope'))
28
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 27
diff changeset
1830 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope'))
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 27
diff changeset
1831 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/nope/nope.html'))
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 27
diff changeset
1832 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope')[0].status)
156c7ae164b5 new test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 27
diff changeset
1833 self.assertEqual(404, DoGetRaw(_REMOTE, '/nope/nope.html')[0].status)
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1834
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1835
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1836 def test_echo(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1837 DoPost(_REMOTE, '/modalities/orthanctest/echo')
359
8b476a383999 test empty body in /modalities/.../echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
1838 DoPost(_REMOTE, '/modalities/orthanctest/echo', '{}')
8b476a383999 test empty body in /modalities/.../echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
1839
8b476a383999 test empty body in /modalities/.../echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
1840 # 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
1841 DoPost(_REMOTE, '/modalities/orthanctest/echo', '')
352
3d406c0261fc test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 351
diff changeset
1842 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/nope/echo'))
3d406c0261fc test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 351
diff changeset
1843
3d406c0261fc test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 351
diff changeset
1844 # New in Orthanc 1.8.1
3d406c0261fc test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 351
diff changeset
1845 DoPost(_REMOTE, '/tools/dicom-echo', [
355
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 354
diff changeset
1846 _REMOTE['DicomAet'], _REMOTE['Server'], _REMOTE['DicomPort'] ])
352
3d406c0261fc test /tools/dicom-echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 351
diff changeset
1847 DoPost(_REMOTE, '/tools/dicom-echo', DoGet(_REMOTE, '/modalities/orthanctest/configuration'))
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1848
353
49f2943544eb CheckFind on echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 352
diff changeset
1849 # Use the 'CheckFind' new option in Orthanc 1.8.1
49f2943544eb CheckFind on echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 352
diff changeset
1850 DoPost(_REMOTE, '/modalities/self/echo', { 'CheckFind' : True })
49f2943544eb CheckFind on echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 352
diff changeset
1851 DoPost(_REMOTE, '/tools/dicom-echo', {
49f2943544eb CheckFind on echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 352
diff changeset
1852 'AET' : _REMOTE['DicomAet'],
49f2943544eb CheckFind on echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 352
diff changeset
1853 'Host' : _REMOTE['Server'],
49f2943544eb CheckFind on echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 352
diff changeset
1854 'Port' : _REMOTE['DicomPort'],
49f2943544eb CheckFind on echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 352
diff changeset
1855 'CheckFind' : True
49f2943544eb CheckFind on echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 352
diff changeset
1856 })
49f2943544eb CheckFind on echo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 352
diff changeset
1857
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1858
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1859 def test_xml(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1860 json = DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/json' })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1861 xml = minidom.parseString(DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/xml' }))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1862 items = xml.getElementsByTagName('root')[0].getElementsByTagName('item')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1863 self.assertEqual(len(items), len(json))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1864
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1865 self.assertTrue('dicom-conformance' in json)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1866
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1867 ok = False
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1868 for i in items:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1869 if i.childNodes[0].data == 'dicom-conformance':
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1870 ok = True
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1871 self.assertTrue(ok)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1872
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1873
46
85b2e36ed392 explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 45
diff changeset
1874 def test_googlecode_issue_16(self):
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1875 i = UploadInstance(_REMOTE, 'Issue16.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1876 t = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)['FrameIncrementPointer']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1877 self.assertEqual('0018,1063', t)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1878
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1879
46
85b2e36ed392 explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 45
diff changeset
1880 def test_googlecode_issue_22(self):
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1881 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1882 a = [
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1883 "f804691f62197040438f4627c6b994f1", # Frame 0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1884 "c69eee9a51eea3e8611e82e578897254",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1885 "315666be83e2d0111c77bc0996d84901",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1886 "3e27aa959d911172c48a1436443c72b1",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1887 "958642c9e7e9d232d3869faff546058c",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1888 "5e7ea8e3e4230cae707d143481355c59",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1889 "eda37f83558d858a596175aed8b2ad47",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1890 "486713bd2895c4ecbe0e97715ac7f80a",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1891 "091ef729eb169e67da8a0faa9631f9a8",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1892 "5aa2b8c7ffe0a483efaa8e12417686ca",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1893 "e2f39e85896fe58876654b94cd0b5013",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1894 "6fd2129e4950abbe1be053bc814d5da8",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1895 "c3331a8ba7a757f3d423735ab7fa81f9",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1896 "746f808582156734dd6b6fdfd3a0b72c",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1897 "8075ea2b227a70c60ea6b7b75a6bb190",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1898 "806b8b3e300c615099c11a5ec23465aa",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1899 "7c836aa298ba6eef96434579af631a11",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1900 "a0357dc9f4f72d73a885c33d7c287446",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1901 "f25ba3be1cc7d7fad95706adc199ea7d",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1902 "8b114c526b8cbed6cad8a3248b7b480c",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1903 "44e6670f127e612a2b4aa60a0d207698",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1904 "b8945f90fe02facf2ace24ca1ecbe0a5",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1905 "95c796c2fa8f59018b15cf2987b1f79b",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1906 "ce0a51ab30224205b44920221dc27351", # Frame 23
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1907 ]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1908
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1909 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1910 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/preview' % s))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1911
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1912 for i in range(len(a)):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1913 self.assertEqual(a[i], ComputeMD5(DoGet(_REMOTE, '/instances/%s/frames/%d/preview' % (s, i))))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1914
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1915
46
85b2e36ed392 explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 45
diff changeset
1916 def test_googlecode_issue_19(self):
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
1917 # This is an image with "YBR_FULL" photometric interpretation, it is not supported by Orthanc
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1918 # gdcmconv -i /home/jodogne/DICOM/GdcmDatabase/US_DataSet/HDI5000_US/3EAF5E01 -w -o Issue19.dcm
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1919
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1920 a = UploadInstance(_REMOTE, 'Issue19.dcm')['ID']
304
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 302
diff changeset
1921 if not HasGdcmPlugin(_REMOTE):
299
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
1922 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/941ad3c8-05d05b88-560459f9-0eae0e20-6cddd533/preview'))
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1923
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1924
46
85b2e36ed392 explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 45
diff changeset
1925 def test_googlecode_issue_37(self):
13
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1926 # Same test for issues 35 and 37. Fixed in Orthanc 0.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1927 u = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1928
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1929 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1930 'CaseSensitive' : True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1931 'Query' : { 'StationName' : 'SMR4-MP3' }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 12
diff changeset
1932 self.assertEqual(1, len(a))
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1933
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1934
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1935 def test_rest_find(self):
548
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1936 # Upload 12 instances
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1937 for i in range(3):
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1938 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1939 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1940 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1941 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1942
548
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1943
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1944 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1945 'CaseSensitive' : True,
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1946 'Query' : {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1947 'PatientName' : '*NE*',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1948 'StudyDate': '20080819'
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1949 }})
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1950 self.assertEqual(1, len(a))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1951
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1952 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1953 'CaseSensitive' : True,
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1954 'Query' : {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1955 'PatientName' : '*NE*',
555
739cad709a8c skipping DicomWeb test not implemented yet
Alain Mazy <am@osimis.io>
parents: 548
diff changeset
1956 'PatientBirthDate': '20080101-20081231',
548
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1957 'PatientSex': '0000'
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1958 }})
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1959 self.assertEqual(1, len(a))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1960
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1961 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1962 'CaseSensitive' : True,
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1963 'Query' : {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1964 'StudyInstanceUID' : '2.16.840.1.113669.632.20.121711.10000160881'
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 self.assertEqual(2, len(a))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1967
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1968 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1969 'CaseSensitive' : True,
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1970 'Query' : {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1971 'StudyInstanceUID' : '2.16.840.1.113669.632.20.121711.10000160881',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1972 '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
1973 }})
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1974 self.assertEqual(3, len(a))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1975
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1976 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1977 'CaseSensitive' : True,
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1978 'Query' : {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1979 'StudyDate' : '20080818-20080820',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1980 'Modality': 'MR'
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1981 }})
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1982 self.assertEqual(2, len(a))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1983
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1984 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1985 'CaseSensitive' : True,
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1986 'Query' : {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1987 'StudyDate' : '20080818-',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1988 'ModalitiesInStudy': 'MR'
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1989 }})
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1990 self.assertEqual(1, len(a))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1991
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
1992
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1993 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
1994 'CaseSensitive' : False,
194
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1995 'Query' : { 'PatientName' : 'BRAINIX' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1996 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1997
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1998 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
1999 'CaseSensitive' : False,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2000 'Query' : { 'PatientName' : 'BRAINIX\\KNEE\\NOPE' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2001 self.assertEqual(2, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2002
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2003 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2004 'CaseSensitive' : False,
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2005 'Query' : { 'PatientName' : '*n*' }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2006 self.assertEqual(2, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2007
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2008 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2009 'CaseSensitive' : True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2010 'Query' : { 'PatientName' : '*n*' }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2011 self.assertEqual(0, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2012
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2013 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2014 'Level' : 'Patient',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2015 'CaseSensitive' : False,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2016 'Query' : { 'PatientName' : '*ne*' }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2017 self.assertEqual(1, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2018 self.assertEqual('20080822', a[0]['MainDicomTags']['PatientBirthDate'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2019
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2020 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2021 'CaseSensitive' : True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2022 'Query' : { 'PatientName' : '*ne*' }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2023 self.assertEqual(0, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2025 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2026 'CaseSensitive' : True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2027 'Query' : { 'PatientName' : '*NE*' }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2028 self.assertEqual(1, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2029
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2030 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2031 'CaseSensitive' : True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2032 'Query' : { 'PatientName' : '*NE*' }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2033 self.assertEqual(2, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2034
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2035 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2036 'CaseSensitive' : True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2037 'Query' : { 'PatientName' : '*NE*' }})
548
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
2038 self.assertEqual(6, len(a))
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2039
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2040 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient', 'Query' : { }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2041 self.assertEqual(2, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2042
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2043 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study', 'Query' : { }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2044 self.assertEqual(2, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2045
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2046 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', 'Query' : { }})
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2047 self.assertEqual(4, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2048
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2049 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance', 'Query' : { }})
548
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
2050 self.assertEqual(12, len(a))
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2051
194
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2052 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2053 'Expand' : True,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2054 'Query' : { 'StudyDate' : '20061201-20061201' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2055 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2056 self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName'])
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2057
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2058 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2059 'Expand' : True,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2060 'Query' : { 'StudyDate' : '20061201-20091201' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2061 self.assertEqual(2, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2062 for i in range(2):
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2063 self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE'])
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2064
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 'Query' : { 'StudyDate' : '20061202-20061202' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2067 self.assertEqual(0, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2068
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2069 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2070 'Expand' : True,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2071 'Query' : { 'StudyDate' : '-20061201' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2072 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2073 self.assertEqual('BRAINIX', a[0]['PatientMainDicomTags']['PatientName'])
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2074
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2075 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2076 'Expand' : True,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2077 'Query' : { 'StudyDate' : '-20051201' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2078 self.assertEqual(0, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2079
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2080 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2081 'Expand' : True,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2082 'Query' : { 'StudyDate' : '20061201-' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2083 self.assertEqual(2, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2084 for i in range(2):
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2085 self.assertTrue(a[i]['PatientMainDicomTags']['PatientName'] in ['BRAINIX', 'KNEE'])
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2086
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2087 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2088 'Expand' : True,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2089 'Query' : { 'StudyDate' : '20061202-' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2090 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2091 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName'])
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' : '20080819-' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2096 self.assertEqual(1, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2097 self.assertEqual('KNEE', a[0]['PatientMainDicomTags']['PatientName'])
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2098
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2099 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2100 'Expand' : True,
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2101 'Query' : { 'StudyDate' : '20080820-' }})
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2102 self.assertEqual(0, len(a))
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2103
9f7ae64c0fda more tests about find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 192
diff changeset
2104
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2105
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2106 def test_rest_query_retrieve(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2107 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2109 # Upload 8 instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2110 for i in range(2):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2111 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2112 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2113 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2114 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2115
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2116 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2117 for p in DoGet(_REMOTE, '/patients'):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2118 DoPost(_REMOTE, '/modalities/orthanctest/store', p)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2119 DoDelete(_REMOTE, '/patients/%s' % p)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2120
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2121 for q in DoGet(_REMOTE, '/queries'):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2122 DoDelete(_REMOTE, '/queries/%s' % q)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2123
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2124 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2125 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
2126
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
2127 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
2128 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
2129 '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
2130 '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
2131 '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
2132 }})['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
2133 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
2134
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
2135 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
2136 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
2137 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
2138 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
2139 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
2140 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
2141 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
2142 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
2143
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 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
2145 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
2146 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
2147 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
2148 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
2149 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
2150
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.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
2152
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 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
2154 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
2155 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
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 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
2158 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
2159 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
2160
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(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
2162 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
2163 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
2164 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
2165 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
2166 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
2167
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 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
2169 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
2170 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
2171 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
2172 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
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 # 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
2175 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
2176 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
2177 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
2178 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
2179 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
2180 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
2181
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 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
2183 self.assertEqual(0, len(DoGet(_REMOTE, '/queries')))
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2184
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2185
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2186 def test_parent(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2187 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2188 patient = '6816cb19-844d5aee-85245eba-28e841e6-2414fae2'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2189 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2190 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2191 instance = '66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d'
107
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
2192 self.assertEqual(instance, u)
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2193
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2194 a = DoGet(_REMOTE, '/studies/%s/patient' % study)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2195 self.assertEqual('Patient', a['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2196 self.assertEqual(patient, a['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2197
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2198 a = DoGet(_REMOTE, '/series/%s/patient' % series)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2199 self.assertEqual('Patient', a['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2200 self.assertEqual(patient, a['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2201
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2202 a = DoGet(_REMOTE, '/series/%s/study' % series)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2203 self.assertEqual('Study', a['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2204 self.assertEqual(study, a['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2205
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2206 a = DoGet(_REMOTE, '/instances/%s/patient' % instance)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2207 self.assertEqual('Patient', a['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2208 self.assertEqual(patient, a['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2209
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2210 a = DoGet(_REMOTE, '/instances/%s/study' % instance)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2211 self.assertEqual('Study', a['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2212 self.assertEqual(study, a['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2213
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2214 a = DoGet(_REMOTE, '/instances/%s/series' % instance)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2215 self.assertEqual('Series', a['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2216 self.assertEqual(series, a['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2217
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2218
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2219 def test_shanon(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2220 def Anonymize(instance, replacements = {}):
119
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
2221 return DoPost(_REMOTE, '/instances/%s/anonymize' % instance, {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
2222 'Replace' : replacements,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
2223 'Force' : True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
2224 }, 'application/json')
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2225
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2226 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2227 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2228 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2229
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2230 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2231 ids = [ 'ozp00SjY2xG',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2232 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2233 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2234 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2235
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2236 a = ExtractDicomTags(Anonymize(u), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2237 for i in range(4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2238 self.assertNotEqual(ids[i], a[i])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2239 self.assertTrue(a[4].startswith('Orthanc'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2240
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2241 a = ExtractDicomTags(Anonymize(u, { 'PatientName' : 'toto' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2242 for i in range(4):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2243 self.assertNotEqual(ids[i], a[i])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2244 self.assertFalse(a[4].startswith('Orthanc'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2245
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2246 a = ExtractDicomTags(Anonymize(u, { 'SOPInstanceUID' : 'instance' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2247 self.assertEqual('instance', a[3])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2248 self.assertFalse(a[4].startswith('Orthanc'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2249
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2250 a = ExtractDicomTags(Anonymize(u, { 'SeriesInstanceUID' : 'series' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2251 self.assertEqual('series', a[2])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2252 self.assertFalse(a[4].startswith('Orthanc'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2253
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2254 a = ExtractDicomTags(Anonymize(u, { 'StudyInstanceUID' : 'study' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2255 self.assertEqual('study', a[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2256 self.assertFalse(a[4].startswith('Orthanc'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2257
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2258 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2259 self.assertEqual('patient', a[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2260 self.assertFalse(a[4].startswith('Orthanc'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2261
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2262 a = ExtractDicomTags(Anonymize(u, { 'PatientID' : 'patient',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2263 'StudyInstanceUID' : 'study',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2264 'SeriesInstanceUID' : 'series',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2265 'SOPInstanceUID' : 'instance' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2266 self.assertEqual('patient', a[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2267 self.assertFalse(a[4].startswith('Orthanc'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2268
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2269 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2270
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2271
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2272 def test_shanon_2(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2273 def Modify(instance, replacements = {}):
119
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
2274 return DoPost(_REMOTE, '/instances/%s/modify' % instance, {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
2275 'Replace' : replacements,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
2276 'Force': True,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
2277 }, 'application/json')
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2278
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2279 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2280 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2281 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2282
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2283 tags = [ 'PatientID', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'DeidentificationMethod' ]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2284 ids = [ 'ozp00SjY2xG',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2285 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2286 '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2287 '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109' ]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2288
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2289 a = ExtractDicomTags(Modify(u), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2290 self.assertEqual(ids[0], a[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2291 self.assertEqual(ids[1], a[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2292 self.assertEqual(ids[2], a[2])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2293 self.assertNotEqual(ids[3], a[3])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2294 self.assertEqual(0, len(a[4]))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2295
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2296 a = ExtractDicomTags(Modify(u, { 'SOPInstanceUID' : 'instance' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2297 self.assertEqual(ids[0], a[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2298 self.assertEqual(ids[1], a[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2299 self.assertEqual(ids[2], a[2])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2300 self.assertEqual('instance', a[3])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2301
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2302 a = ExtractDicomTags(Modify(u, { 'SeriesInstanceUID' : 'series' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2303 self.assertEqual(ids[0], a[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2304 self.assertEqual(ids[1], a[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2305 self.assertEqual('series', a[2])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2306 self.assertNotEqual(ids[3], a[3])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2307
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2308 a = ExtractDicomTags(Modify(u, { 'StudyInstanceUID' : 'study' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2309 self.assertEqual(ids[0], a[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2310 self.assertEqual('study', a[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2311 self.assertNotEqual(ids[2], a[2])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2312 self.assertNotEqual(ids[3], a[3])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2313
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2314 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2315 self.assertEqual('patient', a[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2316 self.assertNotEqual(ids[1], a[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2317 self.assertNotEqual(ids[2], a[2])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2318 self.assertNotEqual(ids[3], a[3])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2319
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2320 a = ExtractDicomTags(Modify(u, { 'PatientID' : 'patient',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2321 'StudyInstanceUID' : 'study',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2322 'SeriesInstanceUID' : 'series',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2323 'SOPInstanceUID' : 'instance' }), tags)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2324 self.assertEqual('patient', a[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2325 self.assertEqual('study', a[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2326 self.assertEqual('series', a[2])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2327 self.assertEqual('instance', a[3])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2328
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2329 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2330
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2331
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2332 def test_instances_tags(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2333 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2334 b = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2335 #a = UploadInstance(_REMOTE, 'Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386937.676343')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2336 #b = UploadInstance(_REMOTE, 'Cardiac/MR.X.1.2.276.0.7230010.3.1.4.2831157719.2256.1336386925.676329')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2337
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2338 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/patients')[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2339 self.assertEqual(2, len(i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2340 self.assertEqual('887', i[i.keys()[0]]['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2341 self.assertEqual('887', i[i.keys()[1]]['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2342
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2343 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/studies')[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2344 self.assertEqual(2, len(i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2345 self.assertEqual('887', i[i.keys()[0]]['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2346 self.assertEqual('887', i[i.keys()[1]]['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2347
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2348 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2349 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2350 self.assertEqual(1, len(i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2351 self.assertEqual('887', i[i.keys()[0]]['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2352
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2353 i = DoGet(_REMOTE, '/patients/%s/instances-tags?simplify' % DoGet(_REMOTE, '/series')[1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2354 self.assertEqual(1, len(i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2355 self.assertEqual('887', i[i.keys()[0]]['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2356
136
5634ef96fcc5 testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 133
diff changeset
2357 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
2358 self.assertEqual(1, len(i))
5634ef96fcc5 testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 133
diff changeset
2359 self.assertEqual('887', i[i.keys()[0]]['0010,0020'])
5634ef96fcc5 testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 133
diff changeset
2360
14
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2361
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2362 def test_lookup(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2363 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2364 self.assertEqual(0, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2365
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2366 UploadInstance(_REMOTE, 'DummyCT.dcm')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2367
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2368 a = DoPost(_REMOTE, '/tools/lookup', 'ozp00SjY2xG')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2369 self.assertEqual(1, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2370 self.assertEqual('Patient', a[0]['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2371 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', a[0]['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2372 self.assertEqual('/patients/%s' % a[0]['ID'], a[0]['Path'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2373
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2374 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7391.1171285944.390')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2375 self.assertEqual(1, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2376 self.assertEqual('Study', a[0]['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2377 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', a[0]['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2378 self.assertEqual('/studies/%s' % a[0]['ID'], a[0]['Path'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2379
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2380 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7391.1171285944.394')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2381 self.assertEqual(1, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2382 self.assertEqual('Series', a[0]['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2383 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', a[0]['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2384 self.assertEqual('/series/%s' % a[0]['ID'], a[0]['Path'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2385
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2386 a = DoPost(_REMOTE, '/tools/lookup', '1.2.840.113619.2.176.2025.1499492.7040.1171286242.109')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2387 self.assertEqual(1, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2388 self.assertEqual('Instance', a[0]['Type'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2389 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', a[0]['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2390 self.assertEqual('/instances/%s' % a[0]['ID'], a[0]['Path'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2391
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2392 DropOrthanc(_REMOTE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2393 a = DoPost(_REMOTE, '/tools/lookup', '3113719P')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2394 self.assertEqual(0, len(a))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 13
diff changeset
2395
15
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2396
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2397 def test_autorouting(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2398 knee1 = 'Knee/T1/IM-0001-0001.dcm'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2399 knee2 = 'Knee/T2/IM-0001-0002.dcm'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2400 other = 'Brainix/Flair/IM-0001-0001.dcm'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2401
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2402 # Check that this version is >= 0.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2403 self.assertTrue(IsDefinedInLua(_REMOTE, '_InitializeJob'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2404 self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2405
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2406 UploadInstance(_REMOTE, knee1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2407 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2408
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2409 DropOrthanc(_REMOTE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2410 DropOrthanc(_LOCAL)
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
2411 InstallLuaScriptFromPath(_REMOTE, 'Lua/Autorouting.lua')
15
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2412 UploadInstance(_REMOTE, knee1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2413 UploadInstance(_REMOTE, knee2)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2414 UploadInstance(_REMOTE, other)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2415 WaitEmpty(_REMOTE)
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
2416 UninstallLuaCallbacks(_REMOTE)
15
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2417 self.assertEqual(3, len(DoGet(_LOCAL, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2418
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2419 DropOrthanc(_REMOTE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2420 DropOrthanc(_LOCAL)
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
2421 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingConditional.lua')
15
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2422 UploadInstance(_REMOTE, knee1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2423 UploadInstance(_REMOTE, knee2)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2424 UploadInstance(_REMOTE, other)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2425 WaitEmpty(_REMOTE)
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
2426 UninstallLuaCallbacks(_REMOTE)
15
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2427 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2428
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2429 DropOrthanc(_REMOTE)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2430 DropOrthanc(_LOCAL)
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
2431 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingModification.lua')
15
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2432 UploadInstance(_REMOTE, knee1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2433 WaitEmpty(_REMOTE)
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
2434 UninstallLuaCallbacks(_REMOTE)
15
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2435 i = DoGet(_LOCAL, '/instances')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2436 self.assertEqual(1, len(i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2437
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2438 with tempfile.NamedTemporaryFile(delete = True) as f:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2439 f.write(DoGet(_LOCAL, '/instances/%s/file' % i[0]))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2440 f.flush()
45
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 44
diff changeset
2441 routed = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ])
15
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2442 self.assertEqual('My Medical Device', re.search('"StationName">(.*?)<', routed).group(1).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2443 self.assertEqual(None, re.search('"MilitaryRank"', routed))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 14
diff changeset
2444 self.assertEqual(None, re.search('"0051,0010"', routed)) # A private tag
17
7c8500991a12 karsten
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 15
diff changeset
2445
7c8500991a12 karsten
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 15
diff changeset
2446
7c8500991a12 karsten
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 15
diff changeset
2447 def test_storescu_rf(self):
7c8500991a12 karsten
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 15
diff changeset
2448 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
7c8500991a12 karsten
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 15
diff changeset
2449 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
7c8500991a12 karsten
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 15
diff changeset
2450 j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
7c8500991a12 karsten
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 15
diff changeset
2451 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
18
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2452
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2453
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2454 def test_anonymize_instance(self):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2455 def AnonymizeAndUpload(instanceId, parameters):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2456 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/anonymize' % instanceId, parameters,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2457 'application/json'), 'application/dicom')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2458
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2459 def ModifyAndUpload(instanceId, parameters):
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2460 return DoPost(_REMOTE, '/instances', DoPost(_REMOTE, '/instances/%s/modify' % instanceId, parameters,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2461 'application/json'), 'application/dicom')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2462
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2463 a = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2464 s1 = DoGet(_REMOTE, '/instances/%s/content/PatientName' % a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2465 s2 = DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % a) # Some private tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2466 s3 = DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2467 s4 = DoGet(_REMOTE, '/instances/%s/content/SeriesDescription' % a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2468 s5 = DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2469
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2470 b = AnonymizeAndUpload(a, '{}')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2471 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2472 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2473
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2474 # Keep private tag (only OK since Orthanc 0.8.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2475 b = AnonymizeAndUpload(a, '{"Keep":["00e1-10c2"]}')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2476 self.assertNotEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2477 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2478
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2479 b = AnonymizeAndUpload(a, '{"Keep":["00e1,10c2","PatientName"]}')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2480 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2481 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2482
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2483 b = AnonymizeAndUpload(a, '{"Keep":["PatientName"],"Replace":{"00e1,10c2":"Hello"}}')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2484 self.assertEqual(s1, DoGet(_REMOTE, '/instances/%s/content/PatientName' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2485 self.assertTrue(DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b).startswith('Hello'))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2486
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2487 # Examples from the Wiki
118
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
2488 b = AnonymizeAndUpload(a, '{"Replace":{"PatientName":"hello","0010-0020":"world"},"Keep":["StudyDescription", "SeriesDescription"],"KeepPrivateTags": true,"Force":true}')
18
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2489 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2490 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2491 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2492 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2493 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2494 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2495 DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2496 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2497
118
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
2498 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Remove":["InstitutionName"],"RemovePrivateTags": true,"Force":true}')
18
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2499 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2500 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2501 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2502 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008,103e' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2503 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/00e1-10c2' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2504 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2505
118
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
2506 b = ModifyAndUpload(a, '{"Replace":{"PatientName":"hello","PatientID":"world"},"Force":true}')
18
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2507 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/0010-0010' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2508 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/PatientID' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2509 self.assertEqual(s2, DoGet(_REMOTE, '/instances/%s/content/00e1,10c2' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2510 self.assertEqual(s3, DoGet(_REMOTE, '/instances/%s/content/0008,1030' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2511 self.assertEqual(s4, DoGet(_REMOTE, '/instances/%s/content/0008-103E' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2512 self.assertEqual(s5, DoGet(_REMOTE, '/instances/%s/content/InstitutionName' % b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2513
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2514
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2515 # Test modify non-existing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2516 i = DoPost(_REMOTE, '/tools/create-dicom',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2517 json.dumps({
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2518 'PatientName' : 'Jodogne',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2519 'Modality' : 'CT',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2520 }))['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2521
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2522 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2523 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % i))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2524 self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2525
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2526 b = ModifyAndUpload(i, '{"Replace":{"StudyDescription":"hello","Modality":"world"}}')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2527 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2528 self.assertEqual('hello', DoGet(_REMOTE, '/instances/%s/content/StudyDescription' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2529 self.assertEqual('world', DoGet(_REMOTE, '/instances/%s/content/Modality' % b).strip())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 17
diff changeset
2530
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2531
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2532 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
2533 # 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
2534 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
2535
468
e1867aeb57e2 retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents: 465
diff changeset
2536 def storescu(image, acceptUnknownSopClassUid, expectSuccess = True, retries = 1):
61
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2537 if acceptUnknownSopClassUid:
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2538 tmp = [ '-xf', GetDatabasePath('UnknownSopClassUid.cfg'), 'Default' ]
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2539 else:
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2540 tmp = [ '-xs' ]
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2541
468
e1867aeb57e2 retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents: 465
diff changeset
2542 while retries > 0:
e1867aeb57e2 retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents: 465
diff changeset
2543 retries -= 1
e1867aeb57e2 retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents: 465
diff changeset
2544 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
2545 try:
e1867aeb57e2 retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents: 465
diff changeset
2546 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
2547 [ _REMOTE['Server'], str(_REMOTE['DicomPort']),
e1867aeb57e2 retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents: 465
diff changeset
2548 GetDatabasePath(image) ],
e1867aeb57e2 retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents: 465
diff changeset
2549 stderr = FNULL)
e1867aeb57e2 retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents: 465
diff changeset
2550
e1867aeb57e2 retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents: 465
diff changeset
2551 if expectSuccess:
e1867aeb57e2 retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents: 465
diff changeset
2552 return
e1867aeb57e2 retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents: 465
diff changeset
2553 except subprocess.CalledProcessError as e:
e1867aeb57e2 retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents: 465
diff changeset
2554 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
2555 if not expectSuccess:
e1867aeb57e2 retries storescu if it succeeds while it should fail
Alain Mazy <am@osimis.io>
parents: 465
diff changeset
2556 raise e
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2557
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2558 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
2559
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 372
diff changeset
2560 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
2561 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
2562 '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
2563 ])
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 372
diff changeset
2564 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
2565 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
2566 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
2567 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
2568 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
2569 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
2570 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
2571 else:
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 372
diff changeset
2572 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
2573
490
10a47656e34f new tests for MaximumStorageMode
Alain Mazy <am@osimis.io>
parents: 488
diff changeset
2574 # 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
2575 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
2576 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
2577 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
2578
f673153f27a4 use of /tools/unknown-sop-class-accepted and /tools/accepted-transfer-syntaxes
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 372
diff changeset
2579 if IsOrthancVersionAbove(_REMOTE, 1, 9, 0):
374
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 373
diff changeset
2580 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
2581 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
2582 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
2583 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
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/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
2586
62
f9c4ce95756f removal of useless information
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 61
diff changeset
2587 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
2588 storescu('Knix/Loc/IM-0001-0001.dcm', False)
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2589 storescu('UnknownSopClassUid.dcm', True)
967d44407308 test UnknownSopClassAccepted option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 60
diff changeset
2590 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2591
463
29aaa3df718f added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents: 457
diff changeset
2592 # set back normal verbosity
29aaa3df718f added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents: 457
diff changeset
2593 DoPut(_REMOTE, '/tools/log-level', 'default')
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2594
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2595 def test_storescu_jpeg(self):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2596 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2597
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2598 knixStudy = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0'
64
369e439cdfd6 test access header
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 63
diff changeset
2599 i = UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm')['ID']
369e439cdfd6 test access header
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 63
diff changeset
2600
369e439cdfd6 test access header
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 63
diff changeset
2601 # This is JPEG lossless
136
5634ef96fcc5 testing "short" option
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 133
diff changeset
2602 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
2603 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
2604 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
2605
21
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2606 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0002.dcm')
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2607 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0003.dcm')
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2608
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2609 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
2610 b = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID']
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2611 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2612 DoPost(_REMOTE, '/modalities/orthanctest/store', [ knixStudy, a, b ])
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2613 self.assertEqual(5, len(DoGet(_LOCAL, '/instances')))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2614
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2615 self.assertEqual(3, len(DoGet(_REMOTE, '/exports')['Exports']))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2616
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2617 DropOrthanc(_REMOTE)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2618 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2619
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2620
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2621 def test_pixel_data(self):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2622 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
2623 color = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID']
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2624 phenix = UploadInstance(_REMOTE, 'Phenix/IM-0001-0001.dcm')['ID']
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2625
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2626 phenixSize = 358 * 512 * 2
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2627 colorSize = 1000 * 1000 * 3
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2628 jpegSize = 51918
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 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
2631 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
2632 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
2633
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2634 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
2635 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
2636
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2637 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
2638 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
2639
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2640
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2641 def test_decode_brainix(self):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2642 brainix = [
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2643 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID'], # (*)
384
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 383
diff changeset
2644 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
2645 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
2646 ]
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2647 h = '6fb11b932d535c2be04beabd99793ff8'
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2648 maxValue = 426.0
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 truth = Image.open(GetDatabasePath('Formats/Brainix.png'))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2651 for i in brainix:
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2652 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % i)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2653 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % i)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2654
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2655 truth2 = map(lambda x: min(255, x), truth.getdata())
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2656 for i in brainix:
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2657 self.AssertSameImages(truth2, '/instances/%s/image-uint8' % i)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2658
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2659 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
2660 for i in brainix:
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2661 self.AssertSameImages(truth2, '/instances/%s/preview' % i)
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 for i in brainix:
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2664 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
2665
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2666
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2667 def test_decode_color(self):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2668 imagej = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID']
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2669 color = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID']
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2670
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2671 for i in [ imagej, color ]:
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2672 for j in [ 'image-uint8', 'image-uint16', 'image-int16' ]:
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2673 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
2674
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2675 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
2676 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
2677
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2678 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
2679 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
2680
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2681
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2682 def test_decode_rf(self):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2683 rf = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2684 truth = Image.open(GetDatabasePath('Formats/KarstenHilbertRF.png'))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2685
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2686 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % rf)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2687 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % rf)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2688 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % rf)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2689 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % rf)
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('42254d70efd2f4a1b8f3455909689f0e', ComputeMD5(DoGet(_REMOTE, '/instances/%s/matlab' % rf)))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2692
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 def test_decode_multiframe(self):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2695 mf = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID']
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2696
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2697 # Test the first frame
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2698 truth = Image.open(GetDatabasePath('Formats/Multiframe0.png'))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2699 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint8' % mf)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2700 self.AssertSameImages(truth.getdata(), '/instances/%s/image-uint16' % mf)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2701 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % mf)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2702 self.AssertSameImages(truth.getdata(), '/instances/%s/preview' % mf)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2703 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
2704
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2705 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
2706
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2707 # Test the last frame
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2708 truth = Image.open(GetDatabasePath('Formats/Multiframe75.png'))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2709 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
2710
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2711
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2712 def test_decode_signed(self):
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2713 signed = UploadInstance(_REMOTE, 'SignedCT.dcm')['ID']
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2714 minValue = -2000
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2715 maxValue = 4042
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2716
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2717 truth = Image.open(GetDatabasePath('Formats/SignedCT.png'))
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2718 self.AssertSameImages(truth.getdata(), '/instances/%s/image-int16' % signed)
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 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
2721 self.AssertSameImages(truth2, '/instances/%s/image-uint16' % signed)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2722
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2723 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
2724 self.AssertSameImages(truth3, '/instances/%s/image-uint8' % signed)
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2725
2a29bcff60a7 tests of image decoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 18
diff changeset
2726 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
2727 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
2728 self.AssertSameImages(tmp, '/instances/%s/preview' % signed)
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 self.assertEqual('b57e6c872a3da50877c7da689b03a444', ComputeMD5(DoGet(_REMOTE, '/instances/%s/matlab' % signed)))
22
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2731
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2732
46
85b2e36ed392 explicit GoogleCode source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 45
diff changeset
2733 def test_googlecode_issue_32(self):
92
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2734 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/default-encoding', 'nope'))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2735 self.assertEqual('Windows1251', DoPut(_REMOTE, '/tools/default-encoding', 'Windows1251'))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2736 self.assertEqual('Windows1251', DoGet(_REMOTE, '/tools/default-encoding'))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2737
22
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2738 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2739 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2740 self.assertEqual(u'Рентгенография', tags['SeriesDescription'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2741 self.assertEqual(u'Таз', tags['BodyPartExamined'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2742 self.assertEqual(u'Прямая', tags['ViewPosition'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2743
92
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2744 # 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
2745 self.assertEqual('Latin1', DoPut(_REMOTE, '/tools/default-encoding', 'Latin1'))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2746
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2747 DoDelete(_REMOTE, '/instances/%s' % f)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2748 f = UploadInstance(_REMOTE, 'Issue32.dcm')['ID']
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2749 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % f)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2750 self.assertNotEqual(u'Рентгенография', tags['SeriesDescription'])
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2751
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
2752
22
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2753 def test_encodings(self):
23
30ecc857fa07 test latin-2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
2754 # Latin-1 (ISO_IR 100)
22
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2755 brainix = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2756 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % brainix)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 21
diff changeset
2757 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
2758
30ecc857fa07 test latin-2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
2759 # Latin-2 (ISO_IR 101)
30ecc857fa07 test latin-2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
2760 a = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID']
30ecc857fa07 test latin-2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
2761 i = DoGet(_REMOTE, '/instances/%s/simplified-tags' % a)
30ecc857fa07 test latin-2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
2762 # 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
2763 self.assertEqual('Imię i Nazwisko osoby opisującej',
30ecc857fa07 test latin-2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
2764 i['ContentSequence'][4]['ConceptNameCodeSequence'][0]['CodeMeaning'].encode('utf-8'))
30ecc857fa07 test latin-2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 22
diff changeset
2765
26
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2766
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2767 def test_storescu_custom_aet(self):
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2768 # 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
2769 # 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
2770 # in the REST API)."
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2771 # 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
2772
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2773 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2774
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2775 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2776 b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2777 c = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0003.dcm')
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2778
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2779 j = DoPost(_REMOTE, '/modalities/orthanctest/store', {
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2780 'LocalAet' : 'YOP',
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2781 'Resources' : [ a['ID'], b['ID'] ]
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2782 })
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2783
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2784 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2785 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
2786
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2787 DropOrthanc(_LOCAL)
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2788 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2789
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2790 j = DoPost(_REMOTE, '/modalities/orthanctest/store', {
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2791 'Resources' : [ c['ID'] ]
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2792 })
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2793
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2794 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2795 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
2796
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2797 DropOrthanc(_REMOTE)
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2798 DropOrthanc(_LOCAL)
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2799
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
2800 InstallLuaScriptFromPath(_REMOTE, 'Lua/AutoroutingChangeAet.lua')
26
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2801 DoPost(_REMOTE, '/tools/execute-script', 'aet = "HELLO"', 'application/lua')
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 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2804 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2805 WaitEmpty(_REMOTE)
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2806 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2807 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
2808
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2809 DoPost(_REMOTE, '/tools/execute-script', 'aet = nill', 'application/lua')
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2810 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2811 WaitEmpty(_REMOTE)
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2812 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
040f6ef1394a test_storescu_custom_aet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 23
diff changeset
2813 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
2814
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
2815 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
2816 # 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
2817 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
2818 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
2819 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
2820 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
2821 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
2822
1047d7bc5210 test limit and since arguments while retrieving DICOM resources in the REST API
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 28
diff changeset
2823 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
2824 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
2825 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
2826 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
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 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
2829 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
2830
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 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
2832 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
2833 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
2834 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
2835 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
2836 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
2837 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
2838 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
2839 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
2840 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
2841 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
2842 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
2843 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
2844 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
2845 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
2846
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 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
2848 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
2849 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
2850 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
2851 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
2852 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
2853 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
2854
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 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
2856 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
2857 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
2858
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 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
2860 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
2861 self.assertTrue(instance in s)
36
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2862
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2863
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2864 def test_create_pdf(self):
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2865 # Upload 4 instances
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2866 brainixInstance = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2867 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2868 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2869 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2870
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2871 brainixPatient = '16738bc3-e47ed42a-43ce044c-a3414a45-cb069bd0'
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2872 brainixStudy = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988'
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2873 brainixEpi = '2ac1316d-3e432022-62eabff2-c59f5475-9b1ac3f8'
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2874
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2875 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f:
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2876 pdf = f.read()
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2877
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2878 i = DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2879 json.dumps({
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2880 'Tags' : {
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2881 'PatientName' : 'Jodogne',
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2882 'Modality' : 'CT',
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 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2885 }))
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2886
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2887 self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip())
565
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
2888 self.assertEqual('1.2.840.10008.5.1.4.1.1.104.1', DoGet(_REMOTE, '/instances/%s/content/SOPClassUID' % i['ID']).strip('\x00'))
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
2889 self.assertEqual('WSD', DoGet(_REMOTE, '/instances/%s/content/ConversionType' % i['ID']).strip())
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
2890 self.assertEqual('application/pdf', DoGet(_REMOTE, '/instances/%s/content/MIMETypeOfEncapsulatedDocument' % i['ID']).strip())
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
2891
446
9184e6cb215a allow custom value for "Modality" in /tools/create-dicom for PDF
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 445
diff changeset
2892 # 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
2893 # 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
2894 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
2895
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2896 b = DoGet(_REMOTE, '/instances/%s/content/0042-0011' % i['ID'])
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2897 self.assertEqual(len(b), len(pdf) + 1)
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2898 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf + '\0'))
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.assertRaises(Exception, lambda: DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2901 json.dumps({
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2902 'Parent' : brainixPatient,
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2903 'Tags' : {
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2904 'PatientName' : 'Jodogne',
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2905 }
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2906 })))
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2907
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2908 i = DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2909 json.dumps({
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2910 'Parent' : brainixPatient,
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2911 'Tags' : { 'StudyDescription' : 'PDF^Patient' },
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2912 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2913 }))
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 self.assertEqual(brainixPatient, DoGet(_REMOTE, '/instances/%s/patient' % i['ID'])['ID'])
565
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
2916 self.assertEqual('1.2.840.10008.5.1.4.1.1.104.1', DoGet(_REMOTE, '/instances/%s/content/SOPClassUID' % i['ID']).strip('\x00'))
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
2917 self.assertEqual('OT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip('\x00'))
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
2918 self.assertEqual('WSD', DoGet(_REMOTE, '/instances/%s/content/ConversionType' % i['ID']).strip())
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
2919 self.assertEqual('application/pdf', DoGet(_REMOTE, '/instances/%s/content/MIMETypeOfEncapsulatedDocument' % i['ID']).strip())
36
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2920
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2921 i = DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2922 json.dumps({
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2923 'Parent' : brainixStudy,
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2924 'Tags' : { 'SeriesDescription' : 'PDF^Study' },
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2925 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2926 }))
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2927
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2928 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
2929
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2930 i = DoPost(_REMOTE, '/tools/create-dicom',
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2931 json.dumps({
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2932 'Parent' : brainixEpi,
37
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 36
diff changeset
2933 'Tags' : { 'SpecificCharacterSet' : 'ISO_IR 13' },
36
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2934 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2935 }))
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2936
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2937 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
2938
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2939 b = DoGet(_REMOTE, '/instances/%s/pdf' % i['ID'])
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2940 self.assertEqual(len(b), len(pdf))
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2941 self.assertEqual(ComputeMD5(b), ComputeMD5(pdf))
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2942
42ad759ef40a test PDF embedding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 34
diff changeset
2943 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
2944
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2945
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2946 def test_create_series(self):
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2947 i = DoPost(_REMOTE, '/tools/create-dicom',
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2948 json.dumps({
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2949 'Tags' : {
40
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2950 'SpecificCharacterSet' : 'ISO_IR 100',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2951 'PatientName' : 'Sébastien Jodogne',
38
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2952 'Modality' : 'CT',
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2953 },
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2954 'Content' : [
40
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2955 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2956 'Content': 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==', # red dot in RGBA
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2957 'Tags' : { 'ImageComments' : 'Tutu' }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2958 },
38
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2959 '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
2960 ]
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2961 }))
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2962
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2963 s = DoGet(_REMOTE, i['Path'])
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2964 self.assertEqual('Series', s['Type'])
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2965 self.assertEqual(s['ID'], i['ID'])
d147e36c6d18 test_create_series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 37
diff changeset
2966 self.assertEqual(2, len(s['Instances']))
39
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 38
diff changeset
2967 self.assertEqual(2, s['ExpectedNumberOfInstances'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 38
diff changeset
2968 self.assertEqual('Complete', s['Status'])
40
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2969
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2970 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2971 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % s['Instances'][1])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2972 self.assertTrue('ImageComments' in a or 'ImageComments' in b)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2973 if 'ImageComments' in a:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2974 self.assertEqual('Tutu', a['ImageComments'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2975 else:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2976 self.assertEqual('Tutu', b['ImageComments'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2977
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2978 patient = DoGet(_REMOTE, '/instances/%s/patient' % s['Instances'][0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2979 self.assertEqual(patient['MainDicomTags']['PatientName'].encode('utf-8'),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 39
diff changeset
2980 'Sébastien Jodogne')
47
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2981
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2982
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2983 def test_create_binary(self):
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2984 binary = ''.join(map(chr, range(256)))
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2985 encoded = 'data:application/octet-stream;base64,' + base64.b64encode(binary)
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2986 tags = {
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2987 'PatientName' : 'Jodogne',
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2988 '8899-8899' : encoded
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2989 }
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2990
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2991 i = DoPost(_REMOTE, '/tools/create-dicom',
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2992 json.dumps({
266
b105bb2233c6 fix issue 140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 265
diff changeset
2993 'Tags' : tags,
b105bb2233c6 fix issue 140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 265
diff changeset
2994 'PrivateCreator' : 'TestBinary',
47
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
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
2997 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
2998 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
2999
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
3000 i = DoPost(_REMOTE, '/tools/create-dicom',
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
3001 json.dumps({
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
3002 'InterpretBinaryTags' : False,
266
b105bb2233c6 fix issue 140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 265
diff changeset
3003 'Tags' : tags,
b105bb2233c6 fix issue 140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 265
diff changeset
3004 'PrivateCreator' : 'TestBinary',
47
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
3005 }))
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
3006
f610491f74c3 test_create_binary
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 46
diff changeset
3007 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
3008 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
3009
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3010
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3011 def test_patient_ids_collision(self):
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3012 # 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
3013 # same PatientID
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3014 for i in range(3):
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3015 UploadInstance(_REMOTE, 'PatientIdsCollision/Image%d.dcm' % (i + 1))
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3016
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3017 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3018 'Query' : { 'PatientName' : '*' }})
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3019 self.assertEqual(1, len(a))
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3020 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
3021
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3022 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3023 'CaseSensitive' : True,
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3024 'Query' : { 'PatientName' : 'FOO\\HELLO' }})
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3025 self.assertEqual(2, len(a))
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' : 'Series',
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3028 'CaseSensitive' : False,
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3029 'Query' : { 'PatientName' : 'Foo' }})
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3030 self.assertEqual(1, len(a))
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3031 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
3032 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
3033 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
3034
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3035 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3036 'Query' : { 'PatientName' : '*' }})
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3037 self.assertEqual(3, len(a))
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3038 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
3039 self.assertTrue('FOO^SERIES' in d)
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3040 self.assertTrue('HELLO^SERIES' in d)
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3041 self.assertTrue('WORLD^SERIES' in d)
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3042
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) ['PatientMainDicomTags']['PatientID'], a)
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3044 self.assertEqual(1, len(set(d)))
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3045 self.assertEqual('COMMON', d[0])
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3046
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3047 for i in a:
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3048 d = DoGet(_REMOTE, '/studies/%s' % i) ['MainDicomTags']['StudyDescription']
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3049 p = DoGet(_REMOTE, '/studies/%s' % i) ['PatientMainDicomTags']['PatientName']
e4352463ff74 test_patient_ids_collision
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 47
diff changeset
3050 self.assertEqual('%s^SERIES' % p, d)
49
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3051
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3052
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3053 def test_bitbucket_issue_4(self):
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3054 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3055 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3056 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm')
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3057 UploadInstance(_REMOTE, 'Formats/Jpeg.dcm')
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3058 UploadInstance(_REMOTE, 'Formats/JpegLossless.dcm')
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3059 UploadInstance(_REMOTE, 'Formats/Rle.dcm')
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3060
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3061 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3062 self.assertEqual(6, len(DoGet(_REMOTE, '/instances')))
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3063
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3064 p = DoGet(_REMOTE, '/patients')
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3065 self.assertEqual(2, len(p))
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3066 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
3067 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
3068 self.assertEqual(3, len(i1))
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3069 self.assertEqual(3, len(i2))
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3070
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3071 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
3072
e7f9b8199545 test_bitbucket_issue_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 48
diff changeset
3073 self.assertEqual(6, len(DoGet(_LOCAL, '/instances')))
50
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
3074
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
3075
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
3076 def test_create_sequence(self):
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
3077 i = DoPost(_REMOTE, '/tools/create-dicom',
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
3078 json.dumps({
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
3079 'Tags' : {
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
3080 'SpecificCharacterSet': 'ISO_IR 100', # Encode using Latin1
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
3081 'PatientName': 'Jodogne^',
51
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3082 'ReferencedStudySequence': GenerateTestSequence(),
50
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
3083 }
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
3084 }))['ID']
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
3085
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
3086 self.assertEqual('Jodogne^', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i))
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
3087 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
3088 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
3089 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
3090 self.assertEqual(u'Sébastien^'.encode('latin-1'),
8de63d56cf11 test_create_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 49
diff changeset
3091 DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence/1/StudyDescription' % i))
51
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3092
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3093
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3094 def test_modify_sequence(self):
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3095 i = UploadInstance(_REMOTE, 'PrivateTags.dcm')['ID']
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3096 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
3097
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3098 j = DoPost(_REMOTE, '/instances/%s/modify' % i,
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3099 json.dumps({
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3100 "Replace" : {
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3101 "PatientName" : "hello",
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3102 'ReferencedStudySequence': GenerateTestSequence(),
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3103 },
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3104 }),
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3105 'application/json')
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3106 j = DoPost(_REMOTE, '/instances', j, 'application/dicom')['ID']
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3107 DoDelete(_REMOTE, '/instances/%s' % i)
264a20a0276d test_modify_sequence
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 50
diff changeset
3108
52
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
3109 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/content/ReferencedStudySequence' % j)))
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
3110
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
3111
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
3112 def test_compression(self):
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
3113 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
3114
380
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3115 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
3116 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
3117 # 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
3118 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
3119 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
3120 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3121 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
3122 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
3123 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
3124
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3125 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
3126
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3127 # 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
3128 # 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
3129 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
3130 DoPost(_REMOTE, '/instances/%s/attachments/dicom/uncompress' % i)
52
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
3131
380
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3132 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
3133 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
3134 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
3135 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
3136 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
3137 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
3138 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
3139
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3140 ops = DoGet(_REMOTE, '/instances/%s/attachments/dicom' % i)
52
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
3141 self.assertTrue('compress' in ops)
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
3142 self.assertTrue('uncompress' in ops)
7c08e542db23 test_compression
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
3143 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
3144 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
3145 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
3146
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3147 # Re-compress the attachment
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3148 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
3149 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
3150 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
3151 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
3152 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
3153 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
3154 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
3155 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
3156 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
3157 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
3158
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3159 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
3160 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
3161 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
3162 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
3163 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
3164 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
3165 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
3166 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
3167 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
3168 self.assertEqual(us, int(DoGet(_REMOTE, '/statistics')['TotalUncompressedSize']))
53
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3169
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3170
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3171 def test_ordered_slices(self):
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3172 i = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3173 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3174 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s)
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3175 self.assertEqual('Sequence', o['Type'])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3176 self.assertEqual(1, len(o['Dicom']))
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3177 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
3178 self.assertEqual(76, len(o['Slices']))
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3179 for j in range(76):
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3180 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
3181
68
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3182 self.assertEqual(1, len(o['SlicesShort']))
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3183 self.assertEqual('9e05eb0a-18b6268c-e0d36085-8ddab517-3b5aec02', o['SlicesShort'][0][0])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3184 self.assertEqual(0, o['SlicesShort'][0][1])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3185 self.assertEqual(76, o['SlicesShort'][0][2])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3186
53
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3187 i = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3188 j = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')['ID']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3189 k = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0003.dcm')['ID']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3190 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3191 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s)
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3192
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3193 self.assertEqual('Volume', o['Type'])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3194 self.assertEqual(3, len(o['Dicom']))
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3195 self.assertEqual(3, len(o['Slices']))
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3196 self.assertEqual('/instances/%s/file' % i, o['Dicom'][2])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3197 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3198 self.assertEqual('/instances/%s/file' % k, o['Dicom'][0])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3199 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][2])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3200 self.assertEqual('/instances/%s/frames/0' % j, o['Slices'][1])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3201 self.assertEqual('/instances/%s/frames/0' % k, o['Slices'][0])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3202
68
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3203 self.assertEqual(3, len(o['SlicesShort']))
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3204 self.assertEqual(k, o['SlicesShort'][0][0])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3205 self.assertEqual(0, o['SlicesShort'][0][1])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3206 self.assertEqual(1, o['SlicesShort'][0][2])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3207 self.assertEqual(j, o['SlicesShort'][1][0])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3208 self.assertEqual(0, o['SlicesShort'][1][1])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3209 self.assertEqual(1, o['SlicesShort'][1][2])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3210 self.assertEqual(i, o['SlicesShort'][2][0])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3211 self.assertEqual(0, o['SlicesShort'][2][1])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3212 self.assertEqual(1, o['SlicesShort'][2][2])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3213
53
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3214 i = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3215 j = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0002.dcm')['ID']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3216 s = DoGet(_REMOTE, '/instances/%s' % i)['ParentSeries']
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3217 o = DoGet(_REMOTE, '/series/%s/ordered-slices' % s)
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3218
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3219 self.assertEqual('Sequence', o['Type'])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3220 self.assertEqual(2, len(o['Dicom']))
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3221 self.assertEqual(2, len(o['Slices']))
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3222 self.assertEqual('/instances/%s/file' % i, o['Dicom'][0])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3223 self.assertEqual('/instances/%s/file' % j, o['Dicom'][1])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3224 self.assertEqual('/instances/%s/frames/0' % i, o['Slices'][0])
e0d1ee04119f test_ordered_slices
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 52
diff changeset
3225 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
3226
68
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3227 self.assertEqual(2, len(o['SlicesShort']))
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3228 self.assertEqual(i, o['SlicesShort'][0][0])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3229 self.assertEqual(0, o['SlicesShort'][0][1])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3230 self.assertEqual(1, o['SlicesShort'][0][2])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3231 self.assertEqual(j, o['SlicesShort'][1][0])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3232 self.assertEqual(0, o['SlicesShort'][1][1])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3233 self.assertEqual(1, o['SlicesShort'][1][2])
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3234
a8d1a347a701 SlicesShort
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
3235
54
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
3236
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
3237 def test_incoming_movescu_accession(self):
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
3238 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
3239
137
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
3240 # No matching patient, so no job is created
54
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
3241 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
3242 CallMoveScu([ '--study', '-k', '0008,0052=STUDY', '-k', 'AccessionNumber=nope' ])
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
3243 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
3244 CallMoveScu([ '--study', '-k', '0008,0052=PATIENT', '-k', 'AccessionNumber=A10003245599' ])
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
3245 self.assertEqual(0, len(DoGet(_LOCAL, '/patients')))
137
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
3246
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
3247 # 1 Matching patient, track the job
138
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
3248 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
3249 '--study',
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
3250 '-k', '0008,0052=STUDY',
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
3251 '-k', 'AccessionNumber=A10003245599'
0682740fcfcb cleanup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 137
diff changeset
3252 ])))
137
412d5f70447e testing asynchronous c-move
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 136
diff changeset
3253
54
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
3254 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
c5f8a6b0d85e test_incoming_movescu_accession
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 53
diff changeset
3255
55
a395fd51cc4f test_dicom_to_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 54
diff changeset
3256
a395fd51cc4f test_dicom_to_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 54
diff changeset
3257 def test_dicom_to_json(self):
a395fd51cc4f test_dicom_to_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 54
diff changeset
3258 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
3259 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
3260
cd3c7f70f139 test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 59
diff changeset
3261 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
3262 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
3263 self.assertTrue(CompareTags(t, json.loads(f.read()), [
123
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
3264 # Tags for compatibility with DCMTK 3.6.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
3265 'RETIRED_OtherPatientIDs',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
3266 'OtherPatientIDs',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
3267 'ACR_NEMA_2C_VariablePixelDataGroupLength',
80
8466dbfcb22b fix test against dcmtk 3.6.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
3268 ]))
55
a395fd51cc4f test_dicom_to_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 54
diff changeset
3269
a395fd51cc4f test_dicom_to_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 54
diff changeset
3270 t = DoGet(_REMOTE, '/instances/%s/tags' % i)
a395fd51cc4f test_dicom_to_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 54
diff changeset
3271 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
3272 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
3273 ]))
55
a395fd51cc4f test_dicom_to_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 54
diff changeset
3274
60
cd3c7f70f139 test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 59
diff changeset
3275 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
3276 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
3277 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
3278 ]))
60
cd3c7f70f139 test backward compatibility with Orthanc 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 59
diff changeset
3279
372
e9b03d8f3b78 fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 369
diff changeset
3280
e9b03d8f3b78 fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 369
diff changeset
3281 # 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
3282 # following command:
e9b03d8f3b78 fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 369
diff changeset
3283 # $ 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
3284 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
3285 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
3286 a = json.loads(f.read())
378
a4b8450a1158 fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 377
diff changeset
3287
a4b8450a1158 fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 377
diff changeset
3288 # 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
3289 # 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
3290 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
3291 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
3292 self.assertFalse('7fe1,1001' in t)
378
a4b8450a1158 fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 377
diff changeset
3293 del a['7fe1,0010']
a4b8450a1158 fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 377
diff changeset
3294 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
3295 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3296 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
3297 self.assertTrue('7fe1,1001' in t)
378
a4b8450a1158 fix test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 377
diff changeset
3298
65
09fc27e0899a patch for testing windows builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
3299 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
3300 tt = (json.dumps(t)
e9b03d8f3b78 fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 369
diff changeset
3301 .replace('2e+022', '2e+22')
e9b03d8f3b78 fix for DCMTK 3.6.6
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 369
diff changeset
3302 # 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
3303 .replace('IllegalPrivatePixelSequence', 'Unknown Tag & Data'))
65
09fc27e0899a patch for testing windows builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 64
diff changeset
3304 self.assertEqual(aa, tt)
57
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3305
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3306
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3307 def test_batch_archive(self):
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3308 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3309 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3310 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3311 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0002.dcm')
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3312 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3313 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0002.dcm')
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3314 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3315 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm')
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3316
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3317 s = DoPost(_REMOTE, '/tools/create-archive', [ ])
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3318 z = zipfile.ZipFile(StringIO(s), "r")
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3319 self.assertEqual(0, len(z.namelist()))
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3320
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3321 # One patient
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3322 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
3323 z = zipfile.ZipFile(StringIO(s), "r")
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3324 self.assertEqual(4, 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 + twice its study + one series from other patient
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3327 s = DoPost(_REMOTE, '/tools/create-archive', [
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3328 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17',
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3329 '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918',
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3330 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0'
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3331 ])
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3332 z = zipfile.ZipFile(StringIO(s), "r")
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3333 self.assertEqual(6, len(z.namelist()))
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3334
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3335 # One patient + one series + one instance
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3336 s = DoPost(_REMOTE, '/tools/create-archive', [
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3337 'ca29faea-b6a0e17f-067743a1-8b778011-a48b2a17',
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3338 '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0',
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3339 '1d429ccb-bdcc78a1-7d129d6a-ba4966ed-fe4dbd87'
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3340 ])
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3341 z = zipfile.ZipFile(StringIO(s), "r")
784a544706cf test_batch_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 56
diff changeset
3342 self.assertEqual(7, len(z.namelist()))
59
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3343
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3344
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3345 def test_decode_brainix_as_jpeg(self):
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3346 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
3347
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3348 j = GetImage(_REMOTE, '/instances/%s/preview' % i)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3349 self.assertEqual('PNG', j.format)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3350 self.assertEqual(j.size[0], 256)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3351 self.assertEqual(j.size[1], 256)
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, headers = { 'Accept' : '*/*' })
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
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3356 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
3357 self.assertEqual('PNG', j.format)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3358
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3359 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
3360 self.assertEqual('PNG', j.format)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3361
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3362 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
3363 self.assertEqual('JPEG', j.format)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3364 self.assertEqual(j.size[0], 256)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3365 self.assertEqual(j.size[1], 256)
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 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
3368 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
3369 self.assertLess(a, b)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3370
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3371 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
3372 self.assertEqual('JPEG', j.format)
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3373
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3374 # 16bit encoding is not supported with JPEG
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3375 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
3376 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
3377
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3378 # No matching content type
84378ada15ab test_decode_brainix_as_jpeg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 58
diff changeset
3379 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
3380
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3381
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3382
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3383 def test_media_encodings(self):
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3384 ascii = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID']
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3385 latin1 = UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')['ID']
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3386 latin2 = UploadInstance(_REMOTE, 'MarekLatin2.dcm')['ID']
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 tmp = DoPost(_REMOTE, '/tools/create-media', [ascii,latin1,latin2])
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3389 z = zipfile.ZipFile(StringIO(tmp), "r")
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3390
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3391 self.assertEqual(4, len(z.namelist()))
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3392 self.assertTrue('IMAGES/IM0' in z.namelist())
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3393 self.assertTrue('IMAGES/IM1' in z.namelist())
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3394 self.assertTrue('IMAGES/IM2' in z.namelist())
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3395 self.assertTrue('DICOMDIR' in z.namelist())
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3396
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3397 try:
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3398 os.remove('/tmp/DICOMDIR')
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3399 except:
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3400 # The file does not exist
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3401 pass
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3402
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3403 z.extract('DICOMDIR', '/tmp')
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3404 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ],
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3405 stderr = subprocess.STDOUT).split('\n')
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3406
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3407 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ],
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3408 stderr = subprocess.STDOUT).split('\n')
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3409 self.assertEqual(1, len(a))
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3410 self.assertEqual('', a[0])
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('dcm2xml'), '/tmp/DICOMDIR' ])
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3413 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
3414 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
3415 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
3416
83fd88230097 test_media_encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 68
diff changeset
3417 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
3418
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
3419
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
3420 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
3421 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
3422 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
3423 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
3424
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
3425 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
3426 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
3427 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
3428 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
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', 'NumberOfPatientRelatedSeries' ])
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,1202\).*?\[(.*?)\]', 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('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
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', 'NumberOfPatientRelatedInstances' ])
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,1204\).*?\[(.*?)\]', 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('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
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=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
3441 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
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('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
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', 'NumberOfStudyRelatedInstances' ])
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,1208\).*?\[(.*?)\]', 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('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
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=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
3451 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
3452 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
3453 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
3454 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
3455
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
3456 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
3457 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
3458 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
3459 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
3460 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
3461 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
3462
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
3463 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
3464 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
3465 self.assertEqual(1, len(s))
176
48cc188ffb09 strip trailing 0 char that appears with some findscu versions
am@osimis.io
parents: 175
diff changeset
3466 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
3467 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
3468 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
3469
48740070cbf1 TDD: tests for ongoing development of counter tags in C-Find
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 70
diff changeset
3470
78
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3471 def test_decode_transfer_syntax(self):
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3472 def Check(t, md5):
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3473 i = UploadInstance(_REMOTE, 'TransferSyntaxes/%s.dcm' % t)['ID']
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3474
89
74b7b9aed5f8 test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
3475 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
3476 transferSyntax = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i)
74b7b9aed5f8 test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
3477 self.assertEqual(t, transferSyntax)
74b7b9aed5f8 test TransferSyntax metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 87
diff changeset
3478
78
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3479 if md5 == None:
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3480 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
3481 else:
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3482 m = ComputeMD5(DoGet(_REMOTE, '/instances/%s/preview' % i))
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3483 self.assertEqual(m, md5)
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3484
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3485 Check('1.2.840.10008.1.2.1', 'fae08d5415c4c0cd2cdbae4522408631')
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3486 Check('1.2.840.10008.1.2.2', 'f3d9784768b8feb54d6a50b6d5c37682')
b89af51797ff test_decode_transfer_syntax
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
3487 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
3488 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
3489 Check('1.2.840.10008.1.2.4.70', '7132cfbc457305b04b59787030c785d2')
384
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 383
diff changeset
3490 Check('1.2.840.10008.1.2.5', '6ff51ae525d362e0d04f550a64075a0e') # RLE, supported since Orthanc 1.0.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 383
diff changeset
3491 Check('1.2.840.10008.1.2', 'd54aed9f67a100984b42942cc2e9939b')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 383
diff changeset
3492
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 383
diff changeset
3493 # The 3 checks below don't work on big-endian
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 383
diff changeset
3494 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
3495 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
3496 Check('1.2.840.10008.1.2.4.81', '801579ae7cbf28e604ea74f2c99fa2ca')
299
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
3497
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
3498 # JPEG2k image, not supported without GDCM plugin
304
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 302
diff changeset
3499 if not HasGdcmPlugin(_REMOTE):
299
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
3500 Check('1.2.840.10008.1.2.4.90', None)
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
3501 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
3502
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3503
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3504 def test_raw_frame(self):
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3505 s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID']
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3506 self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s)))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3507 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3508 self.assertEqual(512 * 512 * 2, len(a))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3509 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
3510 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
3511 self.assertEqual('1914287dc4d958eca21fdaacfb3482fa', ComputeMD5(a))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3512
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3513 s = UploadInstance(_REMOTE, 'Multiframe.dcm')['ID']
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3514 self.assertEqual(76, len(DoGet(_REMOTE, '/instances/%s/frames' % s)))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3515 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
3516 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
3517 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
3518 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3519 self.assertEqual("L", im.mode)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3520 self.assertEqual(512, im.size[0])
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3521 self.assertEqual(512, im.size[1])
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3522
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3523 # 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
3524 s = UploadInstance(_REMOTE, 'LenaTwiceWithFragments.dcm')['ID']
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3525 self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/frames' % s)))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3526 a = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % s)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3527 b = DoGet(_REMOTE, '/instances/%s/frames/1/raw' % s)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3528 self.assertEqual(69214, len(a))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3529 self.assertEqual(ComputeMD5(a), ComputeMD5(b))
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3530 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
3531 im = GetImage(_REMOTE, '/instances/%s/frames/0/raw' % s)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3532 self.assertEqual("RGB", im.mode)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3533 self.assertEqual(512, im.size[0])
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3534 self.assertEqual(512, im.size[1])
323
fbf5bdebbba7 comment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 322
diff changeset
3535 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
3536 self.assertEqual("RGB", im.mode)
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3537 self.assertEqual(512, im.size[0])
962274ebd797 test_raw_frame
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
3538 self.assertEqual(512, im.size[1])
81
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3539
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3540
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3541
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3542 def test_rest_movescu(self):
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3543 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
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 # Upload 4 instances
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3546 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3547 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm')
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3548 UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-0001.dcm')
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3549 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3550
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3551 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3552 for p in DoGet(_REMOTE, '/patients'):
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3553 DoPost(_REMOTE, '/modalities/orthanctest/store', p)
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3554 DoDelete(_REMOTE, '/patients/%s' % p)
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(0, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3557
482
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3558 # Move instance Brainix/Flair/IM-0001-0001.dcm
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3559 DoPost(_REMOTE, '/modalities/orthanctest/move', {
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3560 'Level' : 'Instance',
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3561 'Resources' : [
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3562 {
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3563 '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
3564 '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
3565 '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
3566 }
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
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3569 # Move series Brainix/Flair/*
81
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3570 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3571 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3572 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3573 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3574
482
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3575 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1):
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3576 # Reset and test asynchronous C-Move at instance level
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3577 for p in DoGet(_REMOTE, '/patients'):
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3578 DoDelete(_REMOTE, '/patients/%s' % p)
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3579
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3580 DoPost(_REMOTE, '/modalities/orthanctest/move', {
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3581 'Level' : 'Instance',
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3582 'Resources' : [
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3583 {
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3584 '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
3585 '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
3586 '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
3587 }
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 'Asynchronous': True
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3590 })
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3591
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3592 job = MonitorJob2(_REMOTE, lambda: DoPost
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3593 (_REMOTE, '/modalities/orthanctest/move', {
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3594 'Level' : 'Instance',
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3595 'Resources' : [
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 '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
3598 '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
3599 '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
3600 }
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 'Asynchronous': True
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3603 }))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3604
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3605 self.assertNotEqual(None, job)
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 # check the job was successfull
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3608 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3609 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3610 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3611 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3612
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3613 # check the job content
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3614 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content']
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3615 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
3616 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
3617 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
3618
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3619 # Reset and test synchronous C-Move at series level
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3620 for p in DoGet(_REMOTE, '/patients'):
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3621 DoDelete(_REMOTE, '/patients/%s' % p)
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3622
81
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3623 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3624 'Resources' : [
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3625 {
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3626 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3627 '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
3628 }
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3629 ]})
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3630 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3631 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3632 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3633 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3634
482
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3635 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1):
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3636 # 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
3637 for p in DoGet(_REMOTE, '/patients'):
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3638 DoDelete(_REMOTE, '/patients/%s' % p)
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3639
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3640 job = MonitorJob2(_REMOTE, lambda: DoPost
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3641 (_REMOTE, '/modalities/orthanctest/move', {
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3642 'Level' : 'Series',
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3643 'Resources' : [
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 'PatientID' : '5Yp0E',
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3646 '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
3647 '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
3648 }
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 'Asynchronous': True
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3651 }))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3652
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3653 self.assertNotEqual(None, job)
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 # check the job was successfull
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3656 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3657 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3658 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3659 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3660
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3661 # check the job content
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3662 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content']
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3663 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
3664 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
3665 self.assertEqual('5Yp0E', jobContent['Query'][0]['0010,0020'])
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3666
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3667 # Move series Brainix/Epi/*
81
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3668 DoPost(_REMOTE, '/modalities/orthanctest/move', { 'Level' : 'Series',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3669 'Resources' : [
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3670 {
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3671 'StudyInstanceUID' : '2.16.840.1.113669.632.20.1211.10000357775',
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3672 '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
3673 }
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3674 ]})
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3675 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3676 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3677 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3678 self.assertEqual(3, len(DoGet(_REMOTE, '/instances')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3679
482
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3680 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1):
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3681 # Move study Knee asynchronously
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3682 job = MonitorJob2(_REMOTE, lambda: DoPost
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3683 (_REMOTE, '/modalities/orthanctest/move', {
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3684 'Level' : 'Study',
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3685 'Resources' : [
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3686 {
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3687 '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
3688 }
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3689 ],
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3690 'Asynchronous': True
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
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3693 self.assertNotEqual(None, job)
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 # check the job was successfull
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3696 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3697 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3698 self.assertEqual(3, len(DoGet(_REMOTE, '/series')))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3699 self.assertEqual(4, len(DoGet(_REMOTE, '/instances')))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3700
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3701 # check the job content
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3702 jobContent = DoGet(_REMOTE, '/jobs/%s' % job)['Content']
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3703 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
3704
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3705 # Reset
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3706 for p in DoGet(_REMOTE, '/patients'):
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3707 DoDelete(_REMOTE, '/patients/%s' % p)
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3708
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3709 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3710
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3711
482
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3712 if IsOrthancVersionAbove(_REMOTE, 1, 11, 1):
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3713 # Move all at once asynchronously at PatientLevel
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3714 job = MonitorJob2(_REMOTE, lambda: DoPost(_REMOTE, '/modalities/orthanctest/move',
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3715 {
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3716 'Level' : 'Patient',
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3717 'Resources' : [
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3718 {
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3719 'PatientID' : '5Yp0E',
81
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3720 },
482
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3721 {
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3722 'PatientID': '887',
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3723 'PatientName' : 'KNEE',
81
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3724 }
482
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3725 ],
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3726 'Synchronous': False
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3727 }))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3728
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3729 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3730 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3731 self.assertEqual(3, len(DoGet(_REMOTE, '/series')))
535e651e70a2 added test for asynchronous cmove
Alain Mazy <am@osimis.io>
parents: 473
diff changeset
3732 self.assertEqual(4, len(DoGet(_REMOTE, '/instances')))
81
5920954287dd test_rest_movescu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 80
diff changeset
3733
86
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3734
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3735
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3736 def test_reconstruct_json(self):
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3737 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3738
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3739 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3740 first = DoGet(_REMOTE, '/instances/%s/tags' % instance)
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3741
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3742 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
3743
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3744 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
3745 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
3746 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3747 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
3748
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3749 # Cannot delete the "DICOM" attachment
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3750 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
3751
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3752 # Can delete the "DICOM as JSON" attachment
392
5cbcb4a83b41 fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 391
diff changeset
3753 if not IsOrthancVersionAbove(_REMOTE, 1, 9, 1):
5cbcb4a83b41 fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 391
diff changeset
3754 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
3755 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
3756
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3757 # Only the "DICOM" attachment subsists
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3758 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance)))
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3759
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3760 # Cannot manually reconstruct the "DICOM as JSON" attachment
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3761 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
3762
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3763 # Transparently reconstruct the "DICOM as JSON" attachment
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3764 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
3765 second = DoGet(_REMOTE, '/instances/%s/tags' % instance)
0401ef51f5c1 test_reconstruct_json
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 83
diff changeset
3766 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
3767
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3768 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
3769 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
3770 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3771 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
3772 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
3773 self.assertEqual(str(first), str(third))
87
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3774
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3775
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3776 def test_reconstruct_json2(self):
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3777 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3778
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3779 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
3780 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
3781
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3782 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
3783 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
3784
380
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3785 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
3786 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
3787
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3788 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
3789 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
3790 self.assertEqual(aa, bb)
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3791 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
3792 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
3793 elif IsDicomUntilPixelDataStored(_REMOTE):
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-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
3798 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3799 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
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
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3803 # 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
3804 DoPost(_REMOTE, '/tools/invalidate-tags', '', 'text/plain')
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3805
380
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3806 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
3807 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
3808 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
3809 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3810 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
3811 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
3812
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3813 # 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
3814 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
3815 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
3816
380
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3817 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
3818 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
3819 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
3820 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
3821 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
3822 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
3823
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3824
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3825 def test_private_tags(self):
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3826 i = UploadInstance(_REMOTE, 'PrivateMDNTags.dcm')['ID']
4b24faec842b test_reconstruct_json2 + test_private_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 86
diff changeset
3827 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
3828 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
3829 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
3830
92
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3831
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3832 def test_findscu_encoding(self):
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3833 # Check out ../Database/Encodings/Generate.sh
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3834 TEST = u'Test-éüäöòДΘĝדصķћ๛ネİ'
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3835 ENCODINGS = {
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3836 'Arabic' : [ 'ISO_IR 127' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3837 'Ascii' : [ 'ISO_IR 6' ], # More accurately, ISO 646
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3838 'Cyrillic' : [ 'ISO_IR 144' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3839 'Greek' : [ 'ISO_IR 126' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3840 'Hebrew' : [ 'ISO_IR 138' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3841 'Japanese' : [ 'ISO_IR 13', 'shift-jis' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3842 'Latin1' : [ 'ISO_IR 100' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3843 'Latin2' : [ 'ISO_IR 101' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3844 'Latin3' : [ 'ISO_IR 109' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3845 'Latin4' : [ 'ISO_IR 110' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3846 'Latin5' : [ 'ISO_IR 148' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3847 'Thai' : [ 'ISO_IR 166', 'tis-620' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3848 'Utf8' : [ 'ISO_IR 192' ],
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3849 }
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3850
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3851 for name in ENCODINGS.iterkeys():
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3852 if len(ENCODINGS[name]) == 1:
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3853 ENCODINGS[name].append(name.lower())
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 UploadInstance(_REMOTE, 'Encodings/Lena-utf8.dcm')
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3856
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3857 for name in ENCODINGS.iterkeys():
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3858 self.assertEqual(name, DoPut(_REMOTE, '/tools/default-encoding', name))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3859 self.assertEqual(name, DoGet(_REMOTE, '/tools/default-encoding'))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3860
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3861 i = CallFindScu([ '-k', '0008,0052=STUDY',
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3862 '-k', 'SpecificCharacterSet',
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3863 '-k', 'PatientName' ])
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3864
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3865 characterSet = re.findall('\(0008,0005\).*?\[(.*?)\]', i)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3866 self.assertEqual(1, len(characterSet))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3867 self.assertEqual(ENCODINGS[name][0], characterSet[0].strip())
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3868
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3869 patientName = re.findall('\(0010,0010\).*?\[(.*?)\]', i)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3870 self.assertEqual(1, len(patientName))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3871
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3872 expected = TEST.encode(ENCODINGS[name][1], 'ignore')
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3873 self.assertEqual(expected, patientName[0].strip())
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3874
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3875
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3876 #for master in ENCODINGS:
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3877 for master in [ 'Latin1', 'Utf8', 'Cyrillic' ]: # Shortcut to speedup tests
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3878 self.assertEqual(master, DoPut(_REMOTE, '/tools/default-encoding', master))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3879 self.assertEqual(master, DoGet(_REMOTE, '/tools/default-encoding'))
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 name in ENCODINGS:
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3882 DropOrthanc(_REMOTE)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3883 UploadInstance(_REMOTE, 'Encodings/Lena-%s.dcm' % ENCODINGS[name][1])
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3884
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3885 i = CallFindScu([ '-k', '0008,0052=STUDY',
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3886 '-k', 'PatientID',
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3887 '-k', 'SpecificCharacterSet',
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3888 '-k', 'PatientName' ])
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3889 i = i.decode(ENCODINGS[master][1])
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3890
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3891 characterSet = re.findall('\(0008,0005\).*?\[(.*?)\]', i)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3892 self.assertEqual(1, len(characterSet))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3893 self.assertEqual(ENCODINGS[master][0], characterSet[0].strip())
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3894
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3895 patientId = re.findall('\(0010,0020\).*?\[(.*?)\]', i)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3896 self.assertEqual(1, len(patientId))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3897 self.assertEqual(ENCODINGS[name][1], patientId[0].strip())
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3898
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3899 patientName = re.findall('\(0010,0010\).*?\[(.*?)\]', i)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3900 self.assertEqual(1, len(patientName))
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3901
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3902 tmp = ENCODINGS[name][1]
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3903 expected = TEST.encode(tmp, 'ignore').decode(tmp)
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3904 tmp = ENCODINGS[master][1]
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3905 expected = expected.encode(tmp, 'ignore').decode(tmp)
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 self.assertEqual(expected, patientName[0].strip())
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3908
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3909
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3910 a = DoPost(_REMOTE, '/tools/find', { 'Expand' : True,
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3911 'Level' : 'Study',
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3912 'Query' : { }})
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3913 self.assertEqual(1, len(a))
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 tmp = ENCODINGS[name][1]
dbcbffb889da test_findscu_encoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 89
diff changeset
3916 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
3917
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3918
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3919 def test_reconstruct(self):
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3920 def CompareMainDicomTag(expected, instance, level, tag):
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3921 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
3922
504
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
3923 originalInstanceId = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
96
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3924
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3925 studies = DoGet(_REMOTE, '/studies/')
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3926 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/')))
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3927 self.assertEqual(1, len(studies))
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3928 self.assertEqual(1, len(DoGet(_REMOTE, '/series/')))
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3929 self.assertEqual(1, len(DoGet(_REMOTE, '/instances/')))
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3930
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3931 modified = DoPost(_REMOTE, '/studies/%s/modify' % studies[0], {
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3932 "Replace" : {
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3933 "StudyDescription" : "hello",
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3934 "SeriesDescription" : "world",
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3935 "SOPClassUID" : "test",
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3936 "SOPInstanceUID" : "myid",
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3937 },
119
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
3938 "Keep" : [ "StudyInstanceUID", "SeriesInstanceUID" ],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
3939 "Force" : True
96
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3940 })
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3941
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3942 instances = DoGet(_REMOTE, '/instances/')
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3943 self.assertEqual(1, len(DoGet(_REMOTE, '/patients/')))
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3944 self.assertEqual(1, len(DoGet(_REMOTE, '/studies/')))
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3945 self.assertEqual(1, len(DoGet(_REMOTE, '/series/')))
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3946 self.assertEqual(2, len(instances))
272d1229cb49 test reconstruction of tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 95
diff changeset
3947
504
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
3948 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
3949
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
3950 # 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
3951 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
3952 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
3953 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
3954 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
3955 CompareMainDicomTag('myid', modifiedInstanceId, '', 'SOPInstanceUID')
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
3956 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
3957 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
3958
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
3959 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
3960 # metadata before reconstruct
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
3961 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
3962 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
3963
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
3964 # 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
3965 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
3966
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
3967 CompareMainDicomTag('hello', originalInstanceId, 'study', 'StudyDescription')
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
3968 CompareMainDicomTag('world', originalInstanceId, 'series', 'SeriesDescription')
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
3969 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
3970
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
3971 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
3972 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
3973 # 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
3974 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
3975 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
3976
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
3977 self.assertEqual(mba, maa)
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
3978 self.assertEqual(mbb, mab)
473
4ee85b016a40 added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents: 472
diff changeset
3979
4ee85b016a40 added NewTests framework - only the Housekeeper tests right now
Alain Mazy <am@osimis.io>
parents: 472
diff changeset
3980
503
138d5efd4407 added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 502
diff changeset
3981 @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
3982 def test_httpClient_lua(self):
496
f78f7ee6b660 fix httpclient
Alain Mazy <am@osimis.io>
parents: 490
diff changeset
3983 retries = 4
463
29aaa3df718f added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents: 457
diff changeset
3984 result = ''
29aaa3df718f added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents: 457
diff changeset
3985
104
7530eb50c3c4 renamed HttpPost.lua into HttpClient.lua + fix tests
amazy
parents: 102
diff changeset
3986 with open(GetDatabasePath('Lua/HttpClient.lua'), 'r') as f:
496
f78f7ee6b660 fix httpclient
Alain Mazy <am@osimis.io>
parents: 490
diff changeset
3987 scriptContent = f.read()
463
29aaa3df718f added verbosity and retries for test sometimes failing on CI
Alain Mazy <am@osimis.io>
parents: 457
diff changeset
3988 # 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
3989 while retries > 0 and not ('OK' in result):
496
f78f7ee6b660 fix httpclient
Alain Mazy <am@osimis.io>
parents: 490
diff changeset
3990 print("Executing lua script HttpClient.lua")
f78f7ee6b660 fix httpclient
Alain Mazy <am@osimis.io>
parents: 490
diff changeset
3991 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
3992 retries -= 1
102
9671578fd4d3 added tests for Lua HttpPost/Put/Get/Delete methods
amazy
parents: 100
diff changeset
3993
9671578fd4d3 added tests for Lua HttpPost/Put/Get/Delete methods
amazy
parents: 100
diff changeset
3994 self.assertIn('OK', result)
107
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3995
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3996
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
3997 def test_bitbucket_issue_44(self):
319
de6e73e4df60 leaving bitbucket
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
3998 # 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
3999 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm')
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4000 UploadInstance(_REMOTE, 'Issue44/Monochrome2.dcm')
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 # dcmcjpeg +ua +eb Monochrome1.dcm Monochrome1-Jpeg.dcm
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4003 UploadInstance(_REMOTE, 'Issue44/Monochrome1-Jpeg.dcm')
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4004
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4005 # dcmcjpeg +ua Monochrome1.dcm Monochrome1-JpegLS.dcm
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4006 UploadInstance(_REMOTE, 'Issue44/Monochrome1-JpegLS.dcm')
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4007
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4008 monochrome1 = 'bcdd600a-a6a9c522-5f0a6e84-8657c9f3-b76e59b7'
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4009 monochrome1_jpeg = '9df82121-208a2da8-0038674a-3d7a773b-b7008cd2'
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4010 monochrome1_jpegls = '0486d1a2-9165573f-b1976b20-e927b016-6b8d67ab'
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4011 monochrome2 = 'f00947b7-f61f7164-c93414d1-c6fbda6a-9e92ed20'
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 for i in [ monochrome1, monochrome1_jpeg, monochrome1_jpegls ]:
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4014 im = GetImage(_REMOTE, '/instances/%s/preview' % i)
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4015 self.assertEqual("L", im.mode)
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4016 self.assertEqual(2010, im.size[0])
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4017 self.assertEqual(2446, im.size[1])
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4018
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4019 # 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
4020 # white (255), should be rendered as black (0) => invert
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4021 if i == monochrome1_jpeg:
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4022 # Add some tolerance because of JPEG destructive compression
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4023 self.assertGreater(10, im.getpixel((0,0)))
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4024 else:
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4025 self.assertEqual(0, im.getpixel((0,0)))
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4026
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4027 im = GetImage(_REMOTE, '/instances/%s/preview' % monochrome2)
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4028 self.assertEqual("L", im.mode)
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4029 self.assertEqual(1572, im.size[0])
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4030 self.assertEqual(2010, im.size[1])
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 # 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
4033 # white (255), should be rendered as white (255)
fddb35f7289d test_bitbucket_issue_44
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 104
diff changeset
4034 self.assertEqual(255, im.getpixel((0,0)))
111
7005cdeeb704 test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
4035
7005cdeeb704 test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
4036
7005cdeeb704 test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
4037 def test_bitbucket_issue_42(self):
319
de6e73e4df60 leaving bitbucket
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
4038 # https://bugs.orthanc-server.com/show_bug.cgi?id=42
123
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
4039 # 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
4040 UploadInstance(_REMOTE, 'Issue42.dcm')['ID']
7005cdeeb704 test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
4041 modified = DoPost(_REMOTE,
7005cdeeb704 test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
4042 '/patients/da128605-e040d0c4-310615d2-3475da63-df2d1ef4/modify',
119
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 118
diff changeset
4043 '{"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
4044 'application/json')
7005cdeeb704 test_bitbucket_issue_42
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 107
diff changeset
4045 self.assertTrue('PatientID' in modified)
113
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4046
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4047
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4048 def test_rest_find_limit(self):
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4049 # Check the "Since" and "Limit" parameters in URI "/tools/find"
319
de6e73e4df60 leaving bitbucket
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
4050 # 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
4051
113
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4052 # Upload 6 instances
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4053 brainix = []
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4054 knee = []
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4055 for i in range(2):
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4056 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
4057 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
4058 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
4059
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4060 # Check using BRAINIX
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4061 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4062 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4063 'Limit' : 10 })
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4064 self.assertEqual(4, len(a))
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4065
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' : 4 })
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 'Since' : 2,
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4074 'Limit' : 4 })
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4075 self.assertEqual(2, len(a))
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4076
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4077 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4078 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4079 'Limit' : 3 })
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4080 self.assertEqual(3, 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 b = []
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4083 for i in range(4):
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4084 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4085 'Query' : { 'PatientName' : 'B*' },
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4086 'Limit' : 1,
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4087 'Since' : i })
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4088 self.assertEqual(1, len(a))
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4089 b.append(a[0])
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4090
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4091 # 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
4092 self.assertEqual(0, len(set(b) ^ set(brainix)))
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4093
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4094 # Check using KNEE
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4095 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4096 'Query' : { 'PatientName' : 'K*' },
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4097 'Limit' : 10 })
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4098 self.assertEqual(2, len(a))
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4099
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' : 2 })
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 b = []
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4106 for i in range(2):
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4107 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4108 'Query' : { 'PatientName' : 'K*' },
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4109 'Limit' : 1,
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4110 'Since' : i })
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4111 self.assertEqual(1, len(a))
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4112 b.append(a[0])
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4113
3e5934363e76 test_rest_find_limitµ
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 112
diff changeset
4114 self.assertEqual(0, len(set(b) ^ set(knee)))
115
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4115
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4116
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4117 def test_bitbucket_issue_46(self):
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4118 # "PHI remaining after anonymization"
319
de6e73e4df60 leaving bitbucket
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
4119 # 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
4120
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4121 def GetAnonymizedTags(study, version):
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4122 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4123 { 'DicomVersion' : version },
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4124 'application/json') ['ID']
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4125 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized)
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4126 self.assertEqual(1, len(a))
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4127
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4128 instance = a[0]['ID']
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4129
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4130 return (instance, DoGet(_REMOTE, '/instances/%s/tags' % instance))
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4131
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4132 UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm')
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4133 origStudy = '6068a14b-d4df27af-9ec22145-538772d8-74f228ff'
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 # 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
4136 # (Patient's Mother's Birth Name) tags
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4137 newStudy = DoPost(_REMOTE, '/studies/%s/modify' % origStudy,
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4138 '{"Replace":{"0010,1060":"OSIMIS","0032,1033":"MOTHER"}}',
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4139 'application/json')['ID']
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4140
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4141 # 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
4142 # 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
4143 (instance, tags) = GetAnonymizedTags(newStudy, "2008")
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4144 self.assertTrue('0032,1033' in tags)
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4145 self.assertTrue('0010,1060' in tags)
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4146
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4147 # 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
4148 # 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
4149 (instance, tags) = GetAnonymizedTags(newStudy, "2017c")
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4150 self.assertFalse('0032,1033' in tags)
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4151 self.assertFalse('0010,1060' in tags)
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4152
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4153 t = {}
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4154 for (key, value) in tags.iteritems():
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4155 t[value['Name']] = value['Value']
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4156
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4157 self.assertEqual('', t['StudyDate']) # Type 1 tag => cleared
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4158 self.assertEqual('', t['StudyTime']) # Type 1 tag => cleared
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4159 self.assertEqual('', t['PatientSex']) # Type 1 tag => cleared
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4160 self.assertFalse('SeriesDate' in t) # Type 3 tag => null
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4161 self.assertFalse('SeriesTime' in t) # Type 3 tag => null
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4162
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4163 with tempfile.NamedTemporaryFile(delete = True) as f:
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4164 # 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
4165 f.write(DoGet(_REMOTE, '/instances/%s/file' % instance))
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4166 f.flush()
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4167 subprocess.check_output([ FindExecutable('dciodvfy'), f.name ],
45ebfab035b7 test_bitbucket_issue_46
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 113
diff changeset
4168 stderr = subprocess.STDOUT).split('\n')
118
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4169
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4170
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4171 def test_bitbucket_issue_55(self):
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4172 def Run(modify, query):
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4173 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
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 operation = 'modify' if modify else 'anonymize'
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4176
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4177 self.assertRaises(Exception, lambda: DoPost(
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4178 _REMOTE, '/studies/%s/%s' % (study, operation), query))
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4179 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4180
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4181 query["Force"] = True
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4182 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
4183 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4184 DoDelete(_REMOTE, a)
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 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4187
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4188 UploadInstance(_REMOTE, 'DummyCT.dcm')
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4189 study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0'
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 Run(True, { "Replace" : { "StudyInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4192 Run(True, { "Replace" : { "SeriesInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4193 Run(True, { "Replace" : { "SOPInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4194
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4195 Run(False, { "Keep" : [ "StudyInstanceUID" ]})
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4196 Run(False, { "Keep" : [ "SeriesInstanceUID" ]})
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4197 Run(False, { "Keep" : [ "SOPInstanceUID" ]})
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4198
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4199 Run(False, { "Replace" : { "StudyInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4200 Run(False, { "Replace" : { "SeriesInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4201 Run(False, { "Replace" : { "SOPInstanceUID" : "world" } })
a954c535fef6 test_bitbucket_issue_55
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 117
diff changeset
4202
120
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4203
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4204 def test_bitbucket_issue_56(self):
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4205 # Case-insensitive matching over accents. This test assumes
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4206 # that the "CaseSensitivePN" configuration option of Orthanc
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4207 # is set to "false" (default value).
319
de6e73e4df60 leaving bitbucket
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
4208 # 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
4209
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4210 def Check(name, expected, expectedSensitive):
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4211 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
4212 '-k', '0008,0052=PATIENT',
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4213 '-k', 'PatientName=%s' % name ])
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4214 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', a)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4215 self.assertEqual(expected, len(patientNames))
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4216
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4217 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4218 'CaseSensitive' : False,
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4219 'Query' : { 'PatientName' : name }})
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4220 self.assertEqual(expected, len(a))
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' : True,
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(expectedSensitive, len(a))
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4226
533
Alain Mazy <am@osimis.io>
parents: 531
diff changeset
4227 # SpecificCharacterSet = ISO_IR 100 (Latin1), PatientName=Test-éüäöò
120
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4228 UploadInstance(_REMOTE, 'Encodings/Lena-latin1.dcm')
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4229
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4230 # WildcardConstraint
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4231 Check('TeSt*', 1, 0)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4232 Check('TeSt-a*', 0, 0)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4233 Check('TeSt-É*', 1, 0)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4234 Check('TeSt-é*', 1, 0)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4235 Check('Test-é*', 1, 1)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4236
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4237 # ListConstraint
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4238 Check('Test-éüäöò\\nope', 1, 1)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4239 Check('Test-ÉÜÄÖÒ\\nope', 1, 0)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4240
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4241 # ValueConstraint
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4242 Check('Test-éüäöò', 1, 1)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4243 Check('Test-ÉÜÄÖÒ', 1, 0)
fce08afe6b2d test_bitbucket_issue_56
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 119
diff changeset
4244
125
15e4dc0a5810 test_gbk_alias
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 124
diff changeset
4245
15e4dc0a5810 test_gbk_alias
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 124
diff changeset
4246 def test_gbk_alias(self):
15e4dc0a5810 test_gbk_alias
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 124
diff changeset
4247 # 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
4248 # This test fails on Orthanc <= 1.3.0
15e4dc0a5810 test_gbk_alias
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 124
diff changeset
4249 i = UploadInstance(_REMOTE, '2017-09-19-GBK-Tumashu.dcm')['ID']
15e4dc0a5810 test_gbk_alias
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 124
diff changeset
4250 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
15e4dc0a5810 test_gbk_alias
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 124
diff changeset
4251 self.assertEqual(tags['PatientName'], u'徐浩凯')
15e4dc0a5810 test_gbk_alias
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 124
diff changeset
4252 self.assertEqual(tags['InstitutionName'], u'灌云县疾病预防控制中心')
126
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4253
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4254
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4255 def test_long_tag(self):
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4256 i = UploadInstance(_REMOTE, 'DummyCTWithLongTag.dcm')['ID']
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4257 series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe'
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 tags = DoGet(_REMOTE, '/instances/%s/tags' % i)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4260 self.assertTrue('0018,1020' in tags)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4261 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4262 self.assertEqual('TooLong', tags['0018,1020']['Type'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4263 self.assertEqual(None, tags['0018,1020']['Value'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4264
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4265 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
4266 self.assertTrue('0018,1020' in tags)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4267 self.assertEqual('SoftwareVersions', tags['0018,1020']['Name'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4268 self.assertEqual('String', tags['0018,1020']['Type'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4269 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
4270
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4271 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4272 self.assertTrue('SoftwareVersions' in tags)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4273 self.assertEqual(None, tags['SoftwareVersions'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4274 self.assertTrue('HeartRate' in tags)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4275 self.assertEqual(474, int(tags['HeartRate']))
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4276
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4277 tags = DoGet(_REMOTE, '/instances/%s/simplified-tags' % i)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4278 self.assertTrue('SoftwareVersions' in tags)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4279 self.assertEqual(None, tags['SoftwareVersions'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4280
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4281 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
4282 self.assertTrue('SoftwareVersions' in tags)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4283 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet'))
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4284
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4285 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
4286 self.assertTrue('SoftwareVersions' in tags)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4287 self.assertTrue(tags['SoftwareVersions'].startswith('Lorem ipsum dolor sit amet'))
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4288
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4289 tags = DoGet(_REMOTE, '/series/%s/instances-tags' % series)
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4290 self.assertEqual(1, len(tags))
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4291 self.assertTrue(i in tags.keys())
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4292 self.assertTrue('0018,1020' in tags[i])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4293 self.assertEqual('TooLong', tags[i]['0018,1020']['Type'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4294
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4295 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
4296 self.assertEqual(1, len(tags))
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4297 self.assertTrue(i in tags.keys())
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4298 self.assertTrue('0018,1020' in tags[i])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4299 self.assertEqual('String', tags[i]['0018,1020']['Type'])
6ead76f08d9c test_long_tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
4300 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
4301
127
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4302
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4303 def test_extended_media(self):
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4304 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4305
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4306 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
4307 self.assertEqual(2, len(z.namelist()))
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4308 self.assertTrue('IMAGES/IM0' in z.namelist())
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4309 self.assertTrue('DICOMDIR' in z.namelist())
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 try:
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4312 os.remove('/tmp/DICOMDIR')
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4313 except:
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4314 # The file does not exist
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4315 pass
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4316
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4317 z.extract('DICOMDIR', '/tmp')
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4318 a = subprocess.check_output([ FindExecutable('dciodvfy'), '/tmp/DICOMDIR' ],
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4319 stderr = subprocess.STDOUT).split('\n')
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4320 self.assertEqual(5, len(a))
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4321 self.assertTrue(a[0].startswith('Warning'))
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4322 self.assertEqual('BasicDirectory', a[1])
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4323 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
4324 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
4325 self.assertEqual('', a[4])
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4326
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4327 a = subprocess.check_output([ FindExecutable('dcentvfy'), '/tmp/DICOMDIR' ],
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4328 stderr = subprocess.STDOUT).split('\n')
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4329 self.assertEqual(1, len(a))
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4330 self.assertEqual('', a[0])
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('dcm2xml'), '/tmp/DICOMDIR' ])
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4333 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
4334
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4335 # Check the presence of the series description (extended tag)
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4336 self.assertTrue(re.search('T1W_aTSE', a) != None)
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4337
1eea4d3a1ba9 test_extended_media
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 126
diff changeset
4338 os.remove('/tmp/DICOMDIR')
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
132
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4341 def test_anonymize_relationships_1(self):
133
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4342 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4343 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
4344 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4345
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4346 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4347 '{}',
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4348 'application/json')['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4349
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4350 a = DoGet(_REMOTE, '/studies/%s/instances' % study)
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4351 self.assertEqual(2, len(a))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4352 a1 = a[0]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4353 a2 = a[1]['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 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized)
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4356 self.assertEqual(2, len(b))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4357 b1 = b[0]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4358 b2 = b[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 SEQUENCE = '/instances/%s/content/ReferencedImageSequence'
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4361 SOP = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPInstanceUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4362 CLASS = '/instances/%s/content/ReferencedImageSequence/%d/ReferencedSOPClassUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4363 FRAME = '/instances/%s/content/FrameOfReferenceUID'
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 self.assertEqual(DoGet(_REMOTE, FRAME % a1),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4366 DoGet(_REMOTE, FRAME % a2))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4367 self.assertEqual(DoGet(_REMOTE, FRAME % b1),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4368 DoGet(_REMOTE, FRAME % b2))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4369 self.assertNotEqual(DoGet(_REMOTE, FRAME % a1),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4370 DoGet(_REMOTE, FRAME % b1))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4371 self.assertNotEqual(DoGet(_REMOTE, FRAME % a2),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4372 DoGet(_REMOTE, FRAME % b2))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4373
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4374 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
4375 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
4376 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
4377 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
4378
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4379 for i in range(3):
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4380 self.assertEqual(DoGet(_REMOTE, SOP % (a1, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4381 DoGet(_REMOTE, SOP % (a2, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4382 self.assertEqual(DoGet(_REMOTE, SOP % (b1, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4383 DoGet(_REMOTE, SOP % (b2, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4384 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4385 DoGet(_REMOTE, SOP % (b1, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4386 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4387 DoGet(_REMOTE, SOP % (b2, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4388 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4389 DoGet(_REMOTE, CLASS % (b1, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4390 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, i)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4391 DoGet(_REMOTE, CLASS % (b2, i)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4392
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4393
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4394 def test_anonymize_relationships_2(self):
133
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4395 UploadInstance(_REMOTE, 'Comunix/Ct/IM-0001-0001.dcm')
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4396 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
4397 study = '6c65289b-db2fcb71-7eaf73f4-8e12470c-a4d6d7cf'
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 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4400 '{}',
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4401 'application/json')['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4402
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4403 a = DoGet(_REMOTE, '/studies/%s/instances' % study)
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4404 self.assertEqual(2, len(a))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4405 a1 = a[0]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4406 a2 = a[1]['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 b = DoGet(_REMOTE, '/studies/%s/instances' % anonymized)
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4409 self.assertEqual(2, len(b))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4410 b1 = b[0]['ID']
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4411 b2 = b[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 SEQUENCE = '/instances/%s/content/SourceImageSequence'
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4414 SOP = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPInstanceUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4415 CLASS = '/instances/%s/content/SourceImageSequence/%d/ReferencedSOPClassUID'
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4416
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4417 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
4418 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
4419 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
4420 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
4421 self.assertEqual(DoGet(_REMOTE, SOP % (a1, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4422 DoGet(_REMOTE, SOP % (a2, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4423 self.assertEqual(DoGet(_REMOTE, SOP % (b1, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4424 DoGet(_REMOTE, SOP % (b2, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4425 self.assertNotEqual(DoGet(_REMOTE, SOP % (a1, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4426 DoGet(_REMOTE, SOP % (b1, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4427 self.assertNotEqual(DoGet(_REMOTE, SOP % (a2, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4428 DoGet(_REMOTE, SOP % (b2, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4429 self.assertEqual(DoGet(_REMOTE, CLASS % (a1, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4430 DoGet(_REMOTE, CLASS % (b1, 0)))
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4431 self.assertEqual(DoGet(_REMOTE, CLASS % (a2, 0)),
149144d854bb Orthanc.test_anonymize_relationships_1/2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 130
diff changeset
4432 DoGet(_REMOTE, CLASS % (b2, 0)))
133
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4433
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4434
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4435 def test_anonymize_relationships_3(self):
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4436 sr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM0')['ID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4437 mr1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/StructuredReports/IM631')['ID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4438 study = 'ef351eb2-c1147229-062736b8-35a151e3-e32d526b'
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 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study,
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4441 { "Keep" : [ "ContentSequence" ] }) ['ID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4442
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4443 a = DoGet(_REMOTE, '/studies/%s/instances' % anonymized)
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4444 self.assertEqual(2, len(a))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4445
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4446 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
4447 sr2 = a[0]['ID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4448 mr2 = a[1]['ID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4449 else:
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4450 sr2 = a[1]['ID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4451 mr2 = a[0]['ID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4452
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4453 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % sr1),
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4454 DoGet(_REMOTE, '/instances/%s/content/Modality' % sr2))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4455 self.assertEqual(DoGet(_REMOTE, '/instances/%s/content/Modality' % mr1),
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4456 DoGet(_REMOTE, '/instances/%s/content/Modality' % mr2))
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 mrUid1 = DoGet(_REMOTE, '/instances/%s' % mr1)['MainDicomTags']['SOPInstanceUID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4459 mrUid2 = DoGet(_REMOTE, '/instances/%s' % mr2)['MainDicomTags']['SOPInstanceUID']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4460 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
4461 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
4462 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
4463 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
4464
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4465 PATH1 = '/instances/%s/content/CurrentRequestedProcedureEvidenceSequence'
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4466 PATH2 = PATH1 + '/0/ReferencedSeriesSequence'
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4467 PATH3 = PATH2 + '/0/ReferencedSOPSequence'
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4468 PATH4 = PATH3 + '/0/ReferencedSOPInstanceUID'
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4469 PATH5 = PATH3 + '/0/ReferencedSOPClassUID'
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4470
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4471 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr1)))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4472 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr1)))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4473 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr1)))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4474 self.assertEqual(DoGet(_REMOTE, PATH4 % sr1), mrUid1)
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4475 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
4476 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
4477
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4478 self.assertEqual(1, len(DoGet(_REMOTE, PATH1 % sr2)))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4479 self.assertEqual(1, len(DoGet(_REMOTE, PATH2 % sr2)))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4480 self.assertEqual(1, len(DoGet(_REMOTE, PATH3 % sr2)))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4481 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
4482
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4483 self.assertEqual(mrUid2, DoGet(_REMOTE, PATH4 % sr2).strip('\x00'))
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4484 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
4485 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
4486
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4487 content1 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr1) ['ContentSequence']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4488 content2 = DoGet(_REMOTE, '/instances/%s/tags?simplify' % sr2) ['ContentSequence']
f0d4c4707e64 test_anonymize_relationships_3
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 132
diff changeset
4489 self.assertEqual(str(content1), str(content2))
141
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
4490
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
4491
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
4492 def test_bitbucket_issue_94(self):
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
4493 # "a simple instance modification should not modify FrameOfReferenceUID + ..."
319
de6e73e4df60 leaving bitbucket
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
4494 # 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
4495 i = UploadInstance(_REMOTE, 'Issue94.dcm')['ID']
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 source = DoGet(_REMOTE, '/instances/%s/attachments/dicom/data' % i)
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
4498
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
4499 modified = DoPost(_REMOTE, '/instances/%s/modify' % i,
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
4500 { "Replace" : {"PatientID" : "toto"}, "Force": True})
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 anonymized = DoPost(_REMOTE, '/instances/%s/anonymize' % 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 a = ExtractDicomTags(source, [ 'FrameOfReferenceUID' ])
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
4505 self.assertEqual(1, len(a))
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 b = ExtractDicomTags(modified, [ 'FrameOfReferenceUID' ])
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
4508 self.assertEqual(1, len(b))
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
4509
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
4510 c = ExtractDicomTags(anonymized, [ 'FrameOfReferenceUID' ])
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
4511 self.assertEqual(1, len(c))
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
4512
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
4513 self.assertEqual(a, b) # Modified DICOM
5de178abe4d8 test_bitbucket_issue_94
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 138
diff changeset
4514 self.assertNotEqual(a, c) # Anonymized DICOM
143
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
4515
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
4516
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
4517 def test_metadata_origin(self):
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
4518 # Upload using the REST API
144
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4519 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
4520 self.assertEqual('RestApi', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i))
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
4521 self.assertEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i))
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
4522 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i))
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
4523 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/metadata/CalledAET' % i))
315
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 314
diff changeset
4524
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 314
diff changeset
4525 # "HttpUsername" is empty iff "AuthenticationEnabled" is "false"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 314
diff changeset
4526 self.assertTrue(DoGet(_REMOTE, '/instances/%s/metadata/HttpUsername' % i) in [ '', 'alice' ])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 314
diff changeset
4527
144
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4528 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i)
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4529 self.assertEqual('RestApi', m['Origin'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4530 self.assertEqual('', m['RemoteAET'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4531 self.assertNotEqual('', m['RemoteIP'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4532 self.assertFalse('CalledAET' in m)
315
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 314
diff changeset
4533 self.assertTrue('HttpUsername' in m)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 314
diff changeset
4534 self.assertTrue(m['HttpUsername'] in [ '', 'alice' ])
144
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4535
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4536 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
4537 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
4538 self.assertEqual('1', m['IndexInSeries'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4539 self.assertTrue('ReceptionDate' in m)
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4540
143
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
4541 DoDelete(_REMOTE, '/instances/%s' % i)
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
4542
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
4543 # Upload using the DICOM protocol
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
4544 subprocess.check_call([ FindExecutable('storescu'),
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
4545 _REMOTE['Server'], str(_REMOTE['DicomPort']),
144
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4546 GetDatabasePath('Knee/T1/IM-0001-0001.dcm'),
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4547 '-xw' ]) # Propose JPEG2000
143
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
4548 self.assertEqual('DicomProtocol', DoGet(_REMOTE, '/instances/%s/metadata/Origin' % i))
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
4549 self.assertEqual('STORESCU', DoGet(_REMOTE, '/instances/%s/metadata/RemoteAET' % i))
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
4550 self.assertNotEqual('', DoGet(_REMOTE, '/instances/%s/metadata/RemoteIP' % i))
28d50ffac07d test_metadata_origin
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 142
diff changeset
4551 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
4552 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
4553
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4554 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i)
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4555 self.assertEqual('DicomProtocol', m['Origin'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4556 self.assertEqual('STORESCU', m['RemoteAET'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4557 self.assertNotEqual('', m['RemoteIP'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4558 self.assertEqual('ANY-SCP', m['CalledAET'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4559 self.assertFalse('HttpUsername' in m)
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4560
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4561 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
4562 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
4563 self.assertEqual('1', m['IndexInSeries'])
7809fdf8056f testing metadata?expand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 143
diff changeset
4564 self.assertTrue('ReceptionDate' in m)
147
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4565
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4566
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4567 def test_lua_deadlock(self):
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4568 # 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
4569 # 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
4570 # 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
4571 # instance appears to be stored and then everything just
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4572 # halts, ie Orthanc wont respond to anything after that."
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4573 # https://groups.google.com/d/msg/orthanc-users/Rc-Beb42xc8/JUgdzrmCAgAJ
174
d468cbe1b161 added tests for IncomingWorklistRequestFilter
am@osimis.io
parents: 173
diff changeset
4574 InstallLuaScriptFromPath(_REMOTE, 'Lua/Jpeg2000Conversion.lua')
147
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4575
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4576 subprocess.check_call([ FindExecutable('storescu'),
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4577 _REMOTE['Server'], str(_REMOTE['DicomPort']),
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4578 GetDatabasePath('Brainix/Flair/IM-0001-0001.dcm'),
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4579 GetDatabasePath('Brainix/Flair/IM-0001-0002.dcm'),
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
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4582 instances = DoGet(_REMOTE, '/instances')
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4583 self.assertEqual(2, len(instances))
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4584
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4585 t1 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[0])
ff788c99f1aa test_lua_deadlock
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 145
diff changeset
4586 t2 = DoGet(_REMOTE, '/instances/%s/metadata/TransferSyntax' % instances[1])
175
am@osimis.io
parents: 174
diff changeset
4587 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
4588 self.assertEqual(t1, t2);
154
4a533d003080 test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 147
diff changeset
4589
4a533d003080 test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 147
diff changeset
4590
4a533d003080 test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 147
diff changeset
4591 def test_find_group_length(self):
4a533d003080 test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 147
diff changeset
4592 # 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
4593 # one of the Generic Group Length tags (*, 0x0000)
4a533d003080 test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 147
diff changeset
4594 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
4595 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
4596 self.assertFalse('UnableToProcess' in result)
4a533d003080 test_find_group_length
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 147
diff changeset
4597 self.assertFalse('E:' in result)
179
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4598
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4599
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4600 def test_split(self):
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4601 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4602 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
4603 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
4604 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
4605 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4606 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4607 t2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59'
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4608
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4609 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4610 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4611
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4612 info = DoGet(_REMOTE, '/studies/%s' % study)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4613 self.assertTrue('ReferringPhysicianName' in info['MainDicomTags'])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4614
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4615 job = MonitorJob2(_REMOTE, lambda: DoPost
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4616 (_REMOTE, '/studies/%s/split' % study, {
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4617 'Series' : [ t2 ],
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4618 'Replace' : { 'PatientName' : 'Hello' },
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4619 'Remove' : [ 'ReferringPhysicianName' ],
181
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
4620 'KeepSource' : False,
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
4621 'Asynchronous' : True
179
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4622 }))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4623
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4624 self.assertNotEqual(None, job)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4625
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4626 studies = set(DoGet(_REMOTE, '/studies'))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4627 self.assertEqual(2, len(studies))
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 series = set(DoGet(_REMOTE, '/series'))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4630 self.assertEqual(2, len(series))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4631 self.assertTrue(t1 in series)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4632
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4633 study2 = DoGet(_REMOTE, '/jobs/%s' % job)['Content']['TargetStudy']
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4634 self.assertTrue(study in studies)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4635 self.assertTrue(study2 in studies)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4636
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4637 info = DoGet(_REMOTE, '/studies/%s' % study2)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4638 self.assertTrue('Hello', info['PatientMainDicomTags']['PatientName'])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4639 self.assertFalse('ReferringPhysicianName' in info['MainDicomTags'])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4640
254
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4641 sopInstanceUids = set()
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4642 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
4643 sopInstanceUids.add(i['MainDicomTags']['SOPInstanceUID'])
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4644
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4645 self.assertTrue(knee1Sop in sopInstanceUids)
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4646
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4647 # Fails if Orthanc <= 1.5.7
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4648 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
4649
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4650 # 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
4651 self.assertEqual(2, len(sopInstanceUids))
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4652
179
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4653
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4654 def test_merge(self):
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4655 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
4656 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
4657 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
4658 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
4659 knee = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4660 t1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4661 brainix = '27f7126f-4f66fb14-03f4081b-f9341db2-53925988'
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4662 flair = '1e2c125c-411b8e86-3f4fe68e-a7584dd3-c6da78f0'
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4663
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4664 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4665 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4666
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4667 job = MonitorJob2(_REMOTE, lambda: DoPost
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4668 (_REMOTE, '/studies/%s/merge' % knee, {
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4669 'Resources' : [ brainix ],
181
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
4670 'KeepSource' : True,
911070f790e3 more checks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
4671 'Synchronous' : False
179
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4672 }))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4673
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4674 self.assertNotEqual(None, job)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4675
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4676 studies = set(DoGet(_REMOTE, '/studies'))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4677 self.assertEqual(2, len(studies))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4678 self.assertTrue(knee in studies)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4679 self.assertTrue(brainix in studies)
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 series = set(DoGet(_REMOTE, '/studies/%s' % knee)['Series'])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4682 self.assertTrue(t1 in series)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4683 series.remove(t1)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4684 self.assertEqual(1, len(series))
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 instances = DoGet(_REMOTE, '/series/%s' % list(series)[0])['Instances']
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4687 self.assertEqual(1, len(instances))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4688 merged = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4689
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4690 instances = DoGet(_REMOTE, '/series/%s' % t1)['Instances']
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4691 self.assertEqual(1, len(instances))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4692 a = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4693
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4694 instances = DoGet(_REMOTE, '/series/%s' % flair)['Instances']
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4695 self.assertEqual(1, len(instances))
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4696 b = DoGet(_REMOTE, '/instances/%s/tags?simplify' % instances[0])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4697
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4698 tags = DoGet(_REMOTE, '/studies/%s' % knee)
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4699
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4700 for key in tags['PatientMainDicomTags']:
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4701 self.assertEqual(a[key], merged[key])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4702 if (key in b and key != 'PatientSex'):
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4703 self.assertNotEqual(a[key], b[key])
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['MainDicomTags']:
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4706 # Not in the patient/study module
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4707 if (not key in [ 'InstitutionName',
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4708 'RequestingPhysician',
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4709 'RequestedProcedureDescription', ]):
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4710 self.assertEqual(a[key], merged[key])
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4711 if (key in b):
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4712 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
4713
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4714 sopInstanceUids = set()
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4715 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
4716 sopInstanceUids.add(i['MainDicomTags']['SOPInstanceUID'])
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4717
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4718 self.assertTrue(kneeSop in sopInstanceUids)
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4719 self.assertTrue(brainixSop in sopInstanceUids)
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4720
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4721 # Fails if Orthanc <= 1.5.7
05b77ade5e1d test generation of sopinstanceuid in split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 247
diff changeset
4722 # 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
4723 self.assertEqual(3, len(sopInstanceUids))
179
8a2dd77d4035 testing split/merge
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 177
diff changeset
4724
187
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4725
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4726 def test_async_archive(self):
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4727 # Testing the asynchronous generation of archives/medias (new
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4728 # in Orthanc 1.4.3)
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4729 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4730 UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm')
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4731
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4732 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4733 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59'
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4734
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4735 job = MonitorJob2(_REMOTE, lambda: DoPost
508
ae493446336a fix tests for missing archives
Alain Mazy <am@osimis.io>
parents: 507
diff changeset
4736 (_REMOTE, '/series/%s/archive' % kneeT1, {
187
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4737 'Synchronous' : False
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4738 }))
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 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4741 self.assertEqual(1, len(z.namelist()))
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4742 self.assertFalse('DICOMDIR' in z.namelist())
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4743
354
88f076b906ca test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
4744 info = DoGet(_REMOTE, '/jobs/%s' % job)
88f076b906ca test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
4745 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
4746 self.assertEqual(1, info['Content']['InstancesCount'])
88f076b906ca test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
4747 self.assertEqual(0, info['Content']['UncompressedSizeMB'])
88f076b906ca test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
4748
187
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4749 job2 = MonitorJob2(_REMOTE, lambda: DoPost
508
ae493446336a fix tests for missing archives
Alain Mazy <am@osimis.io>
parents: 507
diff changeset
4750 (_REMOTE, '/series/%s/media' % kneeT1, {
187
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4751 'Synchronous' : False
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4752 }))
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4753
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4754 # 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
4755 # archive from second job (as MediaArchiveSize == 1)
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4756 self.assertRaises(Exception, lambda: GetArchive(_REMOTE, '/jobs/%s/archive' % job))
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 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job2)
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4759 self.assertEqual(2, len(z.namelist()))
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4760 self.assertTrue('DICOMDIR' in z.namelist())
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4761
354
88f076b906ca test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
4762 info = DoGet(_REMOTE, '/jobs/%s' % job2)
88f076b906ca test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
4763 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
4764 self.assertEqual(1, info['Content']['InstancesCount'])
88f076b906ca test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
4765 self.assertEqual(0, info['Content']['UncompressedSizeMB'])
88f076b906ca test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
4766
187
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4767 job = MonitorJob2(_REMOTE, lambda: DoPost
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4768 (_REMOTE, '/tools/create-archive', {
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4769 'Synchronous' : False,
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4770 'Resources' : [ kneeT1, kneeT2 ],
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4771 }))
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4772
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4773 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4774 self.assertEqual(2, len(z.namelist()))
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4775 self.assertFalse('DICOMDIR' in z.namelist())
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4776
354
88f076b906ca test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
4777 info = DoGet(_REMOTE, '/jobs/%s' % job)
88f076b906ca test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
4778 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
4779 self.assertEqual(2, info['Content']['InstancesCount'])
88f076b906ca test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
4780 self.assertEqual(0, info['Content']['UncompressedSizeMB'])
88f076b906ca test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
4781
187
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4782 job = MonitorJob2(_REMOTE, lambda: DoPost
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4783 (_REMOTE, '/tools/create-media', {
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4784 'Synchronous' : False,
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4785 'Resources' : [ kneeT1, kneeT2 ],
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4786 }))
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4787
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4788 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4789 self.assertEqual(3, len(z.namelist()))
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4790 self.assertTrue('DICOMDIR' in z.namelist())
188
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4791
354
88f076b906ca test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
4792 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
4793 self.assertEqual(2, info['Content']['InstancesCount'])
88f076b906ca test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
4794 self.assertEqual(0, info['Content']['UncompressedSizeMB'])
88f076b906ca test ArchiveSizeMB in archive jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
4795
187
770f6f5aea16 test_async_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 186
diff changeset
4796
540
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4797 def test_archive_job_delete_output(self):
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4798 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4799 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
4800 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
4801
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4802 kneeT1 = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4803 kneeT2 = 'bbf7a453-0d34251a-03663b55-46bb31b9-ffd74c59'
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4804
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4805 job = MonitorJob2(_REMOTE, lambda: DoPost
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4806 (_REMOTE, '/series/%s/archive' % kneeT1, {
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4807 'Synchronous' : False
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4808 }))
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 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4811 # delete the output
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4812 DoDelete(_REMOTE, '/jobs/%s/archive' % job)
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4813 # 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
4814 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
4815
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4816 # repeat with another resource/job
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4817 job = MonitorJob2(_REMOTE, lambda: DoPost
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4818 (_REMOTE, '/series/%s/archive' % kneeT2, {
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4819 'Synchronous' : False
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 z = GetArchive(_REMOTE, '/jobs/%s/archive' % job)
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4822 # delete the output
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4823 DoDelete(_REMOTE, '/jobs/%s/archive' % job)
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4824 # 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
4825 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
4826
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4827
ea1003982c27 added a test for DELETE /jobs/../archive
Alain Mazy <am@osimis.io>
parents: 538
diff changeset
4828
188
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4829 def test_queries_hierarchy(self):
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4830 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
189
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4831 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
4832
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4833 tags = {
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4834 'NumberOfPatientRelatedInstances' : '',
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4835 'NumberOfPatientRelatedSeries' : '',
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4836 'NumberOfPatientRelatedStudies' : '',
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4837 'NumberOfStudyRelatedInstances' : '',
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4838 'NumberOfStudyRelatedSeries' : '',
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4839 'NumberOfSeriesRelatedInstances' : '',
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4840 }
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4841
189
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4842 tags2 = copy.copy(tags)
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4843 tags2['PatientID'] = '887' # Only consider the "Knee" patient
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4844
188
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4845 patient = DoPost(_REMOTE, '/modalities/self/query', {
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4846 'Level' : 'Patient',
189
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4847 'Query' : tags2
188
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4848 }) ['ID']
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4849
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4850 study = DoPost(_REMOTE, '/modalities/self/query', {
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4851 'Level' : 'Study',
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 series = DoPost(_REMOTE, '/modalities/self/query', {
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4856 'Level' : 'Series',
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 instance = DoPost(_REMOTE, '/modalities/self/query', {
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4861 'Level' : 'Instance',
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 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
4866 self.assertEqual(1, len(p))
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4867 self.assertEqual('887', p[0]['PatientID'])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4868 self.assertEqual('1', p[0]['NumberOfPatientRelatedInstances'])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4869 self.assertEqual('1', p[0]['NumberOfPatientRelatedSeries'])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4870 self.assertEqual('1', p[0]['NumberOfPatientRelatedStudies'])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4871 self.assertFalse('NumberOfStudyRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4872 self.assertFalse('NumberOfStudyRelatedSeries' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4873 self.assertFalse('NumberOfSeriesRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4874
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4875 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
4876 self.assertEqual(1, len(p))
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4877 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
4878 self.assertEqual('1', p[0]['NumberOfStudyRelatedInstances'])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4879 self.assertEqual('1', p[0]['NumberOfStudyRelatedSeries'])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4880 self.assertFalse('NumberOfPatientRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4881 self.assertFalse('NumberOfPatientRelatedSeries' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4882 self.assertFalse('NumberOfPatientRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4883 self.assertFalse('NumberOfSeriesRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4884
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4885 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
4886 self.assertEqual(1, len(p))
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4887 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
4888 self.assertEqual('1', p[0]['NumberOfSeriesRelatedInstances'])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4889 self.assertFalse('NumberOfPatientRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4890 self.assertFalse('NumberOfPatientRelatedSeries' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4891 self.assertFalse('NumberOfPatientRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4892 self.assertFalse('NumberOfStudyRelatedInstances' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4893 self.assertFalse('NumberOfStudyRelatedSeries' in p[0])
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4894
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4895 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
4896 self.assertEqual(1, len(p))
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4897 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
4898
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4899 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
4900 { 'Query' : tags }) ['ID']
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4901 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
4902 DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % study))
189
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4903
188
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-series' % 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' % series))
7d585263808b new test: test_queries_hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 187
diff changeset
4908
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-instances' % 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' % instance))
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-series' % study,
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' % series))
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-instances' % 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' % instance))
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' % series,
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
189
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4930 def test_dicom_disk_size(self):
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4931 dicomSize = 0
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4932
379
097329b67509 fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 378
diff changeset
4933 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
4934 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
4935
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4936 for i in range(2):
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4937 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
4938 UploadInstance(_REMOTE, p)
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4939 dicomSize += os.path.getsize(GetDatabasePath(p))
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 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
4942 self.assertEqual(2, s['CountInstances'])
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4943 self.assertEqual(2, s['CountSeries'])
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4944 self.assertEqual(1, s['CountStudies'])
379
097329b67509 fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 378
diff changeset
4945
189
11719f19bd62 test_dicom_disk_size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 188
diff changeset
4946 self.assertEqual(dicomSize, int(s['DicomUncompressedSize']))
379
097329b67509 fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 378
diff changeset
4947
097329b67509 fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 378
diff changeset
4948 if isCompressed:
097329b67509 fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 378
diff changeset
4949 self.assertGreater(dicomSize, int(s['DicomDiskSize']))
097329b67509 fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 378
diff changeset
4950 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
4951 self.assertLess(dicomSize, int(s['UncompressedSize']))
379
097329b67509 fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 378
diff changeset
4952 else:
097329b67509 fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 378
diff changeset
4953 self.assertEqual(dicomSize, int(s['DicomDiskSize']))
097329b67509 fix tests if StorageCompression is true
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 378
diff changeset
4954 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
4955 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
4956 if IsDicomUntilPixelDataStored(_REMOTE):
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
4957 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
4958 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
4959 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
4960 else:
b9adc7d06347 update tests following removal of dicom-as-json attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 379
diff changeset
4961 # 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
4962 # 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
4963 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
4964
202
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4965
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4966 def test_changes_2(self):
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4967 # 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
4968 # 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
4969
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4970 # 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
4971 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
4972 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
4973 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
4974 DoDelete(_REMOTE, '/instances/%s' % a)
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4975
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4976 # 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
4977 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
4978
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4979 c = DoGet(_REMOTE, '/changes')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4980 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
4981 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4982 seq = c['Last']
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?last')
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 self.assertEqual(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?since=%d' % (seq + 1000))
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 # Add one instance
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4995 UploadInstance(_REMOTE, 'DummyCT.dcm')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4996 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
4997
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4998 c = DoGet(_REMOTE, '/changes')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
4999 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
5000 self.assertTrue(c['Done'])
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
5001 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
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?last')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
5004 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
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?since=%d' % (seq + 1000))
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
5009 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
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
389
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5013 # 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
5014 # changes of type "UpdatedMetadata"
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5015 i = DoGet(_REMOTE, '/instances') [0]
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5016 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
5017
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
5018 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/4000' % i)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
5019 self.assertEqual('200', headers['status'])
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
5020 self.assertEqual('hello', body)
389
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5021
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5022 c = DoGet(_REMOTE, '/changes?last')
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5023 self.assertEqual(1, len(c['Changes']))
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5024 self.assertTrue(c['Done'])
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5025 self.assertEqual(seq + 5, c['Last'])
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5026 self.assertEqual('UpdatedMetadata', c['Changes'][0]['ChangeType'])
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5027
394
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
5028 if IsOrthancVersionAbove(_REMOTE, 1, 9, 2):
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
5029 DoDelete(_REMOTE, '/instances/%s/metadata/4000' % i, headers = {
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
5030 'If-Match' : headers['etag']
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
5031 })
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
5032 else:
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
5033 self.assertFalse('etag' in headers)
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
5034 DoDelete(_REMOTE, '/instances/%s/metadata/4000' % i)
e87d54a8a204 compatibility with 1.9.1
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
5035
389
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5036 c = DoGet(_REMOTE, '/changes?last')
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5037 self.assertEqual(1, len(c['Changes']))
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5038 self.assertTrue(c['Done'])
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5039 self.assertEqual(seq + 6, c['Last'])
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5040 self.assertEqual('UpdatedMetadata', c['Changes'][0]['ChangeType'])
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5041
202
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
5042 # Remove the uploaded instance
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
5043 DoDelete(_REMOTE, '/instances/%s' % a)
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
5044 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
5045
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
5046 c = DoGet(_REMOTE, '/changes')
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
5047 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
5048 self.assertTrue(c['Done'])
389
27e0a2fcdc85 test /changes of type UpdatedMetadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 384
diff changeset
5049 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
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?last')
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?since=%d' % (seq + 1000))
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
f26f9ae9c599 test_changes_2 and test_bitbucket_issue_124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 195
diff changeset
5062 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
5063 a = UploadInstance(_REMOTE, 'Issue124.dcm')['ID']
508
ae493446336a fix tests for missing archives
Alain Mazy <am@osimis.io>
parents: 507
diff changeset
5064 s = DoGet(_REMOTE, '/instances/%s/series' % a)['ID']
ae493446336a fix tests for missing archives
Alain Mazy <am@osimis.io>
parents: 507
diff changeset
5065
ae493446336a fix tests for missing archives
Alain Mazy <am@osimis.io>
parents: 507
diff changeset
5066 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
5067 self.assertEqual(2, len(z.namelist()))
207
a515eec74078 test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 202
diff changeset
5068
a515eec74078 test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 202
diff changeset
5069
a515eec74078 test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 202
diff changeset
5070 def test_invalid_findscp(self):
a515eec74078 test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 202
diff changeset
5071 UploadInstance(_REMOTE, 'DummyCT.dcm')
a515eec74078 test_invalid_findscp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 202
diff changeset
5072 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
5073 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
5074
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5075
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5076 def test_bitbucket_issue_90(self):
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5077 def CountDicomResults(sex):
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5078 a = CallFindScu([ '-S', '-k', '8,52=STUDY', '-k', sex ])
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5079 return len(re.findall('\(0010,0040\)', a))
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 CountRestResults(sex):
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5082 a = DoPost(_REMOTE, '/tools/find',
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5083 { 'Level' : 'Study', 'Query' : { 'PatientSex' : sex } })
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5084 return len(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 # 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
5087 # "DummyCT.dcm" has the tag PatientSex (0010,0040) unset
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5088 UploadInstance(_REMOTE, 'DummyCT.dcm')
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5089
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5090 # 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
5091
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5092 # 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
5093 self.assertEqual(0, CountDicomResults('PatientSex=*'))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5094 self.assertEqual(0, CountRestResults('*'))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5095
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5096 # 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
5097 self.assertEqual(0, CountDicomResults('PatientSex=F'))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5098 self.assertEqual(0, CountDicomResults('PatientSex=M'))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5099 self.assertEqual(0, CountRestResults('F'))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5100 self.assertEqual(0, CountRestResults('M'))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5101
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5102 # 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
5103 # 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
5104 # as a filter in such a situation.
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5105 self.assertEqual(1, CountDicomResults('PatientSex'))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5106 self.assertEqual(1, CountDicomResults('PatientSex='))
2444c9a7c422 test_bitbucket_issue_90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 207
diff changeset
5107 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
5108
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
5109
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
5110 def test_rest_modalities_in_study(self):
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
5111 # 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
5112 # 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
5113 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
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 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
5116 'Query' : { 'ModalitiesInStudy' : 'US' }})
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
5117 self.assertEqual(0, len(a))
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
5118
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
5119 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
5120 'Query' : { 'ModalitiesInStudy' : 'US\\CT' }})
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
5121 self.assertEqual(1, len(a))
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
5122
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
5123 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
5124 'Query' : { 'ModalitiesInStudy' : 'CT' }})
2c50c8f340c2 test_rest_modalities_in_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 208
diff changeset
5125 self.assertEqual(1, len(a))
211
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5126
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5127
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5128 def test_series_status(self):
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5129 def HasCompletedInChanges():
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5130 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
5131 if c['ChangeType'] == 'CompletedSeries':
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5132 return True;
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5133
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5134 return False
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5135
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5136 UploadInstance(_REMOTE, 'Knix/Loc/IM-0001-0001.dcm')
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5137 series = '8ea120d7-5057d919-837dfbcc-ccd04e0f-7f3a94aa'
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5138 self.assertEqual('Unknown', DoGet(_REMOTE, '/series/%s' % series)['Status'])
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5139 self.assertFalse(HasCompletedInChanges())
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 series = 'ce25ecb6-ed79d004-5ae43ca7-3fc89bc5-67511614'
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5142
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5143 for i in range(3):
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5144 UploadInstance(_REMOTE, 'Series/Lena-%d.dcm' % (i + 1))
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5145 self.assertEqual('Missing', DoGet(_REMOTE, '/series/%s' % series)['Status'])
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5146 self.assertFalse(HasCompletedInChanges())
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 UploadInstance(_REMOTE, 'Series/Lena-4.dcm')
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5149 self.assertEqual('Complete', DoGet(_REMOTE, '/series/%s' % series)['Status'])
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5150 self.assertTrue(HasCompletedInChanges())
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5151
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5152 DoDelete(_REMOTE, '/changes')
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5153 self.assertFalse(HasCompletedInChanges())
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5154
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5155 UploadInstance(_REMOTE, 'Series/Lena-5.dcm')
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5156 self.assertEqual('Inconsistent', DoGet(_REMOTE, '/series/%s' % series)['Status'])
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5157 self.assertFalse(HasCompletedInChanges())
a05cc24f84e5 test_series_status
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 210
diff changeset
5158
215
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
5159
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
5160 def test_dicomweb(self):
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
5161 def Compare(dicom, reference):
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
5162 a = UploadInstance(_REMOTE, dicom) ['ID']
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
5163 b = DoGet(_REMOTE, '/instances/%s/file' % a,
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
5164 headers = { 'Accept' : 'application/dicom+json' })
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
5165 with open(GetDatabasePath(reference), 'rb') as c:
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
5166 d = json.load(c)
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
5167 AssertAlmostEqualRecursive(self, d, b)
215
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
5168
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
5169 Compare('DummyCT.dcm', 'DummyCT.json')
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
5170 Compare('MarekLatin2.dcm', 'MarekLatin2.json')
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
5171 Compare('HierarchicalAnonymization/StructuredReports/IM0',
d8fc62207ba3 test_dicomweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 214
diff changeset
5172 'HierarchicalAnonymization/StructuredReports/IM0.json')
217
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5173
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5174
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5175 def test_issue_95_encodings(self):
319
de6e73e4df60 leaving bitbucket
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
5176 # https://bugs.orthanc-server.com/show_bug.cgi?id=95
217
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5177 # Check out image: "../Database/Encodings/DavidClunie/charsettests.screenshot.png"
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 # Very useful tool: "file2" from package "file-kanji"
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5180
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5181 def GetPatientName(dicom):
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5182 i = UploadInstance(_REMOTE, dicom) ['ID']
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5183 j = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5184 return j['PatientName']
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 ComparePatientName(name, dicom):
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5187 self.assertEqual(name, GetPatientName(dicom))
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5188
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5189 # 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
5190 ComparePatientName(u'Buc^Jérôme', 'Encodings/DavidClunie/SCSFREN')
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5191
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5192 # 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
5193 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
5194
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5195 # 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
5196 ComparePatientName(u'Wang^XiaoDong=王^小东=', 'Encodings/DavidClunie/SCSX2')
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5197
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5198 # 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
5199 ComparePatientName(u'Wang^XiaoDong=王^小東=', 'Encodings/DavidClunie/SCSX1')
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5200
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5201 # 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
5202 ComparePatientName(u'Yamada^Tarou=山田^太郎=やまだ^たろう', 'Encodings/DavidClunie/SCSH31')
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5203
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5204 # 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
5205 ComparePatientName(u'Äneas^Rüdiger', 'Encodings/DavidClunie/SCSGERM')
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5206
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5207 # 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
5208 ComparePatientName(u'Διονυσιος', 'Encodings/DavidClunie/SCSGREEK')
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5209
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5210 # 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
5211 ComparePatientName(u'Люкceмбypг', 'Encodings/DavidClunie/SCSRUSS')
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5212
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5213 # 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
5214 # NB: Hebrew is a right-to-left encoding, copying/pasting from
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5215 # Linux console into Emacs automatically reverse the string
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5216 ComparePatientName(u'שרון^דבורה', 'Encodings/DavidClunie/SCSHBRW')
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 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
5219 # 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
5220 # characters by default, but copy/paste works with Emacs
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5221 ComparePatientName(u'قباني^لنزار', 'Encodings/DavidClunie/SCSARAB')
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 # SCSH32: This SpecificCharacterSet is composed of 2
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5224 # codepages: "ISO 2022 IR 13" (i.e. "SHIFT_JIS") until the
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5225 # 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
5226 # remainer. Orthanc only takes into consideration the first
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5227 # codepage: This is a limitation.
a491d5ec370a test encodings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 215
diff changeset
5228 # 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
5229 self.assertTrue(GetPatientName('Encodings/DavidClunie/SCSH32').startswith(u'ヤマダ^タロウ='))
218
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
5230
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
5231
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
5232 def test_findscu_missing_tags(self):
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
5233 # dcmodify -e Rows DummyCTInvalidRows.dcm -gst -gse -gin
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
5234 UploadInstance(_REMOTE, 'DummyCT.dcm')
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
5235 UploadInstance(_REMOTE, 'DummyCTInvalidRows.dcm')
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 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
5238
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
5239 # We have 2 instances...
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
5240 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i)
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
5241 self.assertEqual(2, len(patientNames))
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
5242 self.assertEqual('KNIX', patientNames[0])
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
5243 self.assertEqual('KNIX', patientNames[1])
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
5244
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
5245 # ...but only 1 value for the "Rows" tag
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
5246 rows = re.findall('\(0028,0010\) US ([0-9]+)', i)
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
5247 self.assertEqual(1, len(rows))
70fba41776be test_findscu_missing_tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 217
diff changeset
5248 self.assertEqual('512', rows[0])
219
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5249
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5250
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5251
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5252 def test_bitbucket_issue_131(self):
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5253 # "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
5254 # StudyInstanceUID in it's database."
319
de6e73e4df60 leaving bitbucket
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
5255 # 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
5256
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5257 # Insert 2 instances, with the same StudyInstanceUID, but with
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5258 # different patient IDs. Orthanc will create 2 distincts
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5259 # patients, and the hierarchy of resources above the two
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5260 # instances will be fully disjoint.
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5261 UploadInstance(_REMOTE, 'PatientIdsCollision/Issue131-a.dcm')
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5262 UploadInstance(_REMOTE, 'PatientIdsCollision/Issue131-b.dcm')
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5263
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5264 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5265 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5266
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5267 a = DoPost(_REMOTE, '/modalities/self/query', {
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5268 'Level' : 'Study',
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5269 'Query' : {"PatientID": "A" }})['ID']
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5270
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5271 # 1 study is matched
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5272 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
5273
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5274 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
5275 WaitAllNewJobsDone(_REMOTE, lambda: DoPost
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
5276 (_REMOTE, '/queries/%s/retrieve' % a,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
5277 '{"TargetAet":"ORTHANCTEST","Synchronous":false}'))
219
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 # 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
5280 # 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
5281 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5282
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 # Match the 2 studies
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5285 a = DoPost(_REMOTE, '/modalities/self/query', {
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5286 'Level' : 'Study',
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5287 'Query' : {"StudyInstanceUID": "2.25.123" }})['ID']
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5288 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
5289 DropOrthanc(_LOCAL)
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5290 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
5291 WaitAllNewJobsDone(_REMOTE, lambda: DoPost
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
5292 (_REMOTE, '/queries/%s/retrieve' % a,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
5293 '{"TargetAet":"ORTHANCTEST","Synchronous":false}'))
219
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5294 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5295
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5296
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5297 # 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
5298 a = DoPost(_REMOTE, '/modalities/self/query', {
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5299 'Level' : 'Patient',
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5300 'Query' : {"PatientID": "A" }})['ID']
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5301 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
5302 DropOrthanc(_LOCAL)
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5303 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
5304 WaitAllNewJobsDone(_REMOTE, lambda: DoPost
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
5305 (_REMOTE, '/queries/%s/retrieve' % a,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
5306 '{"TargetAet":"ORTHANCTEST","Synchronous":false}'))
219
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5307 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5308
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5309
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5310 # 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
5311 a = DoPost(_REMOTE, '/modalities/self/query', {
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5312 'Level' : 'Series',
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5313 'Query' : {"PatientID": "A" }})['ID']
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5314 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
5315 DropOrthanc(_LOCAL)
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5316 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
5317 WaitAllNewJobsDone(_REMOTE, lambda: DoPost
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
5318 (_REMOTE, '/queries/%s/retrieve' % a,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 219
diff changeset
5319 '{"TargetAet":"ORTHANCTEST","Synchronous":false}'))
219
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5320 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
00e5aeea33dd test_bitbucket_issue_131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 218
diff changeset
5321
233
ce0b19a2c807 test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 231
diff changeset
5322
ce0b19a2c807 test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 231
diff changeset
5323 def test_bitbucket_issue_136(self):
ce0b19a2c807 test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 231
diff changeset
5324 UploadInstance(_REMOTE, 'Issue137.dcm')
ce0b19a2c807 test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 231
diff changeset
5325 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
5326 patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i)
ce0b19a2c807 test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 231
diff changeset
5327 self.assertEqual(1, len(patientNames))
ce0b19a2c807 test_bitbucket_issue_136
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 231
diff changeset
5328 self.assertEqual('John Doe', patientNames[0])
234
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5329
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5330
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5331 def test_anonymize_relationships_4(self):
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5332 # 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
5333 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
5334 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
5335 study = '0c923249-d52121a9-2b7167f7-6b85534f-0943697e'
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5336
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5337 anonymized = DoPost(_REMOTE, '/studies/%s/anonymize' % study, '{}',
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5338 'application/json')['ID']
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5339 series = DoGet(_REMOTE, '/studies/%s/series' % anonymized)
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5340 self.assertEqual(2, len(series))
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 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
5343 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
5344 self.assertEqual(1, len(cr))
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5345 self.assertEqual(1, len(pr))
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5346 self.assertEqual(1, len(cr[0]['Instances']))
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5347 self.assertEqual(1, len(pr[0]['Instances']))
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5348
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5349 crinstance = DoGet(_REMOTE, '/instances/%s' % cr[0]['Instances'][0])
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5350 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
5351
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5352 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
5353 crinstance['MainDicomTags']['SOPInstanceUID'])
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5354 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
5355 '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
5356
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5357 # This fails on Orthanc <= 1.5.6
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5358 self.assertEqual(tags['0008,1115'][0]['0020,000e'],
93cd4fdd4a67 test_anonymize_relationships_4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 233
diff changeset
5359 cr[0]['MainDicomTags']['SeriesInstanceUID'])
235
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5360
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5361
255
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5362 def test_anonymize_relationships_5(self):
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5363 ct1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/CT01.dcm')
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5364 rt1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/RT.dcm')
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5365 oStudyId = ct1['ParentStudy']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5366 oCtInstanceId = ct1['ID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5367 oRtInstanceId = rt1['ID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5368
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5369 oCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oCtInstanceId)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5370 oRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oRtInstanceId)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5371
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5372 # first validate the relationships in the source data
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5373 oStudyUID = oCtTags['StudyInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5374 oRtSeriesUID = oRtTags['SeriesInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5375 oRtInstanceUID = oRtTags['SOPInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5376 oRtFrameOfReferenceUID = oRtTags['ReferencedFrameOfReferenceSequence'][0]['FrameOfReferenceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5377 oCtSeriesUID = oCtTags['SeriesInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5378 oCtInstanceUID = oCtTags['SOPInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5379 oCtFrameOfReferenceUID = oCtTags['FrameOfReferenceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5380
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5381 oContourSequenceCount = len(oRtTags['ROIContourSequence'][0]['ContourSequence'])
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5382 self.assertEqual(oCtFrameOfReferenceUID, oRtFrameOfReferenceUID)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5383 self.assertEqual(oStudyUID, oRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['ReferencedSOPInstanceUID'])
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5384 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
5385 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
5386 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
5387
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5388 ### anonymize
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5389
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5390 aStudyId = DoPost(_REMOTE, '/studies/%s/anonymize' % oStudyId, '{}',
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5391 'application/json')['ID']
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 ### validate
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 aSeries = DoGet(_REMOTE, '/studies/%s/series' % aStudyId)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5396 self.assertEqual(2, len(aSeries))
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 aCt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'CT', aSeries))
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5399 aRt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'RTSTRUCT', aSeries))
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5400 aCtInstanceId = aCt[0]['Instances'][0]
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5401 aRtInstanceId = aRt[0]['Instances'][0]
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5402 aCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aCtInstanceId)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5403 aRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aRtInstanceId)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5404
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5405 # now validate the relationships in the anonymized data
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5406 aStudyUID = aCtTags['StudyInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5407 aRtSeriesUID = aRtTags['SeriesInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5408 aRtInstanceUID = aRtTags['SOPInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5409 aRtFrameOfReferenceUID = aRtTags['ReferencedFrameOfReferenceSequence'][0]['FrameOfReferenceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5410 aCtSeriesUID = aCtTags['SeriesInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5411 aCtInstanceUID = aCtTags['SOPInstanceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5412 aCtFrameOfReferenceUID = aCtTags['FrameOfReferenceUID']
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5413
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5414 aContourSequenceCount = len(aRtTags['ROIContourSequence'][0]['ContourSequence'])
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5415 # make sure all UIDs have been updated
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5416 self.assertNotEqual(oStudyUID, aStudyUID)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5417 self.assertNotEqual(oRtSeriesUID, aRtSeriesUID)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5418 self.assertNotEqual(oRtInstanceUID, aRtInstanceUID)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5419 self.assertNotEqual(oRtFrameOfReferenceUID, aRtFrameOfReferenceUID)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5420 self.assertNotEqual(oCtSeriesUID, aCtSeriesUID)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5421 self.assertNotEqual(oCtInstanceUID, aCtInstanceUID)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5422 self.assertNotEqual(oCtFrameOfReferenceUID, aCtFrameOfReferenceUID)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5423
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5424 # validate the relationships
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5425 self.assertEqual(oContourSequenceCount, aContourSequenceCount)
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5426 self.assertEqual(aCtFrameOfReferenceUID, aRtFrameOfReferenceUID)
256
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5427 self.assertEqual(aStudyUID, aRtTags['ReferencedFrameOfReferenceSequence'][0]['RTReferencedStudySequence'][0]['ReferencedSOPInstanceUID'])
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5428 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
5429 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
5430 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
5431
256
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5432 def test_anonymize_relationships_5b(self):
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5433 # same test as previous one but, this time, we force the StudyInstanceUID
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5434 ct1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/CT01.dcm')
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5435 rt1 = UploadInstance(_REMOTE, 'HierarchicalAnonymization/RTH/RT.dcm')
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5436 oStudyId = ct1['ParentStudy']
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5437 oCtInstanceId = ct1['ID']
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5438 oRtInstanceId = rt1['ID']
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5439
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5440 oCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oCtInstanceId)
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5441 oRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % oRtInstanceId)
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5442
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5443 ### anonymize while forcing the StudyInstanceUID
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5444
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5445 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
5446 'application/json')['ID']
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5447
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5448 ### validate
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5449
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5450 aSeries = DoGet(_REMOTE, '/studies/%s/series' % aStudyId)
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5451 self.assertEqual(2, len(aSeries))
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5452
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5453 aCt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'CT', aSeries))
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5454 aRt = list(filter(lambda x: x['MainDicomTags']['Modality'] == 'RTSTRUCT', aSeries))
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5455 aCtInstanceId = aCt[0]['Instances'][0]
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5456 aRtInstanceId = aRt[0]['Instances'][0]
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5457 aCtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aCtInstanceId)
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5458 aRtTags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % aRtInstanceId)
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5459
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5460 self.assertEqual("1.2.3.4", aCtTags['StudyInstanceUID'])
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5461 self.assertEqual("1.2.3.4", aRtTags['StudyInstanceUID'])
397bcd1d16b2 tests for RT-STRUCT anonymization
amazy
parents: 255
diff changeset
5462 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
5463
02c3d91b155c added anonymization test for RTH data (currently failing)
amazy
parents: 254
diff changeset
5464
235
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5465 def test_bitbucket_issue_140(self):
266
b105bb2233c6 fix issue 140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 265
diff changeset
5466 # "Modifying private tags with REST API changes VR from LO to
267
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 266
diff changeset
5467 # 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
5468 # 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
5469 source = UploadInstance(_REMOTE, 'Issue140.dcm') ['ID']
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5470 series = DoGet(_REMOTE, '/instances/%s' % source) ['ParentSeries']
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5471
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5472 target = DoPost(_REMOTE, '/series/%s/modify' % series, {
266
b105bb2233c6 fix issue 140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 265
diff changeset
5473 'Replace' : { 'RadioButton3' : 'aaabbbccc' },
b105bb2233c6 fix issue 140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 265
diff changeset
5474 'PrivateCreator' : 'RadioLogic', # <= the trick is here
235
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5475 }, 'application/json') ['ID']
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 instances = DoGet(_REMOTE, '/series/%s/instances' % target)
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5478 self.assertEqual(1, len(instances))
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5479
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5480 tags = DoGet(_REMOTE, '/instances/%s/tags' % source)
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5481 t = tags['4321,1012']
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5482 self.assertEqual('String', t['Type'])
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5483 self.assertEqual('RadioButton3', t['Name'])
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5484 self.assertEqual('RadioLogic', t['PrivateCreator'])
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5485 self.assertEqual('jklmopq', t['Value'])
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5486
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5487 tags = DoGet(_REMOTE, '/instances/%s/tags' % instances[0]['ID'])
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5488 t = tags['4321,1012']
327
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 326
diff changeset
5489 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
5490 self.assertEqual('RadioButton3', t['Name'])
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5491 self.assertEqual('RadioLogic', t['PrivateCreator'])
9929e4af2b7a test_bitbucket_issue_140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 234
diff changeset
5492 self.assertEqual('aaabbbccc', t['Value'])
236
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5493
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5494
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5495 def test_find_normalize(self):
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5496 # https://groups.google.com/d/msg/orthanc-users/AIwooGjsh94/YL28MNY4AgAJ
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5497
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5498 UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
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 a = DoPost(_REMOTE, '/modalities/self/query', {
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5501 'Level' : 'Instance',
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5502 'Query' : { 'Rows' : '42' }
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5503 }) ['ID']
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 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a)
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5506 self.assertEqual(1, len(b))
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5507 self.assertFalse('Rows' in b[0])
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5508
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5509 a = DoPost(_REMOTE, '/modalities/self/query', {
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5510 'Level' : 'Instance',
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5511 'Query' : { 'Rows' : '42' },
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5512 'Normalize' : False
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5513 }) ['ID']
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5514
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5515 b = DoGet(_REMOTE, '/queries/%s/answers' % a)
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5516 self.assertEqual(0, len(b))
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5517
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5518 a = DoPost(_REMOTE, '/modalities/self/query', {
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5519 'Level' : 'Instance',
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5520 'Query' : { 'Rows' : '512' },
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5521 'Normalize' : False
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5522 }) ['ID']
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5523
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5524 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a)
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5525 self.assertEqual(1, len(b))
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5526 self.assertTrue('Rows' in b[0])
2de1aec255ae test_find_normalize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 235
diff changeset
5527 self.assertEqual('512', b[0]['Rows'])
237
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5528
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5529 a = DoPost(_REMOTE, '/modalities/self/query', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5530 'Level' : 'Instance',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5531 'Query' : { 'Rows' : '' },
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5532 'Normalize' : False
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5533 }) ['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5534
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5535 b = DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5536 self.assertEqual(1, len(b))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5537 self.assertTrue('Rows' in b[0])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5538 self.assertEqual('512', b[0]['Rows'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5539
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5540 self.assertRaises(Exception, lambda: DoPost(
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5541 _REMOTE, '/modalities/self/query', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5542 'Level' : 'Instance',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5543 'Query' : { 'Rows' : '*' }, # Out-of-range value
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5544 'Normalize' : False
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 236
diff changeset
5545 }))
243
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
5546
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
5547
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
5548 def test_bitbucket_issue_141(self):
319
de6e73e4df60 leaving bitbucket
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
5549 # 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
5550 a = UploadInstance(_REMOTE, 'Issue141.dcm') ['ID']
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
5551 study = '494c8037-b237f263-d8f15075-c8cb2280-daf39bd1'
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 with open(GetDatabasePath('HelloWorld.pdf'), 'rb') as f:
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
5554 pdf = f.read()
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
5555
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
5556 b = DoPost(_REMOTE, '/tools/create-dicom', {
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
5557 'Parent' : study,
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
5558 'Tags' : {},
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
5559 'Content' : 'data:application/pdf;base64,' + base64.b64encode(pdf)
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
5560 }) ['ID']
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
5561
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
5562 tagsA = DoGet(_REMOTE, '/instances/%s/tags?short' % a)
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
5563 tagsB = DoGet(_REMOTE, '/instances/%s/tags?short' % b)
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
5564 self.assertEqual(tagsA['0008,0005'], tagsB['0008,0005'])
cccf697a4e13 test_bitbucket_issue_141
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
5565 self.assertEqual(tagsA['0008,1030'], tagsB['0008,1030'])
247
1abdab0ba0e6 test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 243
diff changeset
5566
1abdab0ba0e6 test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 243
diff changeset
5567
1abdab0ba0e6 test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 243
diff changeset
5568 def test_modifying_missing_patientid(self):
1abdab0ba0e6 test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 243
diff changeset
5569 # 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
5570 UploadInstance(_REMOTE, '2019-06-17-VedranZdesic.dcm')
1abdab0ba0e6 test_modifying_missing_patientid
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 243
diff changeset
5571 DoPost(_REMOTE, '/studies/0c4aca1d-c107a241-6659d6aa-594c674a-a468b94a/modify', {})
262
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5572
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5573
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5574 def test_log_level(self):
319
de6e73e4df60 leaving bitbucket
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
5575 # 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
5576 original = DoGet(_REMOTE, '/tools/log-level')
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 DoPut(_REMOTE, '/tools/log-level', 'default')
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5579 self.assertEqual('default', DoGet(_REMOTE, '/tools/log-level'))
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5580 DoGet(_REMOTE, '/system')
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5581
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5582 DoPut(_REMOTE, '/tools/log-level', 'verbose')
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5583 self.assertEqual('verbose', DoGet(_REMOTE, '/tools/log-level'))
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5584 DoGet(_REMOTE, '/system')
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5585
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5586 DoPut(_REMOTE, '/tools/log-level', 'trace')
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5587 self.assertEqual('trace', DoGet(_REMOTE, '/tools/log-level'))
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5588 DoGet(_REMOTE, '/system')
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5589
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5590 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/tools/log-level', 'nope'))
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5591
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5592 # Switch back to the original log level
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5593 DoPut(_REMOTE, '/tools/log-level', original)
264
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
5594
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
5595
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
5596 def test_upload_compressed(self):
265
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5597 # New in Orthanc 1.6.0
264
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
5598 with open(GetDatabasePath('DummyCT.dcm.gz'), 'rb') as f:
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
5599 d = f.read()
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 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances', d, 'application/dicom'))
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
5602
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
5603 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/instances', d, 'application/dicom',
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
5604 headers = { 'Content-Encoding' : 'nope' }))
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 a = DoPost(_REMOTE, '/instances', d, 'application/dicom',
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
5607 headers = { 'Content-Encoding' : 'gzip' })
445f498bc1d4 test_upload_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
5608 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', a['ID'])
262
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5609
045a45c3f945 test_log_level
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 260
diff changeset
5610
263
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5611 def test_study_series_find_inconsistency(self):
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5612 # 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
5613
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5614 def CountAnswers(query):
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5615 a = DoPost(_REMOTE, 'modalities/self/query', query)
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5616 return len(DoGet(_REMOTE, '%s/answers' % a['Path']))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5617
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5618 # 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
5619 # "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
5620 # the "main DICOM tags" of Orthanc.
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5621 UploadInstance(_REMOTE, 'Issue137.dcm')
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
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5624 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5625 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5626 }))
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 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5629 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5630 }))
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 ##
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5634 ## "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
5635 ## 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
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 # 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
5639 # is wiped out by the normalization
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5640 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5641 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5642 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5643 'SeriesDescription' : 'NOPE'
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5644 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5645 'Normalize' : False
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5646 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5647 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5648 # This test fails on Orthanc <= 1.5.8
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5649 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5650 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5651 '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
5652 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5653 'Normalize' : False
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5654 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5655 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5656 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5657 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5658 'SeriesDescription' : 'THIS^VALUE^IS^WIPED^OUT'
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 'Normalize' : True
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5661 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5662 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5663 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5664 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5665 'SeriesDescription' : '*' # Matches, as wiped out by the normalization
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 'Normalize' : True
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5668 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5669
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5670 for normalize in [ True, False ]:
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5671 # 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
5672 # normalization has no effect
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 # "Universal matching" will match all entities, including
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5675 # those with the missing tag
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5676 # 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
5677 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5678 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5679 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5680 'SeriesDescription' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5681 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5682 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5683 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5684 # "Universal matching" will match all entities, including
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5685 # those with the missing tag
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5686 # 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
5687 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5688 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5689 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5690 'SeriesDescription' : '*' # Wildcard matching
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5691 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5692 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5693 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5694 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5695 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5696 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5697 '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
5698 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5699 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5700 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5701 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5702 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5703 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5704 'SeriesDescription' : '*MISMATCHED^VALUE*'
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 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5707 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5708
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5709 # Universal matching matches any instance, even if the
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5710 # 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
5711 # makes no sense
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5712 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5713 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5714 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5715 'SeriesDescription' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5716 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5717 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5718 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5719
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5720
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 ##
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5723 ## "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
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 # 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
5727 # is wiped out by the normalization
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5728 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5729 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5730 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5731 'ProtocolName' : 'NOPE'
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5732 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5733 'Normalize' : False
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5734 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5735 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5736 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5737 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5738 '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
5739 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5740 'Normalize' : False
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5741 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5742 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5743 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5744 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5745 'ProtocolName' : 'THIS^VALUE^IS^WIPED^OUT'
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 'Normalize' : True
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5748 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5749 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5750 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5751 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5752 'ProtocolName' : '*' # Matches, as wiped out by the normalization
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 'Normalize' : True
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5755 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5756
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5757 for normalize in [ True, False ]:
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5758 # 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
5759 # normalization has no effect
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 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5762 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5763 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5764 'ProtocolName' : '' # Universal matching
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 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5767 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5768 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5769 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5770 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5771 '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
5772 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5773 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5774 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5775 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5776 'Level' : 'Series',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5777 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5778 'ProtocolName' : '*MISMATCHED^VALUE*'
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 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5781 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5782
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5783 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5784 'Level' : 'Study',
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5785 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5786 'ProtocolName' : '' # Universal matching
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 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5789 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5790
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5791
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 ## "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
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 for level in [ 'Study', 'Series' ] :
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5797 for normalize in [ True, False ]:
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5798 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5799 'Level' : level,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5800 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5801 'StudyInstanceUID' : '' # Universal matching
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5802 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5803 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5804 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5805 self.assertEqual(0, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5806 'Level' : level,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5807 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5808 'StudyInstanceUID' : 'MISMATCHED^VALUE'
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 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5811 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5812 self.assertEqual(1, CountAnswers({
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5813 'Level' : level,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5814 'Query' : {
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5815 '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
5816 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5817 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5818 }))
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5819
269
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
5820 # 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
5821 # This test fails on Orthanc <= 1.5.8
269
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
5822 self.assertRaises(Exception, lambda: CountAnswers({
263
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5823 'Level' : level,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5824 'Query' : {
269
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
5825 'StudyInstanceUID' : '*'
263
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5826 },
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5827 'Normalize' : normalize,
a2719263fd04 test_study_series_find_inconsistency
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 262
diff changeset
5828 }))
265
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5829
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5830
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5831 def test_rendered(self):
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5832 # New in Orthanc 1.6.0
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5833 i = UploadInstance(_REMOTE, 'ColorTestMalaterre.dcm')['ID']
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5834 im = GetImage(_REMOTE, '/instances/%s/rendered' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5835 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5836 self.assertEqual(41, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5837 self.assertEqual(41, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5838
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5839 # http://effbot.org/zone/pil-comparing-images.htm
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5840 truth = Image.open(GetDatabasePath('ColorTestMalaterre.png'))
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5841 self.assertTrue(ImageChops.difference(im, truth).getbbox() is None)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5842
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5843 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5844 self.assertEqual("RGB", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5845 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5846 self.assertEqual(10, im.size[1])
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?height=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=128' % 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(128, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5856 self.assertEqual(128, 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=10&smooth=0' % 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(10, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5861 self.assertEqual(10, 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=1' % 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=5&width=10' % 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(5, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5871 self.assertEqual(5, 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
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5874 # Grayscale image
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5875 i = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5876 im = GetImage(_REMOTE, '/instances/%s/rendered' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5877 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5878 self.assertEqual(288, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5879 self.assertEqual(288, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5880 self.assertEqual(0, im.getpixel((0, 0)))
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5881
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5882 # Those are the original windowing parameters that are written
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5883 # inside the DICOM file
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5884 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
5885 self.assertEqual("L", im2.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5886 self.assertEqual(288, im2.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5887 self.assertEqual(288, im2.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5888 self.assertTrue(ImageChops.difference(im, im2).getbbox() is None)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5889
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5890 im = GetImage(_REMOTE, '/instances/%s/rendered?width=512&smooth=0' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5891 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5892 self.assertEqual(512, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5893 self.assertEqual(512, im.size[1])
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=10&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(10, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5898 self.assertEqual(10, 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=1' % 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=1&window-center=-1000' % 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(1, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5908 self.assertEqual(1, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5909 self.assertEqual(255, im.getpixel((0, 0)))
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5910
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5911 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
5912 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5913 self.assertEqual(1, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5914 self.assertEqual(1, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5915 self.assertEqual(0, im.getpixel((0, 0)))
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5916
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5917
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5918 # Test monochrome 1
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5919 i = UploadInstance(_REMOTE, 'Issue44/Monochrome1.dcm')['ID']
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5920 im = GetImage(_REMOTE, '/instances/%s/rendered' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5921 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5922 self.assertEqual(2010, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5923 self.assertEqual(2446, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5924 self.assertEqual(0, im.getpixel((0, 0)))
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5925 im = GetImage(_REMOTE, '/instances/%s/rendered?width=20' % 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(20, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5928 self.assertEqual(24, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5929 im = GetImage(_REMOTE, '/instances/%s/rendered?height=24' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5930 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5931 self.assertEqual(20, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5932 self.assertEqual(24, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5933 im = GetImage(_REMOTE, '/instances/%s/rendered?width=10&height=24' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5934 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5935 self.assertEqual(10, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5936 self.assertEqual(12, im.size[1])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5937 im = GetImage(_REMOTE, '/instances/%s/rendered?width=40&height=24' % i)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5938 self.assertEqual("L", im.mode)
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5939 self.assertEqual(20, im.size[0])
8d63d035b837 test_rendered
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
5940 self.assertEqual(24, im.size[1])
268
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5941
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5942
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5943 def test_bitbucket_issue_154(self):
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5944 # "Matching against list of UID-s by C-MOVE"
319
de6e73e4df60 leaving bitbucket
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 318
diff changeset
5945 # 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
5946 a = UploadInstance(_REMOTE, 'Issue154-d1.dcm') ['ID']
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5947 b = UploadInstance(_REMOTE, 'Issue154-d2.dcm') ['ID']
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5948
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5949 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
5950 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
5951 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
5952
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5953 # C-FIND is working on list of UIDs
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5954 i = CallFindScu([ '-k', 'QueryRetrieveLevel=SERIES',
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5955 '-k', 'StudyInstanceUID=%s' % study,
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5956 '-k', 'SeriesInstanceUID=%s\\%s' % (series1, series2) ])
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5957 series = re.findall('\(0020,000e\).*?\[(.*?)\]', i)
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5958 self.assertEqual(2, len(series))
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5959 self.assertTrue(series1 in series)
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5960 self.assertTrue(series2 in series)
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5961
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5962 # Individual retrieval is working in Orthanc < 1.6.0
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5963 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5964 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5965 '--study', '-k', 'QueryRetrieveLevel=SERIES',
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5966 '-k', 'StudyInstanceUID=%s' % study,
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5967 '-k', 'SeriesInstanceUID=%s' % series1,
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5968 ])))
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' % series2,
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.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5975
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5976 DropOrthanc(_LOCAL)
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5977
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5978 # 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
5979 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5980 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5981 '--study', '-k', 'QueryRetrieveLevel=SERIES',
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5982 '-k', 'StudyInstanceUID=%s' % study,
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5983 '-k', 'SeriesInstanceUID=%s\\%s' % (series1, series2),
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5984 ])))
c8d79d8258cd test_bitbucket_issue_154
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 267
diff changeset
5985 self.assertEqual(2, len(DoGet(_LOCAL, '/instances')))
279
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5986
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5987
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5988 def test_storage_commitment_api(self):
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
5989 # 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
5990
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5991 def WaitTransaction(uid):
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5992 while True:
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5993 s = DoGet(_REMOTE, '/storage-commitment/%s' % uid)
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5994 if s['Status'] != 'Pending':
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5995 return s
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5996 else:
342
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
5997 time.sleep(0.01)
280
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
5998
281
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
5999 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')
279
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6000 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
6001 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
6002
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6003 # Against self
281
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6004 transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6005 "DicomInstances" : [ [ sopClassUid, sopInstanceUid ] ],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6006 }) ['ID']
279
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6007 self.assertTrue(transaction.startswith('2.25.'))
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6008
280
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6009 result = WaitTransaction(transaction)
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6010 self.assertEqual('ORTHANC', result['RemoteAET'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6011 self.assertEqual('Success', result['Status'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6012 self.assertEqual(1, len(result['Success']))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6013 self.assertEqual(0, len(result['Failures']))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6014 self.assertEqual(sopClassUid, result['Success'][0]['SOPClassUID'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6015 self.assertEqual(sopInstanceUid, result['Success'][0]['SOPInstanceUID'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6016
281
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6017 tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6018 "DicomInstances" : [
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6019 { 'SOPClassUID' : sopClassUid,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6020 'SOPInstanceUID' : sopInstanceUid },
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6021 ],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6022 })
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6023 self.assertEqual(tmp['Path'], '/storage-commitment/%s' % tmp['ID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6024 self.assertEqual(result, WaitTransaction(transaction))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6025
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6026 tmp = DoPost(_REMOTE, '/modalities/self/storage-commitment', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6027 "Resources" : [
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6028 instance['ID'],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6029 instance['ParentSeries'],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6030 instance['ParentStudy'],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6031 instance['ParentPatient'],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6032 ]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6033 })
280
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6034 self.assertEqual(tmp['Path'], '/storage-commitment/%s' % tmp['ID'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6035 self.assertEqual(result, WaitTransaction(transaction))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6036
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6037
281
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6038 transaction = DoPost(_REMOTE, '/modalities/self/storage-commitment', {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6039 "DicomInstances" : [
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6040 [ 'nope', 'nope2' ],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6041 [ sopClassUid, sopInstanceUid ],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6042 ],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 280
diff changeset
6043 }) ['ID']
279
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6044 self.assertTrue(transaction.startswith('2.25.'))
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6045
280
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6046 result = WaitTransaction(transaction)
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6047 self.assertEqual('ORTHANC', result['RemoteAET'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6048 self.assertEqual('Failure', result['Status'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6049 self.assertEqual(1, len(result['Success']))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6050 self.assertEqual(1, len(result['Failures']))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6051 self.assertEqual(sopClassUid, result['Success'][0]['SOPClassUID'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6052 self.assertEqual(sopInstanceUid, result['Success'][0]['SOPInstanceUID'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6053 self.assertEqual('nope', result['Failures'][0]['SOPClassUID'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6054 self.assertEqual('nope2', result['Failures'][0]['SOPInstanceUID'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6055 self.assertEqual(274, result['Failures'][0]['FailureReason'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6056
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6057 # Cannot remove items from a failed storage commitment transaction
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6058 self.assertRaises(Exception, lambda:
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6059 DoPost(_REMOTE, '/storage-commitment/%s/remove' % transaction))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6060
279
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6061
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6062 # 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
6063 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
6064 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
6065 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
6066 "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
6067 [ 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
6068 ]
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 }))
279
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6070
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6071
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6072
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6073 def test_storage_commitment_store(self):
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6074 # 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
6075
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6076 def WaitTransaction(uid):
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6077 while True:
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6078 s = DoGet(_REMOTE, '/storage-commitment/%s' % uid)
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6079 if s['Status'] != 'Pending':
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6080 return s
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6081 else:
342
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
6082 time.sleep(0.01)
280
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6083
279
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6084 i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6085 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6086 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6087
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6088 # 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
6089 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
6090 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
6091 '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
6092 '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
6093 }))
279
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6094
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6095 j = DoPost(_REMOTE, '/modalities/orthanctest/store', {
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6096 'Resources' : [ i ],
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6097 'StorageCommitment' : False,
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6098 })
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6099 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6100
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6101 j = DoPost(_REMOTE, '/modalities/self/store', {
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6102 'Resources' : [ i ],
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6103 'StorageCommitment' : True,
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6104 })
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 transaction = j['StorageCommitmentTransactionUID']
31e1e49df380 starting tests for storage commitment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
6107 self.assertTrue(transaction.startswith('2.25.'))
280
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6108
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6109 result = WaitTransaction(transaction)
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6110 self.assertEqual('ORTHANC', result['RemoteAET'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6111 self.assertEqual('Success', result['Status'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6112 self.assertEqual(1, len(result['Success']))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6113 self.assertEqual(0, len(result['Failures']))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6114 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
6115 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
6116 result['Success'][0]['SOPInstanceUID'])
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6117
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6118 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6119 DoPost(_REMOTE, '/storage-commitment/%s/remove' % transaction)
5daa3896981c testing storage commitment reports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 279
diff changeset
6120 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
285
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
6121
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
6122
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
6123 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
6124 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
6125 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
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 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f:
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
6128 dicom = f.read()
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
6129
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
6130 self.assertRaises(Exception, lambda: DoPost(
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
6131 _REMOTE, '/modalities/orthanctest/store-straight', 'nope', 'nope'))
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
6132
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
6133 answer = DoPost(_REMOTE, '/modalities/orthanctest/store-straight', dicom, 'nope')
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.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
6136 answer['SOPClassUID'])
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
6137 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
6138 answer['SOPInstanceUID'])
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, len(DoGet(_LOCAL, '/instances')))
281a32ecc5c1 test_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 281
diff changeset
6141 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
289
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6142
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6143
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6144 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
6145 # Add a RLE-encoded DICOM file
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6146 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
6147 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6148 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6149 rleSize = len(DoGet(_REMOTE, '/instances/%s/file' % i))
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6150
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6151 # Export the instance, with transcoding: "_REMOTE" is the
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6152 # Orthanc server being tested
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6153 try:
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6154 DoDelete(_REMOTE, '/modalities/toto')
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6155 except:
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6156 pass
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6157
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6158 params = DoGet(_REMOTE, '/modalities?expand') ['orthanctest']
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6159 DoPut(_REMOTE, '/modalities/toto', params)
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6160 DoPost(_REMOTE, '/modalities/toto/store', str(i), 'text/plain')
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6161 j = DoGet(_LOCAL, '/instances')
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6162 self.assertEqual(1, len(j))
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6163 uncompressedSize = len(DoGet(_LOCAL, '/instances/%s/file' % j[0]))
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6164 self.assertTrue(uncompressedSize > rleSize / 2)
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6165
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
6166 # 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
6167 params['AllowTranscoding'] = False
4a70411ac9ad test_storescu_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 285
diff changeset
6168 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
6169 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
6170 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
6171 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
6172 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
6173 DoDelete(_REMOTE, '/modalities/toto')
290
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6174
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6175
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6176 def test_bitbucket_issue_169(self):
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6177 with open(GetDatabasePath('Issue169.dcm.bz2'), 'rb') as f:
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6178 dicom = bz2.decompress(f.read())
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 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
6181
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6182 self.assertEqual(44350560, len(dicom))
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6183 i = DoPost(_REMOTE, '/instances', dicom, 'application/dicom') ['ID']
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 tags = DoGet(_REMOTE, '/instances/%s/tags' % i)
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6186 self.assertEqual('NORMAL', tags['1337,1001']['Value'])
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6187
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6188 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6189 DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain')
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6190 j = DoGet(_LOCAL, '/instances')
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6191 self.assertEqual(1, len(j))
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 # 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
6194 # 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
6195 # Little Endian" (1.2.840.10008.1.2)
291
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
6196 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
6197 DoGet(_LOCAL, '/instances/%s/file' % j[0])))
290
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6198
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6199 # 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
6200 # because of this transcoding
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6201 tags = DoGet(_LOCAL, '/instances/%s/tags' % j[0])
b5333f87065b test_bitbucket_issue_169
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 289
diff changeset
6202 self.assertEqual('NORMAL', tags['1337,1001']['Value'])
291
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
6203
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
6204
302
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
6205 def test_modify_transcode_instance(self):
291
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
6206 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
6207 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
6208 DoGet(_REMOTE, '/instances/%s/file' % i)))
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
6209
299
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6210 a = ExtractDicomTags(DoGet(_REMOTE, '/instances/%s/file' % i), [ 'SOPInstanceUID' ]) [0]
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6211 self.assertTrue(len(a) > 20)
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6212
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6213 SYNTAXES = [
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6214 '1.2.840.10008.1.2',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6215 '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
6216 #'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
6217 '1.2.840.10008.1.2.2',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6218 '1.2.840.10008.1.2.4.50',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6219 '1.2.840.10008.1.2.4.51',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6220 '1.2.840.10008.1.2.4.57',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6221 '1.2.840.10008.1.2.4.70',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6222 ]
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6223
304
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 302
diff changeset
6224 if HasGdcmPlugin(_REMOTE):
299
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6225 SYNTAXES = SYNTAXES + [
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6226 '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
6227 '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
6228 '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
6229 '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
6230 ]
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6231
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6232 for syntax in SYNTAXES:
291
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
6233 transcoded = DoPost(_REMOTE, '/instances/%s/modify' % i, {
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
6234 'Transcode' : syntax,
299
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6235 'Keep' : [ 'SOPInstanceUID' ],
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6236 'Force' : True,
291
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
6237 })
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
6238
cfa785074c64 test_modify_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 290
diff changeset
6239 self.assertEqual(syntax, GetTransferSyntax(transcoded))
292
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6240
299
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6241 b = ExtractDicomTags(transcoded, [ 'SOPInstanceUID' ]) [0]
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6242 self.assertTrue(len(b) > 20)
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6243 if syntax in [ '1.2.840.10008.1.2.4.50',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6244 '1.2.840.10008.1.2.4.51',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6245 '1.2.840.10008.1.2.4.81',
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6246 '1.2.840.10008.1.2.4.91' ]:
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6247 # Lossy transcoding: The SOP instance UID must have changed
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6248 self.assertNotEqual(a, b)
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6249 else:
c2144cf4bd83 HasGdcmPlugin() test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 293
diff changeset
6250 self.assertEqual(a, b)
292
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6251
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6252 def test_archive_transcode(self):
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6253 info = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6254
293
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6255 # GET on "/media"
292
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6256 z = GetArchive(_REMOTE, '/patients/%s/media' % info['ParentPatient'])
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6257 self.assertEqual(2, len(z.namelist()))
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6258 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
6259
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6260 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
6261
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6262 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
6263 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
6264
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6265 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
6266 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
6267
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6268 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
6269 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
6270
293
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6271
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6272 # POST on "/media"
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6273 self.assertRaises(Exception, lambda: PostArchive(
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6274 _REMOTE, '/patients/%s/media' % info['ParentPatient'], { 'Transcode' : 'nope' }))
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6275
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6276 z = PostArchive(_REMOTE, '/patients/%s/media' % info['ParentPatient'], {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6277 'Transcode' : '1.2.840.10008.1.2.4.50',
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6278 })
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6279 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
6280
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6281 z = PostArchive(_REMOTE, '/studies/%s/media' % info['ParentStudy'], {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6282 'Transcode' : '1.2.840.10008.1.2.4.51',
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.51', 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, '/series/%s/media' % info['ParentSeries'], {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6287 'Transcode' : '1.2.840.10008.1.2.4.57',
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.57', 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
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6292 # GET on "/archive"
292
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6293 z = GetArchive(_REMOTE, '/patients/%s/archive' % info['ParentPatient'])
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6294 self.assertEqual(1, len(z.namelist()))
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6295 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
6296
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6297 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
6298
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6299 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
6300 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
6301
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6302 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
6303 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
6304
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6305 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
6306 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
6307
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6308
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6309 # POST on "/archive"
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6310 self.assertRaises(Exception, lambda: PostArchive(
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6311 _REMOTE, '/patients/%s/archive' % info['ParentPatient'], { 'Transcode' : 'nope' }))
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 z = PostArchive(_REMOTE, '/patients/%s/archive' % info['ParentPatient'], {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6314 'Transcode' : '1.2.840.10008.1.2.4.50',
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6315 })
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6316 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
6317
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6318 z = PostArchive(_REMOTE, '/studies/%s/archive' % info['ParentStudy'], {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6319 'Transcode' : '1.2.840.10008.1.2.4.51',
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.51', 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, '/series/%s/archive' % info['ParentSeries'], {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6324 'Transcode' : '1.2.840.10008.1.2.4.57',
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.57', GetTransferSyntax(z.read(z.namelist()[0])))
292
e1827a4f5d3b test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 291
diff changeset
6327
293
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6328
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6329 # "/tools/create-*"
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6330 z = PostArchive(_REMOTE, '/tools/create-archive', {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6331 'Resources' : [ info['ParentStudy'] ],
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6332 'Transcode' : '1.2.840.10008.1.2.4.50',
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 self.assertEqual(1, len(z.namelist()))
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6335 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
6336
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6337 z = PostArchive(_REMOTE, '/tools/create-media', {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6338 'Resources' : [ info['ParentStudy'] ],
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6339 'Transcode' : '1.2.840.10008.1.2.4.51',
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6340 })
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6341 self.assertEqual(2, len(z.namelist()))
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6342 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
6343
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6344 z = PostArchive(_REMOTE, '/tools/create-media-extended', {
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6345 'Resources' : [ info['ParentStudy'] ],
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6346 'Transcode' : '1.2.840.10008.1.2.4.57',
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6347 })
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6348 self.assertEqual(2, len(z.namelist()))
032722c3e919 extended test_archive_transcode
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 292
diff changeset
6349 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
6350
308
2565d39dd36c integration mainline->c-get
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 307 305
diff changeset
6351
301
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6352 def test_modify_keep_source(self):
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6353 # 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
6354 i = UploadInstance(_REMOTE, 'DummyCT.dcm')
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6355 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6356
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6357 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], {
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6358 'Replace' : {
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6359 'StationName' : 'TEST',
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6360 },
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6361 'KeepSource' : True,
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6362 })
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6363
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6364 s = DoGet(_REMOTE, '/studies')
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6365 self.assertEqual(2, len(s))
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6366 self.assertTrue(i['ParentStudy'] in s)
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6367 self.assertTrue(j['ID'] in s)
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 DoDelete(_REMOTE, '/studies/%s' % j['ID'])
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6370 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6371
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6372 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], {
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6373 'Replace' : {
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6374 'StationName' : 'TEST',
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6375 },
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6376 'KeepSource' : False,
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6377 })
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6378
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6379 s = DoGet(_REMOTE, '/studies')
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6380 self.assertEqual(1, len(s))
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6381 self.assertFalse(i['ParentStudy'] in s)
6652d5720a45 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 300
diff changeset
6382 self.assertTrue(j['ID'] in s)
302
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
6383
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
6384
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
6385 def test_modify_transcode_study(self):
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
6386 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
6387 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
6388 DoGet(_REMOTE, '/instances/%s/file' % i['ID'])))
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 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
6391 j = DoPost(_REMOTE, '/studies/%s/modify' % i['ParentStudy'], {
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
6392 'Transcode' : '1.2.840.10008.1.2.4.50',
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
6393 'KeepSource' : False
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
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
6396 k = DoGet(_REMOTE, '/instances')
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
6397 self.assertEqual(1, len(k))
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
6398 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
6399 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
6400 DoGet(_REMOTE, '/instances/%s/file' % k[0])))
22b6dd0f8c84 test_modify_transcode_study
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 301
diff changeset
6401
305
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6402
498
62f37c13d4d0 new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents: 497
diff changeset
6403 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
6404 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
6405 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
6406 'Replace' : replaceTags,
62f37c13d4d0 new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents: 497
diff changeset
6407 'Force': force,
62f37c13d4d0 new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents: 497
diff changeset
6408 'KeepSource' : keepSource
62f37c13d4d0 new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents: 497
diff changeset
6409 })
62f37c13d4d0 new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents: 497
diff changeset
6410
62f37c13d4d0 new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents: 497
diff changeset
6411 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
6412
62f37c13d4d0 new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents: 497
diff changeset
6413 i = UploadInstance(_REMOTE, 'DummyCT.dcm')
62f37c13d4d0 new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents: 497
diff changeset
6414 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
6415
62f37c13d4d0 new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents: 497
diff changeset
6416 # 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
6417 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
6418 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
6419
62f37c13d4d0 new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents: 497
diff changeset
6420 # 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
6421 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
6422 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
6423
62f37c13d4d0 new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents: 497
diff changeset
6424 # 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
6425 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
6426 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
6427
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 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
6430 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
6431 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
6432 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
6433
500
Alain Mazy <am@osimis.io>
parents: 498
diff changeset
6434 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
6435 # 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
6436 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
6437 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
6438 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
6439
62f37c13d4d0 new tests for modifications after sanity checks cleanup
Alain Mazy <am@osimis.io>
parents: 497
diff changeset
6440
504
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6441 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
6442 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
6443 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
6444
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6445 if dropOrthanc:
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6446 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6447
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6448 UploadFolder(_REMOTE, 'Knee/T1')
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6449 UploadFolder(_REMOTE, 'Knee/T2')
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6450
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6451 if dropOrthanc:
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6452 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
6453
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6454 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
6455 'Replace' : replaceTags,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6456 'Force': force,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6457 'KeepSource' : keepSource
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 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
6460 return (modifyResponse, modifiedResource)
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6461
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6462 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
6463 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
6464 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
6465 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
6466 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
6467 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
6468 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
6469
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6470 ####### study level tests #######
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6471
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6472 # 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
6473 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
6474 'StudyInstanceUID': kneeStudyInstanceUID,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6475 'StudyDescription': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6476 }, force=True, keepSource=True)
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6477 self.assertEqual(kneeStudy, modifyResponse['ID'])
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6478 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
6479
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6480 # 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
6481 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
6482 'StudyInstanceUID': kneeStudyInstanceUID,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6483 'PatientName': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6484 }, force=True, keepSource=True)
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6485 self.assertEqual(kneeStudy, modifyResponse['ID'])
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6486 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
6487 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
6488 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
6489
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6490 # 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
6491 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
6492 'StudyInstanceUID': kneeStudyInstanceUID,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6493 'PatientID': 'TOTO_ID',
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6494 'PatientName': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6495 }, force=True, keepSource=True)
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6496 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
6497 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
6498 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
6499 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
6500 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
6501 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
6502
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6503 ####### series level tests #######
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6504 # 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
6505 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
6506 'SeriesInstanceUID': kneeSeriesInstanceUIDT1,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6507 'StudyInstanceUID': kneeStudyInstanceUID,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6508 'SeriesDescription': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6509 }, force=True, keepSource=True)
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6510 self.assertEqual(kneeSeriesT1, modifyResponse['ID'])
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6511 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
6512 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
6513
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6514
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6515 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
6516 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
6517
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6518 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
6519 patientDicomId = 'TEST_1'
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6520 patientName = 'Test'
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6521 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
6522 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
6523
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6524 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6525 UploadFolder(_REMOTE, 'PatientWith2studies')
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6526
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6527 # 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
6528
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6529 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6530 # 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
6531 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
6532 'Replace' : {'PatientName': "TOTO"},
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6533 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6534 'KeepSource' : True
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6535 }))
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6536
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6537 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6538 # 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
6539 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
6540 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6541 'PatientName': 'TOTO'
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6542 },
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6543 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6544 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6545 })
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6546 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
6547 # 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
6548 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
6549
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6550 # 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
6551 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
6552 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
6553 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
6554 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
6555 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
6556
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6557 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6558 # 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
6559 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6560 UploadFolder(_REMOTE, 'PatientWith2studies')
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 # 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
6563 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
6564 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6565 'PatientName': 'TOTO'
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 'Keep': ['StudyInstanceUID', 'SeriesInstanceUID'],
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6568 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6569 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6570 })
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6571 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
6572 # 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
6573 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
6574
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6575 # 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
6576 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
6577 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
6578 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
6579 # 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
6580 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
6581 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
6582 # 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
6583 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
6584 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
6585
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6586 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6587 # 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
6588 # 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
6589 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
6590 'Replace' : {'PatientName': "TOTO"},
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6591 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6592 'Keep': ['StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID'],
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6593 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6594 }))
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6595
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6596 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6597 # 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
6598 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6599 UploadFolder(_REMOTE, 'PatientWith2studies')
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 # 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
6602 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
6603 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6604 'PatientName': 'TOTO'
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 'Keep': ['StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID'],
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6607 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6608 'KeepSource' : True
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6609 })
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6610 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
6611 # 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
6612 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
6613
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6614 # 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
6615 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
6616 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
6617 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
6618 # 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
6619 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
6620 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
6621 # 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
6622 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
6623 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
6624
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6625
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6626 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6627 # 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
6628 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6629 UploadFolder(_REMOTE, 'PatientWith2studies')
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6630 UploadFolder(_REMOTE, 'Knee/T1')
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6631
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6632 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
6633
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6634 # 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
6635
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6636 # 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
6637 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
6638 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6639 'PatientID': 'TEST_1'
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 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6642 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6643 }))
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6644
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6645 # 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
6646 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
6647 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6648 'PatientID': 'TEST_1',
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6649 'PatientName': 'Test',
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6650 'PatientBirthDate': '19000101',
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6651 'PatientSex': 'F' # this is wrong !
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6652 },
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6653 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6654 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6655 }))
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6656
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6657 # 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
6658 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
6659 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6660 'PatientID': 'TEST_1',
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6661 'PatientName': 'Test',
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6662 'PatientBirthDate': '19000101',
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6663 'PatientSex': 'M',
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6664 '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
6665 },
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6666 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6667 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6668 }))
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6669
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6670 # 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
6671 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
6672 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6673 'PatientID': 'TEST_1',
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6674 'PatientName': 'Test',
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6675 'PatientBirthDate': '19000101',
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6676 'PatientSex': 'M'
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6677 },
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6678 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6679 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6680 })
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6681 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
6682 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
6683 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
6684 # 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
6685 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
6686
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6687
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6688 if True:
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6689 # 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
6690 DropOrthanc(_REMOTE)
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6691 UploadFolder(_REMOTE, 'PatientWith2studies')
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6692 UploadFolder(_REMOTE, 'Knee/T1')
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6693
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6694 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
6695 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
6696
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6697 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
6698
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6699 # 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
6700 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
6701 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6702 'PatientName': 'Test Knee',
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6703 'StudyDescription': 'Knee study'
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6704 },
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6705 'Keep': ['StudyInstanceUID'],
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6706 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6707 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6708 })
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6709 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
6710 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
6711 # 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
6712 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
6713 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
6714
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6715 # 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
6716 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
6717 'Replace' : {
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6718 'PatientName': 'Test Knee 2',
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6719 'PatientID': 'TEST_KNEE_2',
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6720 'StudyDescription': 'Knee study 2'
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6721 },
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6722 'Force': True,
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6723 'KeepSource' : False
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6724 })
16ff0375835d new tests and modified tests for new DicomModificationJob features
Alain Mazy <am@osimis.io>
parents: 501
diff changeset
6725 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
6726 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
6727 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
6728 # 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
6729 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
6730 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
6731 # 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
6732 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
6733
305
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6734 def test_store_peer_transcoding(self):
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6735 i = UploadInstance(_REMOTE, 'KarstenHilbertRF.dcm')['ID']
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6736
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6737 SYNTAXES = [
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6738 '1.2.840.10008.1.2',
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6739 '1.2.840.10008.1.2.1',
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6740 #'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
6741 '1.2.840.10008.1.2.2',
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6742 '1.2.840.10008.1.2.4.50',
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6743 '1.2.840.10008.1.2.4.51',
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6744 '1.2.840.10008.1.2.4.57',
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6745 '1.2.840.10008.1.2.4.70',
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6746 ]
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6747
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6748 if HasGdcmPlugin(_REMOTE):
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6749 SYNTAXES = SYNTAXES + [
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6750 '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
6751 '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
6752 '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
6753 '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
6754 ]
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6755
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6756 for syntax in SYNTAXES:
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6757 body = {
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6758 'Resources' : [ i ],
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 if syntax != '1.2.840.10008.1.2.1':
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6762 body['Transcode'] = syntax
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6763
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6764 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6765 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6766 DoPost(_REMOTE, '/peers/peer/store', body, 'text/plain')
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6767 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6768 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6769 self.assertEqual(syntax, GetTransferSyntax(
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6770 DoGet(_LOCAL, '/instances/%s/file' % DoGet(_LOCAL, '/instances') [0])))
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6771
ed20ead1a8b6 test_store_peer_transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 304
diff changeset
6772 DropOrthanc(_LOCAL)
308
2565d39dd36c integration mainline->c-get
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 307 305
diff changeset
6773
2565d39dd36c integration mainline->c-get
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 307 305
diff changeset
6774
295
946b2199f481 added test for c-get
Alain Mazy <alain@mazy.be>
parents: 285
diff changeset
6775 def test_getscu(self):
307
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6776 def CleanTarget():
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6777 if os.path.isdir('/tmp/GETSCU'):
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6778 shutil.rmtree('/tmp/GETSCU')
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6779 os.makedirs('/tmp/GETSCU')
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6780
306
da2be3ff2db5 fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 296
diff changeset
6781 env = {}
da2be3ff2db5 fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 296
diff changeset
6782 if _DOCKER:
da2be3ff2db5 fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 296
diff changeset
6783 # 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
6784 # and running in a GNU/Linux distribution running DCMTK
da2be3ff2db5 fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 296
diff changeset
6785 # 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
6786 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
6787
295
946b2199f481 added test for c-get
Alain Mazy <alain@mazy.be>
parents: 285
diff changeset
6788 # no transcoding required
307
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6789 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6790
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6791 CleanTarget()
295
946b2199f481 added test for c-get
Alain Mazy <alain@mazy.be>
parents: 285
diff changeset
6792
306
da2be3ff2db5 fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 296
diff changeset
6793 subprocess.check_call([
da2be3ff2db5 fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 296
diff changeset
6794 FindExecutable('getscu'),
da2be3ff2db5 fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 296
diff changeset
6795 _REMOTE['Server'],
da2be3ff2db5 fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 296
diff changeset
6796 str(_REMOTE['DicomPort']),
da2be3ff2db5 fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 296
diff changeset
6797 '-aec', 'ORTHANC',
da2be3ff2db5 fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 296
diff changeset
6798 '-aet', 'ORTHANCTEST', # pretend to be the other orthanc
307
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6799 '-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
6800 '-k', '0008,0052=STUDY',
da2be3ff2db5 fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 296
diff changeset
6801 '--output-directory', '/tmp/GETSCU/'
da2be3ff2db5 fix getscu binaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 296
diff changeset
6802 ], env = env)
295
946b2199f481 added test for c-get
Alain Mazy <alain@mazy.be>
parents: 285
diff changeset
6803
311
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 308
diff changeset
6804 f1 = '/tmp/GETSCU/MR.1.3.46.670589.11.0.0.11.4.2.0.8743.5.5396.2006120114314079549'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 308
diff changeset
6805 self.assertTrue(os.path.isfile(f1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 308
diff changeset
6806 with open(f1, 'rb') as f:
543
Alain Mazy <am@osimis.io>
parents: 540
diff changeset
6807 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(f.read(), encoding='ISO-8859-1'))
311
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 308
diff changeset
6808
307
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6809 CleanTarget()
295
946b2199f481 added test for c-get
Alain Mazy <alain@mazy.be>
parents: 285
diff changeset
6810
946b2199f481 added test for c-get
Alain Mazy <alain@mazy.be>
parents: 285
diff changeset
6811 # transcoding required
311
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 308
diff changeset
6812 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
6813
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6814 subprocess.check_call([
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6815 FindExecutable('getscu'),
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6816 _REMOTE['Server'],
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6817 str(_REMOTE['DicomPort']),
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6818 '-aec', 'ORTHANC',
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6819 '-aet', 'ORTHANCTEST', # pretend to be the other orthanc
311
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 308
diff changeset
6820 '-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
6821 '-k', '0008,0052=STUDY',
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6822 '--output-directory', '/tmp/GETSCU/'
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6823 ], env = env)
5be63aef39b1 fix test_getscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 306
diff changeset
6824
311
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 308
diff changeset
6825 self.assertTrue(os.path.isfile(f1))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 308
diff changeset
6826 with open(f1, 'rb') as f:
543
Alain Mazy <am@osimis.io>
parents: 540
diff changeset
6827 self.assertEqual('1.2.840.10008.1.2.1', GetTransferSyntax(f.read(), encoding='ISO-8859-1'))
311
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 308
diff changeset
6828
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 308
diff changeset
6829 # This file is transcoded from "1.2.840.10008.1.2.4.50" to "1.2.840.10008.1.2.1"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 308
diff changeset
6830 # (LittleEndianExplicit is proposed by default by "getscu")
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 308
diff changeset
6831 f2 = '/tmp/GETSCU/US.1.2.840.113663.1298.1.3.715.20000329.1115326'
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 308
diff changeset
6832 self.assertTrue(os.path.isfile(f2))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 308
diff changeset
6833 with open(f2, 'rb') as f:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 308
diff changeset
6834 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
6835
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6836
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6837 def test_findscu_truncation(self):
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6838 # https://groups.google.com/forum/#!msg/orthanc-users/FkckWAHvso8/UbRBAhQ5CwAJ
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6839 # Fixed by: https://hg.orthanc-server.com/orthanc/rev/2724977419fb
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6840 UploadInstance(_REMOTE, 'Multiframe.dcm')
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6841 UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6842
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6843 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
6844
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6845 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k', 'StudyInstanceUID' ])
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6846 result = re.findall('\(0020,000d\).*?\[(.*?)\]', i)
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6847 self.assertEqual(2, len(result))
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6848
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6849 # 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
6850 # study, leading to a string of 249 characters
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6851 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k',
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6852 'StudyInstanceUID=%s\\%s\\%s\\%s\\%s' % (( study, ) * 5) ])
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6853 result = re.findall('\(0020,000d\).*?\[(.*?)\]', i)
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6854 self.assertEqual(1, len(result))
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6855
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6856 # 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
6857 # study, leading to a string of 299 characters. In Orthanc <=
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6858 # 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
6859 # == 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
6860 # 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
6861 # "StudyInstanceUID" and returns all the available
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6862 # 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
6863 i = CallFindScu([ '-k', '0008,0052=STUDY', '-k',
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6864 'StudyInstanceUID=%s\\%s\\%s\\%s\\%s\\%s' % (( study, ) * 6) ])
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6865 result = re.findall('\(0020,000d\).*?\[(.*?)\]', i)
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6866 self.assertEqual(1, len(result))
328
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6867
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6868
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6869 def test_store_compressed(self):
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6870 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f:
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6871 dicom = f.read()
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6872 i = DoPost(_REMOTE, '/instances', dicom) ['ID']
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6873 sourceSize = len(dicom)
324
6164d39399ad test_findscu_truncation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 323
diff changeset
6874
328
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6875 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6876 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6877
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6878 # 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
6879 jobId = MonitorJob2(_REMOTE, lambda: DoPost(
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6880 _REMOTE, '/peers/peer/store', {
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6881 'Resources' : [ i ],
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6882 'Synchronous' : False,
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6883 }))
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6884
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6885 job = DoGet(_REMOTE, '/jobs/%s' % jobId)
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6886 self.assertFalse(job['Content']['Compress'])
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6887 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
6888 self.assertEqual(str(sourceSize), job['Content']['Size'])
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 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6891 DropOrthanc(_LOCAL)
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6892
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
6893 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
6894 # 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
6895 # 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
6896 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/peers/peer/store', {
328
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6897 'Resources' : [ i ],
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6898 'Compress' : True,
8a462f9c5a97 test_store_compressed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 327
diff changeset
6899 }))
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
6900 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
6901
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
6902 # 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
6903 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
6904 _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
6905 '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
6906 '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
6907 '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
6908 }))
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
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 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
6911 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
6912
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 # 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
6914 self.assertLess(int(job['Content']['Size']), sourceSize / 2)
332
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6915
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6916
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6917 def test_move_ambra(self):
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6918 # "Orthanc + Ambra: Query/Retrieve" (2020-08-25)
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6919 # 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
6920
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6921 UploadInstance(_REMOTE, '2019-06-17-VedranZdesic.dcm')
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6922
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6923 self.assertFalse(MonitorJob(_REMOTE, lambda: CallMoveScu([
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6924 '--study',
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6925 '-k', 'StudyInstanceUID='
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6926 ])))
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', 'AccessionNumber=',
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 '-k', 'StudyInstanceUID='
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
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6939 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6940 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6941 '--study',
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6942 '-k', 'AccessionNumber=CT16000988',
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6943 '-k', 'StudyInstanceUID=',
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6944 ])))
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6945 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6946 DropOrthanc(_LOCAL)
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6947
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6948 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6949 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6950 '--study',
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6951 '-k', 'AccessionNumber=CT16000988',
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6952 '-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
6953 ])))
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6954 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6955 DropOrthanc(_LOCAL)
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6956
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6957 # This fails on Orthanc <= 1.7.3
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6958 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6959 self.assertTrue(MonitorJob(_REMOTE, lambda: CallMoveScu([
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6960 '--study',
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6961 '-k', 'AccessionNumber=',
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6962 '-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
6963 ])))
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6964 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
dc41bfa4bda5 test_move_ambra
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 328
diff changeset
6965 DropOrthanc(_LOCAL)
333
695be643b0f4 test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 332
diff changeset
6966
695be643b0f4 test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 332
diff changeset
6967
695be643b0f4 test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 332
diff changeset
6968 def test_decode_elscint(self):
695be643b0f4 test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 332
diff changeset
6969 # 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
6970 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
6971 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
6972
695be643b0f4 test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 332
diff changeset
6973 im = GetImage(_REMOTE, '/instances/%s/frames/0/preview' % a)
695be643b0f4 test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 332
diff changeset
6974 self.assertEqual("L", im.mode)
695be643b0f4 test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 332
diff changeset
6975 self.assertEqual(512, im.size[0])
695be643b0f4 test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 332
diff changeset
6976 self.assertEqual(512, im.size[1])
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' % b)
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 # The two tests below fail on Orthanc <= 1.7.3
695be643b0f4 test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 332
diff changeset
6984 raw = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % a)
695be643b0f4 test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 332
diff changeset
6985 self.assertEqual(512 * 512 * 2, len(raw))
695be643b0f4 test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 332
diff changeset
6986
695be643b0f4 test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 332
diff changeset
6987 raw = DoGet(_REMOTE, '/instances/%s/frames/0/raw' % b)
695be643b0f4 test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 332
diff changeset
6988 self.assertEqual(512 * 512 * 2, len(raw))
695be643b0f4 test_decode_elscint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 332
diff changeset
6989
334
971ff285302b test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 333
diff changeset
6990
971ff285302b test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 333
diff changeset
6991 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
6992 # 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
6993 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
6994 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
6995
335
96718de2f29c simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 334
diff changeset
6996 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
6997 modalitiesInStudy = re.findall('\(0008,0061\).*?\[(.*?)\]', i)
96718de2f29c simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 334
diff changeset
6998 self.assertEqual(1, len(modalitiesInStudy))
96718de2f29c simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 334
diff changeset
6999 self.assertEqual('CT\\PT ', modalitiesInStudy[0])
96718de2f29c simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 334
diff changeset
7000
96718de2f29c simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 334
diff changeset
7001 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
7002 # 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
7003 # 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
7004
96718de2f29c simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 334
diff changeset
7005 if i in [ 'UX', 'UX\\MR' ]:
96718de2f29c simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 334
diff changeset
7006 expected = 0
96718de2f29c simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 334
diff changeset
7007 else:
96718de2f29c simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 334
diff changeset
7008 expected = 1
96718de2f29c simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 334
diff changeset
7009
334
971ff285302b test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 333
diff changeset
7010 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
971ff285302b test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 333
diff changeset
7011 'Query' : { 'ModalitiesInStudy' : i }})
335
96718de2f29c simplification and fix of test_incoming_findscu
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 334
diff changeset
7012 self.assertEqual(expected, len(a))
334
971ff285302b test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 333
diff changeset
7013
971ff285302b test_rest_modalities_in_study_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 333
diff changeset
7014 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
7015 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
7016 self.assertEqual(expected, len(studyInstanceUid))
337
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 335
diff changeset
7017
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 335
diff changeset
7018
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 335
diff changeset
7019 def test_webdav(self):
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 335
diff changeset
7020 self.assertRaises(Exception, lambda: DoPropFind(_REMOTE, '/webdav/', 2))
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 335
diff changeset
7021
342
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7022 for suffix in [ '', '/' ]:
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7023 f = DoPropFind(_REMOTE, '/webdav' + suffix, 0)
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7024 self.assertEqual(1, len(f))
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7025 self.assertTrue('/webdav/' in f.keys())
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7026 self.assertTrue(f['/webdav/']['folder'])
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7027 self.assertEqual('webdav', f['/webdav/']['displayname'])
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7028
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7029 f = DoPropFind(_REMOTE, '/webdav' + suffix, 1)
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7030 self.assertEqual(6, len(f))
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 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
7035 self.assertTrue(f['/webdav/%s' % i]['folder'])
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7036 self.assertEqual(i, f['/webdav/%s' % i]['displayname'])
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7037
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7038 for depth in [ 0, 1 ]:
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7039 for suffix2 in [ '', '/' ]:
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7040 g = DoPropFind(_REMOTE, '/webdav/%s%s' % (i, suffix2), depth)
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7041
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7042 if i == 'uploads':
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7043 # Empty folders might still exist in "/uploads/"
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7044 self.assertTrue('/webdav/uploads/' in g)
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7045 self.assertEqual('uploads', g['/webdav/uploads/']['displayname'])
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7046 for j in g.items():
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7047 self.assertTrue(g.items()[0][1]['folder'])
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7048 else:
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7049 self.assertEqual(1, len(g))
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7050 self.assertEqual('/webdav/%s/' % i, g.items()[0][0])
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7051 self.assertTrue(g.items()[0][1]['folder'])
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7052 self.assertEqual(i, g.items()[0][1]['displayname'])
341
66a36befb208 extending Toolbox.DoPropFind()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 337
diff changeset
7053
342
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7054 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7055 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f:
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7056 DoPut(_REMOTE, '/webdav/uploads/dummy', f.read(), 'text/plain')
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7057
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7058 while len(DoGet(_REMOTE, '/patients')) == 0:
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7059 time.sleep(0.01)
bf8369ea3ff1 more tests of webdav
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 341
diff changeset
7060 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
337
ec13ace43bde trying webdav tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 335
diff changeset
7061
349
698898a93a10 test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 348
diff changeset
7062
698898a93a10 test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 348
diff changeset
7063 def test_log_categories(self):
350
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 349
diff changeset
7064 original = DoGet(_REMOTE, '/tools/log-level-http')
349
698898a93a10 test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 348
diff changeset
7065
350
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 349
diff changeset
7066 DoPut(_REMOTE, '/tools/log-level-http', 'default')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 349
diff changeset
7067 self.assertEqual('default', DoGet(_REMOTE, '/tools/log-level-http'))
349
698898a93a10 test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 348
diff changeset
7068 DoGet(_REMOTE, '/system')
698898a93a10 test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 348
diff changeset
7069
350
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 349
diff changeset
7070 DoPut(_REMOTE, '/tools/log-level-http', 'verbose')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 349
diff changeset
7071 self.assertEqual('verbose', DoGet(_REMOTE, '/tools/log-level-http'))
349
698898a93a10 test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 348
diff changeset
7072 DoGet(_REMOTE, '/system')
698898a93a10 test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 348
diff changeset
7073
350
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 349
diff changeset
7074 DoPut(_REMOTE, '/tools/log-level-http', 'trace')
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 349
diff changeset
7075 self.assertEqual('trace', DoGet(_REMOTE, '/tools/log-level-http'))
349
698898a93a10 test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 348
diff changeset
7076 DoGet(_REMOTE, '/system')
698898a93a10 test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 348
diff changeset
7077
350
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 349
diff changeset
7078 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
7079
698898a93a10 test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 348
diff changeset
7080 # Switch back to the original log level
350
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 349
diff changeset
7081 DoPut(_REMOTE, '/tools/log-level-http', original)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 349
diff changeset
7082
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 349
diff changeset
7083 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
7084 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
7085
698898a93a10 test_log_categories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 348
diff changeset
7086 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
7087
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7088
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7089 def test_upload_zip(self):
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7090 f = StringIO()
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7091 with zipfile.ZipFile(f, 'w') as z:
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7092 z.writestr('hello/world/invalid.txt', 'Hello world')
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7093 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as g:
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7094 c = g.read()
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7095 z.writestr('hello/world/dicom1.dcm', c)
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7096 z.writestr('hello/world/dicom2.dcm', c)
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7097
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7098 f.seek(0)
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7099 i = DoPost(_REMOTE, '/instances', f.read())
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7100
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7101 self.assertEqual(2, len(i))
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7102 self.assertEqual(i[0], i[1])
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7103 self.assertEqual(6, len(i[0]))
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7104 self.assertEqual('66a662ce-7430e543-bad44d47-0dc5a943-ec7a538d', i[0]['ID'])
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7105 self.assertEqual('f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe', i[0]['ParentSeries'])
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7106 self.assertEqual('b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0', i[0]['ParentStudy'])
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7107 self.assertEqual('6816cb19-844d5aee-85245eba-28e841e6-2414fae2', i[0]['ParentPatient'])
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7108 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
7109
18597ca05e48 test_upload_zip
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 355
diff changeset
7110 # 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
7111 self.assertEqual('Success', i[0]['Status'])
361
6cf5cc4d0a99 test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 359
diff changeset
7112
6cf5cc4d0a99 test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 359
diff changeset
7113
6cf5cc4d0a99 test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 359
diff changeset
7114 def test_transfer_syntax_no_metaheader(self):
6cf5cc4d0a99 test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 359
diff changeset
7115 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
7116 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % a)
6cf5cc4d0a99 test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 359
diff changeset
7117 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
7118
6cf5cc4d0a99 test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 359
diff changeset
7119 # This fails on Orthanc <= 1.8.1
6cf5cc4d0a99 test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 359
diff changeset
7120 self.assertTrue('TransferSyntax' in m)
6cf5cc4d0a99 test_transfer_syntax_no_metaheader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 359
diff changeset
7121 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
7122
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7123
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7124 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
7125 # 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
7126
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7127 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
7128 return (('--%s\r\n' +
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7129 '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
7130 '\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
7131
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7132 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
7133 dcm1 = f.read()
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7134
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7135 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
7136 dcm2 = f.read()
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7137
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7138 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
7139
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7140 boundary = '----WebKitFormBoundarypJDNQqJPoXiorRmQ'
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7141 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
7142 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
7143 '--' + boundary + '--'), headers = {
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7144 '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
7145 'X-Requested-With' : 'XMLHttpRequest',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7146 })
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7147
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7148 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
7149
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7150
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7151 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
7152 # 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
7153 # 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
7154 # "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
7155
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7156 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
7157 return (('--%s\r\n' +
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7158 '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
7159 '\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
7160
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7161 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
7162 dcm = f.read()
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7163
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7164 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
7165 dcm2 = f.read()
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7166
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7167 boundary = '----WebKitFormBoundarypJDNQqJPoXiorRmQ'
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 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
7170 m = DoPost(_REMOTE, '/instances',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7171 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
7172 headers = {
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7173 '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
7174 'X-Requested-With' : 'XMLHttpRequest',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7175 '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
7176 '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
7177 })
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7178
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7179 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
7180 m = DoPost(_REMOTE, '/instances',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7181 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
7182 headers = {
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7183 '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
7184 'X-Requested-With' : 'XMLHttpRequest',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7185 '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
7186 '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
7187 })
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7188 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
7189
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7190 m = DoPost(_REMOTE, '/instances',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7191 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
7192 headers = {
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7193 '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
7194 'X-Requested-With' : 'XMLHttpRequest',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7195 '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
7196 '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
7197 })
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7198
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7199 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
7200
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7201 # 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
7202 m = DoPost(_REMOTE, '/instances',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7203 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
7204 headers = {
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7205 '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
7206 'X-Requested-With' : 'XMLHttpRequest',
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7207 '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
7208 '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
7209 })
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7210
2cc40121c3a8 test_upload_multipart_1 and test_upload_multipart_2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 363
diff changeset
7211 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
377
cc79fa4945da test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 374
diff changeset
7212
cc79fa4945da test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 374
diff changeset
7213
cc79fa4945da test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 374
diff changeset
7214 def test_pixel_data_offset(self):
cc79fa4945da test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 374
diff changeset
7215 # New in Orthanc 1.9.1
cc79fa4945da test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 374
diff changeset
7216 def Check(path, offset):
cc79fa4945da test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 374
diff changeset
7217 i = UploadInstance(_REMOTE, path) ['ID']
cc79fa4945da test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 374
diff changeset
7218 metadata = DoGetRaw(_REMOTE, '/instances/%s/metadata/PixelDataOffset' % i) [1]
cc79fa4945da test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 374
diff changeset
7219 self.assertEqual(offset, metadata)
cc79fa4945da test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 374
diff changeset
7220
cc79fa4945da test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 374
diff changeset
7221 Check('ColorTestMalaterre.dcm', str(0x03a0))
cc79fa4945da test_pixel_data_offset
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 374
diff changeset
7222 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
7223 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
7224 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
7225 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
7226 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
7227 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
7228 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
7229 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
7230 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
7231 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
7232 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
7233 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
7234
a8dd562943a7 added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 380
diff changeset
7235
a8dd562943a7 added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 380
diff changeset
7236 def test_peer_store_straight(self):
a8dd562943a7 added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 380
diff changeset
7237 self.assertEqual(0, len(DoGet(_LOCAL, '/exports')['Exports']))
a8dd562943a7 added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 380
diff changeset
7238 self.assertEqual(0, len(DoGet(_REMOTE, '/exports')['Exports']))
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 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
7241 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
7242 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
7243 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
7244 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
7245 self.assertEqual('0.8.6', peer['Version'])
382
a8dd562943a7 added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 380
diff changeset
7246
a8dd562943a7 added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 380
diff changeset
7247 with open(GetDatabasePath('DummyCT.dcm'), 'rb') as f:
a8dd562943a7 added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 380
diff changeset
7248 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
7249
a8dd562943a7 added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 380
diff changeset
7250 # 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
7251 # "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
7252 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
7253 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
7254 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
7255 self.assertEqual(6, len(j))
382
a8dd562943a7 added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 380
diff changeset
7256 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
7257 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
7258 self.assertEqual('Success', j['Status'])
a8dd562943a7 added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 380
diff changeset
7259
a8dd562943a7 added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 380
diff changeset
7260 self.assertEqual(1, len(DoGet(_LOCAL, '/patients')))
a8dd562943a7 added test_peer_store_straight
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 380
diff changeset
7261 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
383
05d0d0c2623c added test_cp246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 382
diff changeset
7262
05d0d0c2623c added test_cp246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 382
diff changeset
7263
05d0d0c2623c added test_cp246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 382
diff changeset
7264 def test_cp246(self):
05d0d0c2623c added test_cp246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 382
diff changeset
7265 # This fails on Orthanc <= 1.9.0
05d0d0c2623c added test_cp246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 382
diff changeset
7266 a = UploadInstance(_REMOTE, '2021-02-19-MalaterreCP246.dcm')['ID']
05d0d0c2623c added test_cp246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 382
diff changeset
7267 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
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 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % a)
05d0d0c2623c added test_cp246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 382
diff changeset
7270 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
7271 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
7272 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
7273 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
7274
05d0d0c2623c added test_cp246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 382
diff changeset
7275 study = DoGet(_REMOTE, '/instances/%s/study' % a)
05d0d0c2623c added test_cp246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 382
diff changeset
7276 self.assertEqual(tags['0020,000d'], study['MainDicomTags']['StudyInstanceUID'])
05d0d0c2623c added test_cp246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 382
diff changeset
7277
05d0d0c2623c added test_cp246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 382
diff changeset
7278 series = DoGet(_REMOTE, '/instances/%s/series' % a)
05d0d0c2623c added test_cp246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 382
diff changeset
7279 self.assertEqual(tags['0020,000e'], series['MainDicomTags']['SeriesInstanceUID'])
05d0d0c2623c added test_cp246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 382
diff changeset
7280
05d0d0c2623c added test_cp246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 382
diff changeset
7281 instance = DoGet(_REMOTE, '/instances/%s' % a)
05d0d0c2623c added test_cp246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 382
diff changeset
7282 self.assertEqual(tags['0008,0018'], instance['MainDicomTags']['SOPInstanceUID'])
05d0d0c2623c added test_cp246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 382
diff changeset
7283
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7284
392
5cbcb4a83b41 fix for revisions of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 391
diff changeset
7285 def test_revisions_metadata(self):
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7286 # 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
7287 # 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
7288 # "CheckRevisions" is "False". Conventions for HTTP headers
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7289 # related to revisions mimic CouchDB:
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7290 # 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
7291 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7292
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7293 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7294 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
7295 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
7296 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
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, 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
7299 '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
7300 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 394
diff changeset
7301 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
7302
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 394
diff changeset
7303 (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
7304 '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
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' : '"0-16de4d7060d0b9d102ef0fca8acc892a"'
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7310 })
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7311 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
7312 self.assertEqual('"0-16de4d7060d0b9d102ef0fca8acc892a"', headers['etag'])
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7313 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
7314
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7315 (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
7316 '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
7317 })
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7318 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
7319 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
7320 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
7321
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 394
diff changeset
7322 (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
7323 '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
7324 })
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('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
7326 self.assertEqual('"0-16de4d7060d0b9d102ef0fca8acc892a"', headers['etag'])
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7327 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
7328
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7329 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/metadata/TransferSyntax' % i)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7330 self.assertEqual('403', headers['status']) # Forbidden (system metadata)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7331
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7332 (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
7333 self.assertEqual('403', headers['status']) # Forbidden (system metadata)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7334
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7335 (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
7336 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
7337 self.assertEqual('"0-%s"' % ComputeMD5('hello'), headers['etag'])
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7338
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7339 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/metadata/1024' % i)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7340 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
7341 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7342 self.assertEqual('hello', body)
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, 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
7345 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"'
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7346 })
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7347 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
7348 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7349 self.assertEqual('', body)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7350
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7351 (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
7352 'If-None-Match' : '"1-tata"'
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7353 })
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7354 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
7355 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7356 self.assertEqual('hello', body)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7357 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
7358
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7359 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/metadata/1024' % i)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7360 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
7361
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7362 (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
7363 'If-Match' : '45-5d41402abc4b2a76b9719d911017c592'
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7364 })
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7365 self.assertEqual('409', headers['status']) # Conflict, as bad revision
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' : '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
7369 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 394
diff changeset
7370 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
7371
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 394
diff changeset
7372 (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
7373 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7374 })
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7375 self.assertEqual('200', headers['status'])
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7376
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7377 (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
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('404', 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) = DoGetRaw(_REMOTE, '/instances/%s/metadata/1024' % i)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7383 self.assertEqual('404', headers['status'])
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.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
7386
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7387 (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
7388 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
7389 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7390
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7391 (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
7392 self.assertEqual('409', headers['status'])
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7393
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7394 (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
7395 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"'
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7396 })
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7397 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
7398 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7399 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
7400
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7401 (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
7402 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7403 })
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7404 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
7405 self.assertEqual('"1-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7406 self.assertEqual('', body)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7407
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7408 (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
7409 'If-None-Match' : headers['etag']
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7410 })
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7411
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7412 if headers['status'] == '200':
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7413 print("Your database backend doesn't store revisions")
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7414 (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
7415 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592'
391
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 self.assertEqual('409', headers['status'])
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7418
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' : '0-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('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
7423 self.assertEqual('"1-6e809cbda0732ac4845916a59016f954"', headers['etag'])
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7424 self.assertEqual('', body)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7425
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7426 elif headers['status'] == '304': # Revisions are supported
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7427 (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
7428 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7429 })
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7430 self.assertEqual('409', headers['status'])
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7431
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' : '1-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('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
7436 self.assertEqual('"2-6e809cbda0732ac4845916a59016f954"', headers['etag'])
391
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7437 self.assertEqual('', body)
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7438
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7439 else:
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7440 raise Exception('Internal error')
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7441
227d9a932467 testing revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 390
diff changeset
7442 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
7443
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7444
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7445 def test_revisions_attachments(self):
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7446 # 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
7447 # was introduced in 1.9.2), or if configuration option
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7448 # "CheckRevisions" is "False". Conventions for HTTP headers
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7449 # related to revisions mimic CouchDB:
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7450 # https://docs.couchdb.org/en/stable/api/document/common.html
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7451 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7452
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
7453 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
7454 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
7455
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7456 # "/compress", "/uncompress" and "/verify-md5" are POST
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7457 # methods, and are not affected by revisions
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7458 for suffix in [ '', '/compressed-data', '/compressed-md5', '/compressed-size',
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7459 '/data', '/is-compressed', '/md5', '/size' ]:
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7460 (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
7461 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
7462 self.assertEqual('"0-%s"' % md5, headers['etag'])
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7463
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7464 (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
7465 'If-None-Match' : '"0-3e29b869978b6db4886355a2b1132124"',
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7466 })
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7467 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
7468 self.assertEqual('"0-3e29b869978b6db4886355a2b1132124"', headers['etag'])
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7469 self.assertEqual('', body) # Body must be empty on 304 status
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7470
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7471 (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
7472 '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
7473 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 394
diff changeset
7474 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
7475
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 394
diff changeset
7476 (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
7477 '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
7478 })
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7479 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
7480 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
7481
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 (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
7483 '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
7484 })
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('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
7486 self.assertEqual('"0-3e29b869978b6db4886355a2b1132124"', headers['etag'])
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7487
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7488 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/attachments/dicom' % i)
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7489 self.assertEqual('403', headers['status']) # Forbidden (system metadata)
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7490
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7491 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/dicom' % i, 'hello')
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7492 self.assertEqual('403', headers['status']) # Forbidden (system metadata)
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7493
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7494 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello')
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7495 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
7496 self.assertEqual('"0-%s"' % ComputeMD5('hello'), headers['etag'])
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7497
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7498 (headers, body) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i)
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7499 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
7500 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7501 self.assertEqual('hello', body)
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, 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
7504 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"'
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7505 })
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7506 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
7507 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7508 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
7509
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 394
diff changeset
7510 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
7511 '"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
7512 (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
7513 '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
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 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
7516 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
7517 self.assertEqual('hello', body)
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7518
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7519 (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
7520 'If-None-Match' : 'tata' # Bad header format
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7521 })
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
7522 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
7523 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
7524
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7525 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
7526
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7527 (headers, body) = DoDeleteRaw(_REMOTE, '/instances/%s/attachments/1024' % i)
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7528 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
7529
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7530 (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
7531 'If-Match' : '45-5d41402abc4b2a76b9719d911017c592'
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7532 })
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7533 self.assertEqual('409', headers['status']) # Conflict, as bad revision
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' : '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
7537 })
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 394
diff changeset
7538 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
7539
eb87ec525b53 "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 394
diff changeset
7540 (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
7541 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7542 })
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7543 self.assertEqual('200', headers['status'])
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7544
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7545 (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
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('404', 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) = DoGetRaw(_REMOTE, '/instances/%s/attachments/1024/data' % i)
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7551 self.assertEqual('404', headers['status'])
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.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/attachments/1024' % i))
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) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello')
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7556 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
7557 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7558
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7559 (headers, body) = DoPutRaw(_REMOTE, '/instances/%s/attachments/1024' % i, 'hello')
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7560 self.assertEqual('409', headers['status'])
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7561
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7562 (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
7563 'If-None-Match' : '"0-5d41402abc4b2a76b9719d911017c592"'
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7564 })
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7565 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
7566 self.assertEqual('"0-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7567 self.assertEqual('', body) # Body must be empty on 304 status
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7568
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7569 (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
7570 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7571 })
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7572 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
7573 self.assertEqual('"1-5d41402abc4b2a76b9719d911017c592"', headers['etag'])
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7574 self.assertEqual('{}', body)
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7575
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7576 (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
7577 'If-None-Match' : headers['etag']
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7578 })
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7579
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7580 if headers['status'] == '200':
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7581 print("Your database backend doesn't store revisions")
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7582 (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
7583 'If-Match' : '1-5d41402abc4b2a76b9719d911017c592'
393
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 self.assertEqual('409', headers['status'])
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7586
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' : '0-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('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
7591 self.assertEqual('"1-6e809cbda0732ac4845916a59016f954"', headers['etag'])
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7592 self.assertEqual('{}', body)
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7593
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7594 elif headers['status'] == '304': # Revisions are supported
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7595 (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
7596 'If-Match' : '0-5d41402abc4b2a76b9719d911017c592'
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7597 })
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7598 self.assertEqual('409', headers['status'])
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7599
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' : '1-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('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
7604 self.assertEqual('"2-6e809cbda0732ac4845916a59016f954"', headers['etag'])
393
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7605 self.assertEqual('{}', body)
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7606
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7607 else:
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7608 raise Exception('Internal error')
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7609
3019306499c5 test_revisions_attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 392
diff changeset
7610 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
7611
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7612
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7613 def test_issue_195(self):
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7614 # This fails on Orthanc <= 1.9.2
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7615 # 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
7616 a = UploadInstance(_REMOTE, 'Issue195.dcm')['ID']
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7617 b = DoGet(_REMOTE, '/instances/%s/file' % a,
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7618 headers = { 'Accept' : 'application/dicom+json' })
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7619
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7620 # 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
7621 self.assertEqual(5, len(b))
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7622 self.assertEqual(2, len(b["00080018"]))
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7623 self.assertEqual("UI", b["00080018"]["vr"])
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7624 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
7625 b["00080018"]["Value"][0])
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7626
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7627 self.assertEqual(2, len(b["0020000D"]))
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7628 self.assertEqual("UI", b["0020000D"]["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.2.8323329.13188.1620309604.848733",
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7630 b["0020000D"]["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["0020000E"]))
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7633 self.assertEqual("UI", b["0020000E"]["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.3.8323329.13188.1620309604.848734",
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7635 b["0020000E"]["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(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
7638 self.assertEqual("LO", b["00081030"]["vr"])
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7639
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7640 self.assertEqual(2, len(b["0008103E"]))
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7641 self.assertEqual("LO", b["0008103E"]["vr"])
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7642 self.assertEqual("Hello1", b["0008103E"]["Value"][0])
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7643
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7644 a = UploadInstance(_REMOTE, 'Issue195-bis.dcm')['ID']
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7645 b = DoGet(_REMOTE, '/instances/%s/file' % a,
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7646 headers = { 'Accept' : 'application/dicom+json' })
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7647
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7648 # 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
7649 self.assertEqual(5, len(b))
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7650 self.assertEqual(2, len(b["00080018"]))
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7651 self.assertEqual("UI", b["00080018"]["vr"])
424
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
7652 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
7653 b["00080018"]["Value"][0])
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7654
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7655 self.assertEqual(2, len(b["0020000D"]))
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7656 self.assertEqual("UI", b["0020000D"]["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.2.8323329.6792.1625504071.652468",
399
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7658 b["0020000D"]["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["0020000E"]))
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7661 self.assertEqual("UI", b["0020000E"]["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.3.8323329.6792.1625504071.652469",
399
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7663 b["0020000E"]["Value"][0])
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7664
424
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
7665 self.assertEqual(2, len(b["00084567"]))
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
7666 self.assertEqual("UN", b["00084567"]["vr"])
399
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7667
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7668 # 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
7669 # $ echo -n 'QgA=' | base64 -d | hexdump -C
424
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
7670 self.assertEqual("QgA=", b["00084567"]["InlineBinary"])
399
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7671
dd519677974d integration tests for issue 195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 397
diff changeset
7672 # 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
7673 self.assertEqual(1, len(b["00084565"]))
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
7674 self.assertEqual("UN", b["00084565"]["vr"])
402
cc947ddc57c5 test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
7675
cc947ddc57c5 test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
7676
cc947ddc57c5 test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
7677 def test_modify_attribute(self):
cc947ddc57c5 test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
7678 # This fails on Orthanc <= 1.9.3 (not implemented)
cc947ddc57c5 test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
7679 # 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
7680 i = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
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 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % i)
cc947ddc57c5 test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
7683 self.assertFalse('0020,9165' in tags)
cc947ddc57c5 test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
7684
cc947ddc57c5 test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
7685 i = DoPost(_REMOTE, '/studies/b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0/modify', {
cc947ddc57c5 test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
7686 "Replace": {
cc947ddc57c5 test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
7687 "0020,9165": "0020,9056",
cc947ddc57c5 test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
7688 }
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 instances = DoGet(_REMOTE, '/studies/%s/instances' % i['ID'])
cc947ddc57c5 test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
7691 self.assertEqual(1, len(instances))
cc947ddc57c5 test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
7692
cc947ddc57c5 test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
7693 tags = DoGet(_REMOTE, '/instances/%s/tags?short' % instances[0]['ID'])
cc947ddc57c5 test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
7694 self.assertTrue('0020,9165' in tags)
cc947ddc57c5 test_modify_attribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 399
diff changeset
7695 self.assertEqual('0020,9056', tags['0020,9165'])
405
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7696
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7697
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7698 def test_issue_146(self):
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7699 # "Update Anonyization to 2019c"
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7700 # https://bugs.orthanc-server.com/show_bug.cgi?id=146
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 def GetTags(study, params):
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7703 a = DoPost(_REMOTE, '/studies/%s/anonymize' % study, params) ['ID']
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7704 b = DoGet(_REMOTE, '/studies/%s/instances' % a)
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7705 self.assertEqual(1, len(b))
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7706 return DoGet(_REMOTE, '/instances/%s/tags?short' % b[0]['ID'])
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7707
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7708
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7709 UploadInstance(_REMOTE, 'Issue146.dcm')
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7710 study = '7c950970-321e4ab0-28446c5f-f94850f1-5c44634b'
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7711
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7712 self.assertRaises(Exception, lambda: GetTags(study, { 'DicomVersion' : 'nope' }))
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 tags2008 = GetTags(study, { 'DicomVersion' : '2008' })
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7715 tags2017c = GetTags(study, { 'DicomVersion' : '2017c' })
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7716 tags2021b = GetTags(study, { 'DicomVersion' : '2021b' })
557
1cdb14a679f2 fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 556
diff changeset
7717 tags2023b = GetTags(study, { 'DicomVersion' : '2023b' })
405
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7718 tagsDefault = GetTags(study, {})
6bbc89c2c2d1 test_issue_146
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
7719
420
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 419
diff changeset
7720 orthancVersion = DoGet(_REMOTE, '/system') ['Version']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 419
diff changeset
7721 self.assertEqual('Orthanc %s - PS 3.15-2008 Table E.1-1' % orthancVersion, tags2008['0012,0063'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 419
diff changeset
7722 self.assertEqual('Orthanc %s - PS 3.15-2017c Table E.1-1 Basic Profile' % orthancVersion, tags2017c['0012,0063'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 419
diff changeset
7723 self.assertEqual('Orthanc %s - PS 3.15-2021b Table E.1-1 Basic Profile' % orthancVersion, tags2021b['0012,0063'])
557
1cdb14a679f2 fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 556
diff changeset
7724 self.assertEqual('Orthanc %s - PS 3.15-2023b Table E.1-1 Basic Profile' % orthancVersion, tags2023b['0012,0063'])
1cdb14a679f2 fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 556
diff changeset
7725 self.assertEqual(tagsDefault['0012,0063'], tags2023b['0012,0063'])
1cdb14a679f2 fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 556
diff changeset
7726
1cdb14a679f2 fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 556
diff changeset
7727 self.assertEqual(len(tags2021b), len(tags2023b))
1cdb14a679f2 fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 556
diff changeset
7728 self.assertNotEqual(tags2021b, tags2023b)
1cdb14a679f2 fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 556
diff changeset
7729
1cdb14a679f2 fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 556
diff changeset
7730 for t in [ tags2008, tags2017c, tags2021b, tags2023b, tagsDefault ]:
405
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
557
1cdb14a679f2 fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 556
diff changeset
7739 for t in [ tags2017c, tags2021b, tags2023b, tagsDefault ]:
405
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
557
1cdb14a679f2 fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 556
diff changeset
7746 for t in [ tags2021b, tags2023b, tagsDefault ]:
405
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 ],
557
1cdb14a679f2 fix anonymization tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 556
diff changeset
7864 'DicomVersion' : '2021b',
424
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
7865 'KeepPrivateTags' : True # Compatibility with Orthanc 1.9.4
407
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7866 })
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7867 tags3 = GetTags(a['ID'])
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7868
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7869 # UIDs
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7870 for i in [ '0008,0018',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7871 '0010,0020',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7872 '0008,0018',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7873 '0010,0020' ]:
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7874 self.assertNotEqual(tags1[i], tags3[i])
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7875
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7876 self.assertNotEqual(tags1['0020,9221'][0]['0020,9164'],
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7877 tags3['0020,9221'][0]['0020,9164'])
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7878
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7879 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
7880 tags3['5200,9229'][0]['2005,140e'][0]['0008,0014'])
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7881
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7882 # 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
7883 # Removals (X)
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7884 for i in [ '0008,0021',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7885 '0008,002a',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7886 '0008,0031',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7887 '0008,1030',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7888 '0008,103e',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7889 '0008,1111',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7890 '0010,21c0',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7891 '0040,0006',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7892 '0040,0241',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7893 '0040,0244',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7894 '0040,0245',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7895 '0040,0250',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7896 '0040,0251',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7897 '0040,0253',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7898 '0040,0254',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7899 '0040,0555',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7900 ]:
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7901 self.assertTrue(i in tags1)
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7902 self.assertFalse(i in tags3)
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7903
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7904 # Clearings (Z)
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7905 for i in [ '0008,0020',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7906 '0008,0023',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7907 '0008,0030',
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7908 '0008,0033' ]:
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7909 self.assertNotEqual('', tags1[i])
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7910 self.assertEqual('', tags3[i])
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7911
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7912 # Replace
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7913 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
7914 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
7915 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
7916
407
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7917 # "Keep" on DimensionIndexSequence
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7918 for i in range(3):
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7919 self.assertEqual(tags1['0020,9222'][i]['0020,9164'],
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7920 tags3['0020,9222'][i]['0020,9164'])
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7921
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7922 # "Keep" on ReferencedImageEvidenceSequence
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7923 self.assertEqual(json.dumps(tags1['0008,9092']),
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7924 json.dumps(tags3['0008,9092']))
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7925
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7926 # "Keep" on PerFrameFunctionalGroupsSequence
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7927 self.assertEqual(json.dumps(tags1['5200,9230']),
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7928 json.dumps(tags3['5200,9230']))
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7929
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7930 # "Remove" on SharedFunctionalGroupsSequence
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7931 for i in range(3):
ad98466353c6 test_modify_subsequences
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 406
diff changeset
7932 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
7933 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
7934
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7935
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7936 def test_bulk_modify(self):
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7937 # New in Orthanc 1.9.4
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7938
411
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
7939 def GetModified(lst, resourceType, expectedCount = None):
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
7940 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
7941 if expectedCount != None:
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7942 self.assertEqual(expectedCount, len(m))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7943 return m
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7944
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7945 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7946 series = DoGet(_REMOTE, '/series') [0]
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7947 study = DoGet(_REMOTE, '/studies') [0]
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7948 patient = DoGet(_REMOTE, '/patients') [0]
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7949
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7950 a = DoPost(_REMOTE, '/tools/bulk-modify', {
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7951 'Resources' : [ instance ]
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
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7954 self.assertNotEqual(instance, GetModified(a, 'Instance', 1) [0])
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7955 self.assertEqual(series, GetModified(a, 'Series', 1) [0])
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7956 self.assertEqual(study, GetModified(a, 'Study', 1) [0])
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7957 self.assertEqual(patient, GetModified(a, 'Patient', 1) [0])
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7958
411
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
7959 b = DoPost(_REMOTE, '/tools/bulk-anonymize', {
410
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7960 'Resources' : [ instance ]
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7961 })
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7962
411
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
7963 self.assertNotEqual(instance, GetModified(b, 'Instance', 1) [0])
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
7964 self.assertNotEqual(series, GetModified(b, 'Series', 1) [0])
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
7965 self.assertNotEqual(study, GetModified(b, 'Study', 1) [0])
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
7966 self.assertNotEqual(patient, GetModified(b, 'Patient', 1) [0])
410
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7967
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7968 self.assertEqual(3, len(DoGet(_REMOTE, '/instances')))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7969 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7970 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7971 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
411
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
7972
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
7973 DoPost(_REMOTE, '/tools/bulk-delete', {
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
7974 'Resources' : GetModified(b, 'Patient', 1) + GetModified(a, 'Instance', 1)
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
7975 })
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
7976
410
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7977 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID']
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7978 knee2 = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') ['ID']
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7979 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID']
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7980
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7981 self.assertEqual(4, len(DoGet(_REMOTE, '/instances')))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7982 self.assertEqual(4, len(DoGet(_REMOTE, '/series')))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7983 self.assertEqual(3, len(DoGet(_REMOTE, '/studies')))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7984 self.assertEqual(3, len(DoGet(_REMOTE, '/patients')))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7985
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7986 a = DoPost(_REMOTE, '/tools/bulk-modify', {
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7987 'Resources' : [ knee1, brainix ]
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
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7990 self.assertEqual(6, len(DoGet(_REMOTE, '/instances')))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7991 self.assertEqual(4, len(DoGet(_REMOTE, '/series')))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7992 self.assertEqual(3, len(DoGet(_REMOTE, '/studies')))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7993 self.assertEqual(3, len(DoGet(_REMOTE, '/patients')))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7994
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7995 for i in GetModified(a, 'Instance', 2):
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7996 self.assertTrue(not i in [ instance, knee1, knee2, brainix ])
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7997 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
7998
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
7999 b = GetModified(a, 'Series', 2)
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8000 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
8001 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
8002 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
8003 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
8004
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8005 b = GetModified(a, 'Study', 2)
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8006 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
8007 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
8008 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
8009 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
8010
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8011 b = GetModified(a, 'Patient', 2)
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8012 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
8013 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
8014 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
8015 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
8016
411
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8017 DoPost(_REMOTE, '/tools/bulk-delete', {
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8018 'Resources' : GetModified(a, 'Instance', 2)
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8019 })
410
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8020
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8021 sourceInstances = DoGet(_REMOTE, '/instances')
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8022 sourceSeries = DoGet(_REMOTE, '/series')
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8023 sourceStudies = DoGet(_REMOTE, '/studies')
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8024 sourcePatients = DoGet(_REMOTE, '/patients')
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8025 self.assertEqual(4, len(sourceInstances))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8026 self.assertEqual(4, len(sourceSeries))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8027 self.assertEqual(3, len(sourceStudies))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8028 self.assertEqual(3, len(sourcePatients))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8029
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8030 a = DoPost(_REMOTE, '/tools/bulk-anonymize', {
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8031 'Resources' : [ knee1, brainix ]
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
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8034 self.assertEqual(6, len(DoGet(_REMOTE, '/instances')))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8035 self.assertEqual(6, len(DoGet(_REMOTE, '/series')))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8036 self.assertEqual(5, len(DoGet(_REMOTE, '/studies')))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8037 self.assertEqual(5, len(DoGet(_REMOTE, '/patients')))
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8038
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8039 for i in GetModified(a, 'Instance', 2):
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8040 self.assertFalse(i in sourceInstances)
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8041 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
8042
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8043 for i in GetModified(a, 'Series', 2):
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8044 self.assertFalse(i in sourceSeries)
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8045 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
8046
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8047 for i in GetModified(a, 'Study', 2):
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8048 self.assertFalse(i in sourceStudies)
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8049 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
8050
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8051 for i in GetModified(a, 'Patient', 2):
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8052 self.assertFalse(i in sourcePatients)
d0c6afc1ff68 test_bulk_modify
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
8053 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
8054
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8055 DoPost(_REMOTE, '/tools/bulk-delete', {
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8056 'Resources' : GetModified(a, 'Patient', 2)
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
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8059 self.assertEqual(4, len(DoGet(_REMOTE, '/instances')))
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8060 self.assertEqual(4, len(DoGet(_REMOTE, '/series')))
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8061 self.assertEqual(3, len(DoGet(_REMOTE, '/studies')))
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8062 self.assertEqual(3, len(DoGet(_REMOTE, '/patients')))
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8063
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8064 DoPost(_REMOTE, '/tools/bulk-delete', {
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8065 'Resources' : [ instance,
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8066 DoGet(_REMOTE, '/instances/%s/patient' % knee1) ['ID'],
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8067 DoGet(_REMOTE, '/instances/%s/series' % brainix) ['ID'] ]
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
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8070 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8071 self.assertEqual(0, len(DoGet(_REMOTE, '/series')))
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8072 self.assertEqual(0, len(DoGet(_REMOTE, '/studies')))
8cf866641fa7 testing bulk deletion
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
8073 self.assertEqual(0, len(DoGet(_REMOTE, '/patients')))
412
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
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8076 def test_dicom_to_json_format(self):
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8077 # 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
8078 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8079 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID']
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8080 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8081 series = DoGet(_REMOTE, '/instances/%s/series' % instance) ['ID']
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8082
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' % instance) ['0010,0010']['Value'])
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?simplify' % instance) ['PatientName'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8085 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
8086 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
8087 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
8088 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
8089
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8090 # Test "GetInstanceHeader()" in "OrthancRestResources.cpp"
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' % instance) ['0002,0010']['Value'])
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?simplify' % instance) ['TransferSyntaxUID'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8093 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
8094 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
8095 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
8096 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
8097
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8098 # Test "ListResources()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8099 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
8100 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
8101 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
8102 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
8103
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8104 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
8105 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
8106 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
8107 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
8108
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8109 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
8110 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
8111 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
8112 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
8113
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8114 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
8115 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
8116 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
8117 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
8118
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8119 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
8120 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
8121 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
8122 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
8123
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8124 # Test "GetSingleResource()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8125 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
8126 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
8127 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
8128 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
8129
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8130 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
8131 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
8132 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
8133 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
8134
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8135 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
8136 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
8137 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
8138 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
8139
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8140 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
8141 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
8142 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
8143 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
8144
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8145 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
8146 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
8147 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
8148 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
8149
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8150 # Test "Find()" in "OrthancRestResources.cpp"
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8151 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
8152 self.assertEqual('20070101', a[0]['MainDicomTags']['StudyDate'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8153 self.assertEqual('KNIX', a[0]['PatientMainDicomTags']['PatientName'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8154
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8155 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
8156 self.assertEqual('20070101', a[0]['MainDicomTags']['0008,0020'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8157 self.assertEqual('KNIX', a[0]['PatientMainDicomTags']['0010,0010'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8158
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8159 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
8160 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
8161 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
8162 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
8163 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
8164
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8165 # Test "GetChildResources()" in "OrthancRestResources.cpp"
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' % patient) [0]['MainDicomTags']['StudyDate'])
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?short' % patient) [0]['MainDicomTags']['0008,0020'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8168 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
8169 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
8170
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' % patient) [0]['MainDicomTags']['SeriesDate'])
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?short' % patient) [0]['MainDicomTags']['0008,0021'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8173 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
8174 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
8175
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' % patient) [0]['MainDicomTags']['InstanceCreationDate'])
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?short' % patient) [0]['MainDicomTags']['0008,0012'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8178 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
8179 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
8180
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' % study) [0]['MainDicomTags']['SeriesDate'])
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?short' % study) [0]['MainDicomTags']['0008,0021'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8183 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
8184 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
8185
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' % study) [0]['MainDicomTags']['InstanceCreationDate'])
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?short' % study) [0]['MainDicomTags']['0008,0012'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8188 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
8189 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
8190
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' % series) [0]['MainDicomTags']['InstanceCreationDate'])
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?short' % series) [0]['MainDicomTags']['0008,0012'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8193 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
8194 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
8195
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8196 # Test "GetParentResource()" in "OrthancRestResources.cpp"
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' % instance) ['MainDicomTags']['PatientName'])
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?short' % instance) ['MainDicomTags']['0010,0010'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8199 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
8200 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
8201
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' % instance) ['MainDicomTags']['StudyDate'])
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?short' % instance) ['MainDicomTags']['0008,0020'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8204 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
8205 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
8206
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' % instance) ['MainDicomTags']['SeriesDate'])
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?short' % instance) ['MainDicomTags']['0008,0021'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8209 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
8210 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
8211
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' % series) ['MainDicomTags']['PatientName'])
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?short' % series) ['MainDicomTags']['0010,0010'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8214 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
8215 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
8216
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' % series) ['MainDicomTags']['StudyDate'])
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?short' % series) ['MainDicomTags']['0008,0020'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8219 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
8220 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
8221
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' % study) ['MainDicomTags']['PatientName'])
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?short' % study) ['MainDicomTags']['0010,0010'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8224 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
8225 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
8226
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8227 # Test "GetChildInstancesTags()" in "OrthancRestResources.cpp"
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?simplify' % patient) [instance]['PatientName'])
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?short' % patient) [instance]['0010,0010'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8230 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
8231 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
8232
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?simplify' % study) [instance]['PatientName'])
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?short' % study) [instance]['0010,0010'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8235 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
8236 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
8237
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?simplify' % series) [instance]['PatientName'])
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?short' % series) [instance]['0010,0010'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8240 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
8241 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
8242
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8243 # Test "GetSharedTags()" in "OrthancRestResources.cpp"
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?simplify' % patient) ['PatientName'])
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?short' % patient) ['0010,0010'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8246 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
8247 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
8248
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?simplify' % study) ['PatientName'])
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?short' % study) ['0010,0010'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8251 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
8252 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
8253
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?simplify' % series) ['PatientName'])
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?short' % series) ['0010,0010'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8256 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
8257 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
8258
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8259 # Test "GetModule()" in "OrthancRestResources.cpp"
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' % patient) ['0010,0010']['Value'])
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?simplify' % patient) ['PatientName'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8262 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
8263
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' % study) ['0010,0010']['Value'])
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?simplify' % study) ['PatientName'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8266 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
8267
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' % study) ['0008,1030']['Value'])
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?simplify' % study) ['StudyDescription'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8270 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
8271
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' % series) ['0008,103e']['Value'])
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?simplify' % series) ['SeriesDescription'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8274 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
8275
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8276 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
8277 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
8278 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
8279 DoGet(_REMOTE, '/instances/%s/module?simplify' % instance) ['SOPInstanceUID'])
cd9da28451cc test_dicom_to_json_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 411
diff changeset
8280 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
8281 DoGet(_REMOTE, '/instances/%s/module?short' % instance) ['0008,0018'])
413
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8282
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8283 # Test "ListQueryAnswers()" in "OrthancRestModalities.cpp"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8284 a = DoPost(_REMOTE, '/modalities/self/query', { 'Level' : 'Study',
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8285 'Query' : { 'PatientID' : '*' }}) ['ID']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8286
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8287 self.assertEqual(1, len(DoGet(_REMOTE, '/queries/%s/answers' % a)))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8288 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers?expand' % a) [0]['0010,0020']['Value'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8289 self.assertEqual('PatientID', DoGet(_REMOTE, '/queries/%s/answers?expand' % a) [0]['0010,0020']['Name'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8290 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers?expand&simplify' % a) [0]['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8291 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers?expand&short' % a) [0]['0010,0020'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8292
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8293 # Test "GetQueryOneAnswer()" in "OrthancRestModalities.cpp"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8294 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers/0/content' % a) ['0010,0020']['Value'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8295 self.assertEqual('PatientID', DoGet(_REMOTE, '/queries/%s/answers/0/content' % a) ['0010,0020']['Name'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8296 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers/0/content?simplify' % a) ['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8297 self.assertEqual('ozp00SjY2xG', DoGet(_REMOTE, '/queries/%s/answers/0/content?short' % a) ['0010,0020'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8298
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8299 # Test "GetQueryArguments()" in "OrthancRestModalities.cpp"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8300 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query' % a) ['0010,0020']['Value'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8301 self.assertEqual('PatientID', DoGet(_REMOTE, '/queries/%s/query' % a) ['0010,0020']['Name'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8302 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query?simplify' % a) ['PatientID'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8303 self.assertEqual('*', DoGet(_REMOTE, '/queries/%s/query?short' % a) ['0010,0020'])
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 412
diff changeset
8304
414
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8305 # Test "BulkContent()" in "OrthancRestResources.cpp"
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8306 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
8307 self.assertEqual(4, len(a))
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8308 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['PatientID'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8309 self.assertEqual('Knee (R)', a[1]['MainDicomTags']['StudyDescription'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8310 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['PatientName'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8311 self.assertEqual('AX. FSE PD', a[2]['MainDicomTags']['SeriesDescription'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8312 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
8313 a[3]['MainDicomTags']['SOPInstanceUID'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8314
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8315 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
8316 'Short': True })
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8317 self.assertEqual(4, len(a))
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8318 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['0010,0020'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8319 self.assertEqual('Knee (R)', a[1]['MainDicomTags']['0008,1030'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8320 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['0010,0010'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8321 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
8322 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
8323 a[3]['MainDicomTags']['0008,0018'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8324
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8325 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
8326 'Full': True })
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8327 self.assertEqual(4, len(a))
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8328 self.assertEqual('ozp00SjY2xG', a[0]['MainDicomTags']['0010,0020']['Value'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8329 self.assertEqual('PatientID', a[0]['MainDicomTags']['0010,0020']['Name'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8330 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
8331 self.assertEqual('StudyDescription', a[1]['MainDicomTags']['0008,1030']['Name'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8332 self.assertEqual('KNIX', a[1]['PatientMainDicomTags']['0010,0010']['Value'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8333 self.assertEqual('PatientName', a[1]['PatientMainDicomTags']['0010,0010']['Name'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8334 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
8335 self.assertEqual('SeriesDescription', a[2]['MainDicomTags']['0008,103e']['Name'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8336 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
8337 a[3]['MainDicomTags']['0008,0018']['Value'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8338 self.assertEqual('SOPInstanceUID', a[3]['MainDicomTags']['0008,0018']['Name'])
a2beea45a53d test /tools/bulk-content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
8339
415
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8340
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8341 def test_bulk_content(self):
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8342 # New in Orthanc 1.9.4
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8343 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID']
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8344 knee2 = UploadInstance(_REMOTE, 'Knee/T2/IM-0001-0001.dcm') ['ID']
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8345 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID']
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8346
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8347 brainixHierarchy = [
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8348 DoGet(_REMOTE, '/instances/%s/patient' % brainix) ['ID'],
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8349 DoGet(_REMOTE, '/instances/%s/study' % brainix) ['ID'],
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8350 DoGet(_REMOTE, '/instances/%s/series' % brainix) ['ID'],
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8351 brainix,
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
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8354 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : brainixHierarchy })
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8355 self.assertEqual(4, len(a))
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8356 b = map(lambda x: x['ID'], a)
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8357 for i in range(4):
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8358 self.assertEqual(brainixHierarchy[i], b[i])
418
8a3d67a40083 test "Metadata" in "/tools/bulk-content"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
8359 self.assertTrue('Metadata' in a[i])
415
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8360
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8361 for (level, index) in [
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8362 ('Patient', 0),
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8363 ('Study', 1),
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8364 ('Series', 2),
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8365 ('Instance', 3),
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8366 ]:
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8367 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : brainixHierarchy,
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8368 'Level' : level })
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8369 self.assertEqual(1, len(a))
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8370 self.assertEqual(level, a[0]['Type'])
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8371 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
8372 self.assertTrue('Metadata' in a[0])
415
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8373
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8374 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
8375 'Level' : level,
8a3d67a40083 test "Metadata" in "/tools/bulk-content"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
8376 'Metadata' : False })
415
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8377 self.assertEqual(1, len(a))
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8378 self.assertEqual(level, a[0]['Type'])
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8379 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
8380 self.assertFalse('Metadata' in a[0])
415
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8381
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8382 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, knee2, brainix ] })
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8383 self.assertEqual(3, len(a))
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8384 for item in a:
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8385 self.assertEqual('Instance', item['Type'])
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8386 b = map(lambda x: x['ID'], a)
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8387 self.assertTrue(knee1 in b)
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8388 self.assertTrue(knee2 in b)
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8389 self.assertTrue(brainix in b)
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8390
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8391 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, knee2 ],
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8392 'Level' : 'Series' })
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8393 self.assertEqual(2, len(a))
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8394 for item in a:
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8395 self.assertEqual('Series', item['Type'])
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8396 b = map(lambda x: x['ID'], a)
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8397 self.assertTrue(DoGet(_REMOTE, '/instances/%s' % knee1) ['ParentSeries'] in b)
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8398 self.assertTrue(DoGet(_REMOTE, '/instances/%s' % knee2) ['ParentSeries'] in b)
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8399
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8400 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
8401 'Level' : 'Study',
8a3d67a40083 test "Metadata" in "/tools/bulk-content"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
8402 'Metadata' : False })
415
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8403 self.assertEqual(1, len(a))
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8404 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
8405 self.assertEqual('Study', a[0]['Type'])
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8406 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
8407 self.assertFalse('Metadata' in a[0])
415
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8408
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8409 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
8410 'Level' : 'Patient',
8a3d67a40083 test "Metadata" in "/tools/bulk-content"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
8411 'Metadata' : True })
415
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8412 self.assertEqual(1, len(a))
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8413 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
8414 self.assertEqual('Patient', a[0]['Type'])
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8415 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
8416 self.assertTrue('Metadata' in a[0])
451
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
8417 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
8418 self.assertEqual(2, len(a[0]['Metadata']))
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
8419 self.assertTrue('MainDicomTagsSignature' in a[0]['Metadata'])
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
8420 else:
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
8421 self.assertEqual(1, len(a[0]['Metadata']))
33051f9ac850 new metadata MainDicomTagsSignature
Alain Mazy <am@osimis.io>
parents: 449
diff changeset
8422 self.assertTrue('LastUpdate' in a[0]['Metadata'])
415
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8423
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8424 for level in [ 'Instance', 'Series', 'Study', 'Patient' ]:
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8425 a = DoPost(_REMOTE, '/tools/bulk-content', { 'Resources' : [ knee1, brainix ],
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8426 'Level' : level })
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8427 self.assertEqual(2, len(a))
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8428 for item in a:
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8429 self.assertEqual(level, item['Type'])
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8430 b = map(lambda x: x['ID'], a)
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8431 if level == 'Instance':
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8432 self.assertTrue(knee1 in b)
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8433 self.assertTrue(brainix in b)
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8434 else:
fa6c4b82c027 test_bulk_content
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
8435 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
8436 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
8437
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8438
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8439 def test_split_instances(self):
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8440 # New in 1.9.4
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8441 knee1 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID']
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8442 knee2 = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm') ['ID']
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8443 study = '0a9b3153-2512774b-2d9580de-1fc3dcf6-3bd83918'
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8444 series = '6de73705-c4e65c1b-9d9ea1b5-cabcd8e7-f15e4285'
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8445
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8446 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8447 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8448 self.assertEqual(1, len(DoGet(_REMOTE, '/series')))
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8449
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8450 instances = DoGet(_REMOTE, '/instances')
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8451 self.assertEqual(2, len(instances))
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8452 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
8453 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
8454 for i in [ knee1, knee2 ]:
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8455 self.assertEqual(series, DoGet(_REMOTE, '/instances/%s/series' % i) ['ID'])
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8456 self.assertEqual(study, DoGet(_REMOTE, '/instances/%s/study' % i) ['ID'])
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8457
417
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8458 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8459 'KeepSource' : False
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8460 })) # Neither "Instances", nor "Series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8461
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8462 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8463 'KeepSource' : False,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8464 'Instances' : [ ],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8465 'Series' : [ ]
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8466 })) # Empty "Instances" and "Series"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8467
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8468 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8469 'Instances' : [ 'nope' ],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8470 'KeepSource' : False
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8471 }))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8472
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8473 self.assertRaises(Exception, lambda: DoPost(_REMOTE, '/studies/%s/split' % study, {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8474 'Series' : [ 'nope' ],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8475 'KeepSource' : False
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8476 }))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 416
diff changeset
8477
416
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8478 result = DoPost(_REMOTE, '/studies/%s/split' % study, {
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8479 'Instances' : [ knee1 ],
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8480 'KeepSource' : False
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
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8483 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8484 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8485 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8486
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8487 instances = DoGet(_REMOTE, '/instances')
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8488 self.assertEqual(2, len(instances))
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8489
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8490 self.assertFalse(knee1 in instances)
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8491 self.assertTrue(knee2 in instances)
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8492 instances.remove(knee2)
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8493 self.assertEqual(series, DoGet(_REMOTE, '/instances/%s/series' % knee2) ['ID'])
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8494 self.assertEqual(study, DoGet(_REMOTE, '/instances/%s/study' % knee2) ['ID'])
80164728c038 test_split_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
8495 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
8496 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
8497 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
8498
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8499
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8500 def test_merge_instances(self):
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8501 # New in Orthanc 1.9.4
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8502 knee = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm') ['ID']
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8503 brainix = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') ['ID']
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8504 brainixStudy = DoGet(_REMOTE, '/instances/%s/study' % brainix) ['ID']
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8505
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8506 self.assertEqual(2, len(DoGet(_REMOTE, '/patients')))
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8507 self.assertEqual(2, len(DoGet(_REMOTE, '/studies')))
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8508 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8509 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8510
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8511 instances = DoGet(_REMOTE, '/instances')
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8512 self.assertEqual(2, len(instances))
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8513 self.assertTrue(brainix in instances)
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8514 self.assertTrue(knee in instances)
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8515
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8516 result = DoPost(_REMOTE, '/studies/%s/merge' % brainixStudy, {
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8517 'Resources' : [ knee ]
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
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8520 self.assertEqual(1, len(DoGet(_REMOTE, '/patients')))
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8521 self.assertEqual(1, len(DoGet(_REMOTE, '/studies')))
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8522 self.assertEqual(2, len(DoGet(_REMOTE, '/series')))
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8523 self.assertEqual(brainixStudy, DoGet(_REMOTE, '/studies')[0])
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8524
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8525 instances = DoGet(_REMOTE, '/instances')
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8526 self.assertEqual(2, len(instances))
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8527 self.assertTrue(brainix in instances)
6a57c4efe38a test_merge_instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
8528 self.assertFalse(knee in instances)
423
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
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8531 def test_query_retrieve_format(self):
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8532 # New in Orthanc 1.9.5
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8533 # 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
8534 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
8535 study = DoGet(_REMOTE, '/instances/%s/study' % i) ['MainDicomTags']['StudyInstanceUID']
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8536
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8537 a = DoPost(_REMOTE, '/modalities/self/query', {
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8538 'Level' : 'Study',
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8539 'Query' : {}
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
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8542 b = DoGet(_REMOTE, a['Path'] + '/answers')
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8543 self.assertEqual(1, len(b))
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8544 self.assertEqual('0', b[0])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8545
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8546 b = DoGet(_REMOTE, a['Path'] + '/answers?expand')
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8547 self.assertEqual(1, len(b))
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8548 self.assertEqual(6, len(b[0]))
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8549 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
8550 self.assertEqual('SpecificCharacterSet', b[0]['0008,0005']['Name'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8551 self.assertEqual('A10003245599', b[0]['0008,0050']['Value'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8552 self.assertEqual('AccessionNumber', b[0]['0008,0050']['Name'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8553 self.assertEqual('STUDY', b[0]['0008,0052']['Value'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8554 self.assertEqual('QueryRetrieveLevel', b[0]['0008,0052']['Name'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8555 self.assertEqual('ORTHANC', b[0]['0008,0054']['Value'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8556 self.assertEqual('RetrieveAETitle', b[0]['0008,0054']['Name'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8557 self.assertEqual('887', b[0]['0010,0020']['Value'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8558 self.assertEqual('PatientID', b[0]['0010,0020']['Name'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8559 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
8560 self.assertEqual('StudyInstanceUID', b[0]['0020,000d']['Name'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8561
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8562 for (key, value) in b[0].items():
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8563 self.assertEqual('String', value['Type'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8564
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8565 self.assertEqual(json.dumps(b[0]),
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8566 json.dumps(DoGet(_REMOTE, a['Path'] + '/answers/0/content')))
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8567
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8568 # 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
8569
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8570 b = DoGet(_REMOTE, a['Path'] + '/answers?expand&short')
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8571 self.assertEqual(1, len(b))
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8572 self.assertEqual(6, len(b[0]))
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8573 self.assertEqual('ISO_IR 100', b[0]['0008,0005'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8574 self.assertEqual('A10003245599', b[0]['0008,0050'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8575 self.assertEqual('STUDY', b[0]['0008,0052'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8576 self.assertEqual('ORTHANC', b[0]['0008,0054'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8577 self.assertEqual('887', b[0]['0010,0020'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8578 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
8579 self.assertEqual(json.dumps(b[0]),
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8580 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
8581
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8582 b = DoGet(_REMOTE, a['Path'] + '/answers?expand&simplify')
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8583 self.assertEqual(1, len(b))
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8584 self.assertEqual(6, len(b[0]))
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8585 self.assertEqual('ISO_IR 100', b[0]['SpecificCharacterSet'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8586 self.assertEqual('A10003245599', b[0]['AccessionNumber'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8587 self.assertEqual('STUDY', b[0]['QueryRetrieveLevel'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8588 self.assertEqual('ORTHANC', b[0]['RetrieveAETitle'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8589 self.assertEqual('887', b[0]['PatientID'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8590 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
8591 self.assertEqual(json.dumps(b[0]),
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8592 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
8593
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8594 b = DoPost(_REMOTE, '/queries/%s/retrieve' % a['ID'], {})
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8595 self.assertEqual('REST API', b['Description'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8596 self.assertEqual('ORTHANC', b['LocalAet'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8597 self.assertEqual('ORTHANC', b['RemoteAet'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8598 self.assertEqual(1, len(b['Query']))
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8599 self.assertEqual(4, len(b['Query'][0]))
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8600 self.assertEqual('A10003245599', b['Query'][0]['0008,0050'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8601 self.assertEqual('STUDY', b['Query'][0]['0008,0052'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8602 self.assertEqual('887', b['Query'][0]['0010,0020'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8603 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
8604
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8605 # 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
8606
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8607 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
8608 self.assertEqual('REST API', b['Description'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8609 self.assertEqual('ORTHANC', b['LocalAet'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8610 self.assertEqual('ORTHANC', b['RemoteAet'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8611 self.assertEqual(1, len(b['Query']))
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8612 self.assertEqual(4, len(b['Query'][0]))
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8613 self.assertEqual('A10003245599', b['Query'][0]['0008,0050']['Value'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8614 self.assertEqual('STUDY', b['Query'][0]['0008,0052']['Value'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8615 self.assertEqual('887', b['Query'][0]['0010,0020']['Value'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8616 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
8617 self.assertEqual('AccessionNumber', b['Query'][0]['0008,0050']['Name'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8618 self.assertEqual('QueryRetrieveLevel', b['Query'][0]['0008,0052']['Name'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8619 self.assertEqual('PatientID', b['Query'][0]['0010,0020']['Name'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8620 self.assertEqual('StudyInstanceUID', b['Query'][0]['0020,000d']['Name'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8621
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8622 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
8623 self.assertEqual('REST API', b['Description'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8624 self.assertEqual('ORTHANC', b['LocalAet'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8625 self.assertEqual('ORTHANC', b['RemoteAet'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8626 self.assertEqual(1, len(b['Query']))
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8627 self.assertEqual(4, len(b['Query'][0]))
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8628 self.assertEqual('A10003245599', b['Query'][0]['AccessionNumber'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8629 self.assertEqual('STUDY', b['Query'][0]['QueryRetrieveLevel'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8630 self.assertEqual('887', b['Query'][0]['PatientID'])
cef3847dc8af test_query_retrieve_format
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 420
diff changeset
8631 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
8632
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8633
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8634 def test_anonymize_nested(self):
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8635 # New in Orthanc 1.9.5
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8636
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8637 tags = {
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8638 'MappingResourceIdentificationSequence' : [
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8639 {
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8640 # Test "DicomModification::RelationshipsVisitor::GetDefaultAction()"
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8641 '0009,1002' : 'ABCD', # Private tag not registered in dictionary
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8642 '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
8643 '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
8644
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8645 # Test "DicomModification::RelationshipsVisitor::VisitString()"
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8646 'StudyDescription' : 'Hello', # Removed
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8647 'StudyDate' : '20210705', # Cleared
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8648 '0009,1001' : '-1234', # Private tag whose VR is DS
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8649
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8650 # Test anonymization of nested sequences
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8651 'ReferencedStudySequence' : [
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8652 {
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8653 'PatientID' : 'HELLO'
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
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8657 # Non-anonymized tags
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8658 'CodeMeaning' : 'MEANING1',
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8659 'EquivalentCodeSequence' : [
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8660 {
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8661 'CodeMeaning' : 'MEANING2',
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
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8668 a = DoPost(_REMOTE, '/tools/create-dicom',
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8669 json.dumps({
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8670 'Tags' : tags,
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8671 'PrivateCreator' : 'Lunit',
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8672 })) ['ID']
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8673
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8674 study = DoGet(_REMOTE, '/instances/%s/study' % a) ['ID']
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8675 b = DoPost(_REMOTE, '/studies/%s/anonymize' % study, {}) ['ID']
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8676 c = DoGet(_REMOTE, '/studies/%s/instances' % b)
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8677 self.assertEqual(1, len(c))
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8678
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8679 tags1 = DoGet(_REMOTE, '/instances/%s/tags?short' % a)
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8680 tags2 = DoGet(_REMOTE, '/instances/%s/tags?short' % c[0]['ID'])
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8681
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8682 # Only "StudyDate" must be present in
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8683 # "MappingResourceIdentificationSequence" after anonymization
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8684 self.assertEqual(1, len(tags1['0008,0124']))
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8685 self.assertEqual(1, len(tags2['0008,0124']))
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8686 self.assertEqual(9, len(tags1['0008,0124'][0]))
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8687 self.assertEqual(3, len(tags2['0008,0124'][0]))
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8688 self.assertEqual('', tags2['0008,0124'][0]['0008,0020'])
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8689 self.assertEqual('MEANING1', tags2['0008,0124'][0]['0008,0104'])
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8690 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
8691
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8692 self.assertTrue('0008,1110' in tags1['0008,0124'][0])
934f505677da test_anonymize_nested
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 423
diff changeset
8693 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
8694
77455e156112 integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 424
diff changeset
8695
77455e156112 integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 424
diff changeset
8696 def test_issue_200(self):
77455e156112 integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 424
diff changeset
8697 # 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
8698 # https://bugs.orthanc-server.com/show_bug.cgi?id=200
428
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 427
diff changeset
8699 self.assertEqual(0, len(DoGet(_REMOTE, '/changes') ['Changes']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 427
diff changeset
8700 self.assertEqual(0, len(DoGet(_REMOTE, '/changes?last') ['Changes']))
429
f42c610234b0 test exports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 428
diff changeset
8701 u = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
427
77455e156112 integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 424
diff changeset
8702
77455e156112 integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 424
diff changeset
8703 for change in DoGet(_REMOTE, '/changes') ['Changes']:
77455e156112 integration test for issue 200
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 424
diff changeset
8704 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
8705 self.assertTrue(re.match('[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}-[0-9a-z]{8}', change['ID']))
428
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 427
diff changeset
8706
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 427
diff changeset
8707 last = DoGet(_REMOTE, '/changes?last') ['Changes']
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 427
diff changeset
8708 self.assertEqual(1, len(last))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 427
diff changeset
8709 self.assertTrue(re.match('[0-9]{8}T[0-9]{6}', last[0]['Date']))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 427
diff changeset
8710 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
8711
f42c610234b0 test exports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 428
diff changeset
8712 self.assertEqual(0, len(DoGet(_REMOTE, '/exports') ['Exports']))
f42c610234b0 test exports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 428
diff changeset
8713 self.assertEqual(0, len(DoGet(_REMOTE, '/exports?last') ['Exports']))
f42c610234b0 test exports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 428
diff changeset
8714 DoPost(_REMOTE, '/modalities/self/store', [ u ])
f42c610234b0 test exports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 428
diff changeset
8715
f42c610234b0 test exports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 428
diff changeset
8716 for change in DoGet(_REMOTE, '/exports') ['Exports']:
f42c610234b0 test exports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 428
diff changeset
8717 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
8718 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
8719
f42c610234b0 test exports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 428
diff changeset
8720 last = DoGet(_REMOTE, '/exports?last') ['Exports']
f42c610234b0 test exports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 428
diff changeset
8721 self.assertEqual(1, len(last))
f42c610234b0 test exports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 428
diff changeset
8722 self.assertEqual('ozp00SjY2xG', last[0]['PatientID'])
f42c610234b0 test exports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 428
diff changeset
8723 self.assertEqual('self', last[0]['RemoteModality'])
f42c610234b0 test exports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 428
diff changeset
8724 self.assertEqual('Instance', last[0]['ResourceType'])
f42c610234b0 test exports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 428
diff changeset
8725 self.assertEqual('/instances/%s' % last[0]['ID'], last[0]['Path'])
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.390', last[0]['StudyInstanceUID'])
f42c610234b0 test exports
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 428
diff changeset
8727 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
8728 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
8729 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
8730 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
8731
e665c493e23e test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 429
diff changeset
8732
e665c493e23e test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 429
diff changeset
8733 def test_upload_dicomdir_archive(self):
e665c493e23e test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 429
diff changeset
8734 # This test fails on Orthanc <= 1.9.6
e665c493e23e test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 429
diff changeset
8735 # 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
8736
e665c493e23e test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 429
diff changeset
8737 # Create a ZIP archive with a DICOMDIR
e665c493e23e test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 429
diff changeset
8738 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
e665c493e23e test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 429
diff changeset
8739 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
e665c493e23e test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 429
diff changeset
8740 media = DoGet(_REMOTE, '/studies/%s/media' % study)
e665c493e23e test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 429
diff changeset
8741 DoDelete(_REMOTE, '/instances/%s' % instance)
e665c493e23e test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 429
diff changeset
8742
e665c493e23e test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 429
diff changeset
8743 result = DoPost(_REMOTE, '/instances', media)
e665c493e23e test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 429
diff changeset
8744 self.assertEqual(1, len(result))
e665c493e23e test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 429
diff changeset
8745 self.assertEqual(instance, result[0]['ID'])
e665c493e23e test_upload_dicomdir_archive
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 429
diff changeset
8746 self.assertEqual('Success', result[0]['Status'])
432
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
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8749 def test_modify_keep_source(self):
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8750 # 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
8751 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8752 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8753 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8754
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8755 a = DoPost(_REMOTE, '/studies/%s/anonymize' % study, {}) ['ID']
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8756 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8757 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8758 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8759
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8760 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
8761 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8762 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8763 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8764
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8765 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
8766 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8767 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8768 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8769
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8770 UploadInstance(_REMOTE, 'DummyCT.dcm')
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8771 a = DoPost(_REMOTE, '/studies/%s/modify' % study, { 'Replace' : { } }) ['ID']
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8772 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8773 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8774 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8775
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8776 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
8777 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8778 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8779 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8780
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8781 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
8782 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8783 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8784 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8785
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8786 def GetStudy(a):
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8787 b = filter(lambda x: x['Type'] == 'Study', a['Resources'])
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8788 if len(b) == 1:
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8789 return b[0]['ID']
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8790 else:
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8791 raise Exception()
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8792
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8793 UploadInstance(_REMOTE, 'DummyCT.dcm')
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8794 a = GetStudy(DoPost(_REMOTE, '/tools/bulk-anonymize', { 'Resources' : [ study ]}))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8795 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8796 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8797 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8798
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8799 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
8800 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8801 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8802 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8803
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8804 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
8805 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8806 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8807 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8808
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8809 UploadInstance(_REMOTE, 'DummyCT.dcm')
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8810 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
8811 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8812 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8813 # 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
8814 # 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
8815 # the original instance
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8816 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8817
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8818 # 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
8819 # introduced in 1.9.7
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8820
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8821 UploadInstance(_REMOTE, 'DummyCT.dcm')
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8822 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
8823 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8824 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8825 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8826
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8827 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
8828 self.assertEqual(2, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8829 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8830 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8831
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8832 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
8833 self.assertEqual(1, len(DoGet(_REMOTE, '/instances')))
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8834 DoDelete(_REMOTE, '/studies/%s' % a)
f4609c97e995 test_modify_keep_source
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 431
diff changeset
8835 self.assertEqual(0, len(DoGet(_REMOTE, '/instances')))
433
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
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8838 def test_multiframe_windowing(self):
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8839 # Fixed in Orthanc 1.9.7
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8840 a = UploadInstance(_REMOTE, 'MultiframeWindowing.dcm') ['ID']
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8841
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8842 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
8843 self.assertEqual(0x00, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8844 self.assertEqual(0x10, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8845 self.assertEqual(0x20, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8846 self.assertEqual(0x30, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8847
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8848 # 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
8849 # mid-level value (i.e. 127)
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8850 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
8851 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8852 self.assertEqual(127, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8853 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8854 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8855
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8856 # 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
8857 im = GetImage(_REMOTE, '/instances/%s/frames/0/rendered' % a)
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8858 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8859 self.assertEqual(127, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8860 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8861 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8862
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8863 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
8864 self.assertEqual(100, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8865 self.assertEqual(116, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8866 self.assertEqual(132, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8867 self.assertEqual(148, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8868
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8869 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
8870 self.assertEqual(0, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8871 self.assertEqual(32, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8872 self.assertEqual(64, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8873 self.assertEqual(96, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8874
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8875 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
8876 self.assertEqual(100, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8877 self.assertEqual(132, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8878 self.assertEqual(164, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8879 self.assertEqual(196, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8880
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8881 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
8882 self.assertEqual(127 - 2 * 16, im.getpixel((0, 0)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8883 self.assertEqual(127, im.getpixel((1, 0)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8884 self.assertEqual(127 + 2 * 16, im.getpixel((0, 1)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8885 self.assertEqual(127 + 2 * 32, im.getpixel((1, 1)))
cb579ad96a6c test_multiframe_windowing
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
8886
436
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8887
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8888 def test_dicom_seg(self):
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8889 # This test fails in Orthanc <= 1.9.7
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8890 a = UploadInstance(_REMOTE, 'DicomSeg.dcm') ['ID']
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8891
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8892 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
8893 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
8894
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8895 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
8896 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
8897
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8898 for i in range(96):
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8899 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
8900 self.assertEqual('L', im.mode)
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8901 self.assertEqual(256, im.size[0])
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8902 self.assertEqual(256, im.size[1])
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8903
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8904 e = im.getextrema()
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8905 self.assertEqual(0, e[0])
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8906
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8907 if e[1] == 0:
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8908 self.assertFalse(i in nonEmptyFrames)
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8909 else:
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8910 self.assertTrue(i in nonEmptyFrames)
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8911
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8912 im1 = GetImage(_REMOTE, '/instances/%s/frames/44/preview' % a)
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8913
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8914 # 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
8915 im2 = Image.open(GetDatabasePath('DicomSeg-Frame45.pgm'))
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8916 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
8917
9f87d5b2b382 added test_dicom_seg
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 433
diff changeset
8918 self.assertTrue(ImageChops.difference(im1, im2).getbbox() is None)
440
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
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8921 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
8922 # New in Orthanc 1.10.0
440
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8923 a = UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm')['ID']
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8924 UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0002.dcm')
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8925 b = UploadInstance(_REMOTE, 'DicomSeg.dcm') ['ID']
441
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8926 d = UploadInstance(_REMOTE, 'Issue124.dcm') ['ID']
440
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8927
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8928 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
8929 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8930 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8931 self.assertEqual((288, 288, 1), c.shape)
441
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8932 self.assertAlmostEqual(0, c.min())
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8933 self.assertAlmostEqual(536, c.max())
440
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8934
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8935 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
8936 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8937 self.assertEqual(numpy.uint16, c.dtype)
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8938 self.assertEqual((288, 288, 1), c.shape)
441
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8939 self.assertEqual(0, c.min())
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8940 self.assertEqual(536, c.max())
440
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8941
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8942 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
8943 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8944 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8945 self.assertEqual((1, 288, 288, 1), c.shape)
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8946
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8947 series = DoGet(_REMOTE, '/instances/%s/series' % a)['ID']
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8948 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
8949 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8950 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8951 self.assertEqual((2, 288, 288, 1), c.shape)
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8952
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8953 series = DoGet(_REMOTE, '/instances/%s/series' % a)['ID']
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8954 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
8955 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8956 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8957 self.assertEqual((2, 288, 288, 1), c.shape)
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8958
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8959 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
8960 self.assertTrue(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8961 self.assertEqual(1, len(c.files))
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8962 self.assertEqual(numpy.float32, c['arr_0'].dtype)
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8963 self.assertEqual((1, 288, 288, 1), c['arr_0'].shape)
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8964
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8965 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
8966 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8967 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8968 self.assertEqual((256, 256, 1), c.shape)
441
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8969 self.assertAlmostEqual(0, c.min())
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8970 self.assertAlmostEqual(0, c.max())
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8971
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8972 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
8973 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8974 self.assertEqual(numpy.float32, c.dtype)
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8975 self.assertEqual((256, 256, 1), c.shape)
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8976 self.assertAlmostEqual(0, c.min())
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8977 self.assertAlmostEqual(255, c.max())
440
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8978
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8979 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
8980 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8981 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8982 self.assertEqual((96, 256, 256, 1), c.shape)
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8983
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8984 series = DoGet(_REMOTE, '/instances/%s/series' % b)['ID']
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8985 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
8986 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8987 self.assertEqual(numpy.float32, c.dtype)
3a5222eb4c93 added test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 439
diff changeset
8988 self.assertEqual((96, 256, 256, 1), c.shape)
441
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8989
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8990 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
8991 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8992 self.assertEqual(numpy.float32, c.dtype)
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8993 self.assertEqual((512, 512, 1), c.shape)
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8994 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
8995 self.assertAlmostEqual(2374, c.max())
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8996
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8997 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
8998 self.assertFalse(isinstance(c, numpy.lib.npyio.NpzFile))
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
8999 self.assertEqual(numpy.int16, c.dtype)
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
9000 self.assertEqual((512, 512, 1), c.shape)
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
9001 self.assertEqual(-2000, c.min())
21a45ddc9256 expanded test_numpy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
9002 self.assertEqual(3398, c.max())
442
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
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9005 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
9006 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
9007
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9008 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
9009 "Replace" : {
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9010 "PatientName" : "MyName[*]",
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9011 "PatientID": "test_brackets"
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9012 },
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9013 "Force": True
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9014 }),
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9015 'application/json')
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9016
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9017 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
9018
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9019 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
9020 'Query' : { 'PatientName' : 'MyName[*]' }})
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9021 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9022
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9023 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
9024 'Query' : { 'PatientName' : 'MyName[*]' }})
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9025 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9026
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9027 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
9028 'Query' : { 'PatientName' : 'MyName*' }})
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9029 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9030
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9031 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
9032 'Query' : { 'PatientName' : 'MyName*' }})
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9033 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9034
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9035 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
9036 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
9037
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9038 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
9039 "Replace" : {
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9040 "PatientName" : "MyName2[]",
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9041 "PatientID": "test_brackets2"
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9042 },
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9043 "Force": True
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9044 }),
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9045 'application/json')
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9046
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9047 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
9048
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9049 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
9050 'Query' : { 'PatientName' : 'MyName2[*]' }})
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9051 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9052
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9053 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
9054 'Query' : { 'PatientName' : 'MyName2[*]' }})
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9055 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9056
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9057 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
9058 'Query' : { 'PatientName' : 'MyName2*' }})
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9059 self.assertEqual(1, len(a))
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9060
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9061 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
9062 'Query' : { 'PatientName' : 'MyName2*' }})
af57603438b3 added tests for patient names with square brackets
Alain Mazy <am@osimis.io>
parents: 441
diff changeset
9063 self.assertEqual(1, len(a))
455
f53cd250becc test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 449
diff changeset
9064
f53cd250becc test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 449
diff changeset
9065
452
45dd181b0f17 added test for requestedTags in tools/find + list-resources
Alain Mazy <am@osimis.io>
parents: 451
diff changeset
9066 def test_rest_find_requested_tags(self):
486
6144ef431512 new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents: 482
diff changeset
9067 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
9068
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9069 # Upload instances
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9070 for i in range(2):
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9071 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
9072
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9073 # Patient level
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9074 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9075 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9076 'Query' : { 'PatientName' : 'BRAINIX' },
486
6144ef431512 new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents: 482
diff changeset
9077 'RequestedTags' : [ 'PatientName', 'PatientID', 'PatientSex', 'PatientBirthDate'],
471
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9078 'Expand': True
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9079 })
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9080 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9081 self.assertIn('PatientName', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9082 self.assertIn('PatientID', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9083 self.assertIn('PatientSex', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9084 self.assertIn('PatientBirthDate', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9085
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9086 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9087 self.assertEqual('5Yp0E', a[0]['RequestedTags']['PatientID'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9088 self.assertEqual('0000', a[0]['RequestedTags']['PatientSex'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9089 self.assertEqual('19490301', a[0]['RequestedTags']['PatientBirthDate'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9090
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9091 # Study level, request patient tags too
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9092 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9093 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9094 'Query' : { 'PatientName' : 'BRAINIX' },
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9095 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID'],
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9096 'Expand': True
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9097 })
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9098 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9099 self.assertIn('PatientName', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9100 self.assertIn('StudyInstanceUID', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9101
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9102 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9103 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
9104
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9105
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9106 # Series level, request patient and study tags too
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9107 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9108 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9109 'Query' : { 'PatientName' : 'BRAINIX' },
486
6144ef431512 new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents: 482
diff changeset
9110 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SeriesInstanceUID', 'RequestAttributesSequence'],
471
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9111 'Expand': True
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9112 })
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9113 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9114 self.assertIn('PatientName', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9115 self.assertIn('StudyInstanceUID', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9116 self.assertIn('SeriesInstanceUID', a[0]['RequestedTags'])
486
6144ef431512 new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents: 482
diff changeset
9117 self.assertIn('RequestAttributesSequence', a[0]['RequestedTags'])
471
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9118
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9119 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9120 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
9121 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
9122 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
9123
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9124
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9125 # 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
9126 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9127 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9128 'Query' : { 'PatientName' : 'BRAINIX' },
486
6144ef431512 new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents: 482
diff changeset
9129 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SeriesInstanceUID', 'SOPInstanceUID', 'PhotometricInterpretation', 'RequestAttributesSequence'],
471
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9130 'Expand': True
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9131 })
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9132 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9133 self.assertIn('PatientName', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9134 self.assertIn('StudyInstanceUID', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9135 self.assertIn('SeriesInstanceUID', a[0]['RequestedTags'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9136 self.assertIn('PhotometricInterpretation', a[0]['RequestedTags'])
486
6144ef431512 new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents: 482
diff changeset
9137 self.assertIn('RequestAttributesSequence', a[0]['RequestedTags'])
471
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9138
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9139 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9140 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
9141 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
9142 self.assertEqual('MONOCHROME2', a[0]['RequestedTags']['PhotometricInterpretation'])
486
6144ef431512 new tests for sequences in ExtraMainDicomTags
Alain Mazy <am@osimis.io>
parents: 482
diff changeset
9143 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
9144
45dd181b0f17 added test for requestedTags in tools/find + list-resources
Alain Mazy <am@osimis.io>
parents: 451
diff changeset
9145
453
46ae8fb09254 test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents: 452
diff changeset
9146 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
9147 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9148 # Upload instances
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9149 for i in range(2):
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9150 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
9151
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9152
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9153 # Patient level
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9154 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Patient',
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9155 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9156 'Query' : { 'PatientName' : 'BRAINIX' },
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9157 'RequestedTags' : [ 'PatientName', 'NumberOfPatientRelatedStudies', 'NumberOfPatientRelatedSeries', 'NumberOfPatientRelatedInstances'],
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9158 'Expand': True
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9159 })
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9160 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9161
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9162 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9163 self.assertEqual('1', a[0]['RequestedTags']['NumberOfPatientRelatedStudies'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9164 self.assertEqual('1', a[0]['RequestedTags']['NumberOfPatientRelatedSeries'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9165 self.assertEqual('2', a[0]['RequestedTags']['NumberOfPatientRelatedInstances'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9166
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9167 # Study level
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9168 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Study',
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9169 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9170 'Query' : { 'PatientName' : 'BRAINIX' },
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9171 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'ModalitiesInStudy', 'SOPClassesInStudy', 'NumberOfStudyRelatedInstances', 'NumberOfStudyRelatedSeries'],
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9172 'Expand': True
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9173 })
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9174 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9175
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9176 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9177 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
9178 self.assertEqual('MR', a[0]['RequestedTags']['ModalitiesInStudy'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9179 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
9180 self.assertEqual('2', a[0]['RequestedTags']['NumberOfStudyRelatedInstances'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9181 self.assertEqual('1', a[0]['RequestedTags']['NumberOfStudyRelatedSeries'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9182
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9183 # Series level
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9184 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series',
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9185 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9186 'Query' : { 'PatientName' : 'BRAINIX' },
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9187 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'NumberOfSeriesRelatedInstances'],
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9188 'Expand': True
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9189 })
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9190 self.assertEqual(1, len(a))
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9191
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9192 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9193 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
9194 self.assertEqual('2', a[0]['RequestedTags']['NumberOfSeriesRelatedInstances'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9195
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9196 # Instance level
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9197 a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Instance',
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9198 'CaseSensitive' : False,
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9199 'Query' : { 'PatientName' : 'BRAINIX' },
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9200 'RequestedTags' : [ 'PatientName', 'StudyInstanceUID', 'SOPInstanceUID', 'InstanceAvailability'],
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9201 'Expand': True
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9202 })
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9203 self.assertEqual(2, len(a))
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9204
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9205 self.assertEqual('BRAINIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9206 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
9207 self.assertEqual('ONLINE', a[0]['RequestedTags']['InstanceAvailability'])
456
Alain Mazy <am@osimis.io>
parents: 454
diff changeset
9208
452
45dd181b0f17 added test for requestedTags in tools/find + list-resources
Alain Mazy <am@osimis.io>
parents: 451
diff changeset
9209 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
9210
471
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9211 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9212 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9213 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID']
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9214 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9215
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9216 # 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
9217 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
9218
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9219 self.assertEqual('2D', a[0]['RequestedTags']['MRAcquisitionType'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9220 self.assertEqual('MR', a[0]['RequestedTags']['Modality'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9221 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9222 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
9223
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9224 # list studies and request patient and studies tags
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9225 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
9226
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9227 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
9228 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
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
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9231 # 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
9232 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
9233
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.390', a[0]['RequestedTags']['StudyInstanceUID'])
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.7391.1171285944.394', a[0]['RequestedTags']['SeriesInstanceUID'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9236 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
9237 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9238 self.assertEqual('512', a[0]['RequestedTags']['Rows'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9239 self.assertEqual('512', a[0]['RequestedTags']['Columns'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9240 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
9241
453
46ae8fb09254 test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents: 452
diff changeset
9242
46ae8fb09254 test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents: 452
diff changeset
9243 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
9244
471
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9245 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9246 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9247 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID']
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9248 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9249
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9250 # 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
9251 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
9252
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9253 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
9254 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9255 self.assertEqual('MR', a[0]['RequestedTags']['ModalitiesInStudy'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9256 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
9257 self.assertEqual('1', a[0]['RequestedTags']['NumberOfStudyRelatedInstances'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9258 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
9259
46ae8fb09254 test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents: 452
diff changeset
9260
46ae8fb09254 test computed tags for tools/find and list-resources
Alain Mazy <am@osimis.io>
parents: 452
diff changeset
9261 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
9262
471
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9263 if IsOrthancVersionAbove(_REMOTE, 1, 11, 0):
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9264 instance = UploadInstance(_REMOTE, 'DummyCT.dcm') ['ID']
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9265 patient = DoGet(_REMOTE, '/instances/%s/patient' % instance) ['ID']
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9266 study = DoGet(_REMOTE, '/instances/%s/study' % instance) ['ID']
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9267
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9268 # 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
9269 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
9270
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9271 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
9272 self.assertEqual('KNIX', a[0]['RequestedTags']['PatientName'])
1a4eb582cf03 skip tests for next version
Alain Mazy <am@osimis.io>
parents: 469
diff changeset
9273 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
9274
455
f53cd250becc test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 449
diff changeset
9275 def test_dicomweb_jpeg2k_implicit(self):
f53cd250becc test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 449
diff changeset
9276 # This is a file encoded using 1.2.840.10008.1.2.4.90 transfer
457
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 455
diff changeset
9277 # 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
9278 # representation. Support introduced in Orthanc 1.10.1.
f53cd250becc test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 449
diff changeset
9279 # 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
9280 a = UploadInstance(_REMOTE, '2022-03-08-RicSmi.dcm') ['ID']
f53cd250becc test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 449
diff changeset
9281 b = DoGet(_REMOTE, '/instances/%s/file' % a,
f53cd250becc test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 449
diff changeset
9282 headers = { 'Accept' : 'application/dicom+json' })
f53cd250becc test_dicomweb_jpeg2k_implicit
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 449
diff changeset
9283 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
9284 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
9285
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 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
9287 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
9288 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
9289
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 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
9291 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
9292 '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
9293 '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
9294 '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
9295 '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
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
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('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
9299 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
9300
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 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
9302 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
9303
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 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
9305 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
9306
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 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
9308 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
9309 self.assertEqual(j['ID'], i['ID'])
501
1b1bb8621021 /store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents: 500
diff changeset
9310
1b1bb8621021 /store: allows overriding CalledAet, Host, Port
Alain Mazy <am@osimis.io>
parents: 500
diff changeset
9311 def test_storescu_custom_host_ip_port(self):
510
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9312 if IsOrthancVersionAbove(_REMOTE, 1, 11, 3):
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9313 DropOrthanc(_LOCAL)
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9314 DropOrthanc(_REMOTE)
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9315
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9316 a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9317
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9318 # upload to self -> orthanctest shall not receive any content
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9319 DoPost(_REMOTE, '/modalities/self/store', {
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9320 'Resources' : [ a['ID']]
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9321 })
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9322 self.assertEqual(0, len(DoGet(_LOCAL, '/instances')))
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9323
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9324 # upload to self by overriding it with config from orthanctest -> orthanctest shall receive the content
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9325 c = DoGet(_REMOTE, '/modalities/orthanctest/configuration')
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9326 DoPost(_REMOTE, '/modalities/self/store', {
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9327 'LocalAet' : 'YOP',
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9328 'CalledAet' : c['AET'],
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9329 'Port' : c['Port'],
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9330 'Host' : c['Host'],
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9331 'Resources' : [ a['ID']]
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9332 })
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9333
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9334 self.assertEqual(1, len(DoGet(_LOCAL, '/instances')))
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9335
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9336 DropOrthanc(_REMOTE)
Alain Mazy <am@osimis.io>
parents: 509
diff changeset
9337 DropOrthanc(_LOCAL)
503
138d5efd4407 added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 502
diff changeset
9338
138d5efd4407 added test_rle_planar_configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 502
diff changeset
9339 def test_rle_planar_configuration(self):
531
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9340 if IsOrthancVersionAbove(_REMOTE, 1, 11, 2):
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9341 # https://groups.google.com/g/orthanc-users/c/CSVWfRasSR0/m/y1XDRXVnAgAJ
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9342 a = UploadInstance(_REMOTE, '2022-11-14-RLEPlanarConfiguration.dcm') ['ID']
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9343 uri = '/instances/%s/preview' % a
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9344 im = GetImage(_REMOTE, uri)
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9345 self.assertEqual('RGB', im.mode)
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9346 self.assertEqual(1475, im.size[0])
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9347 self.assertEqual(1475, im.size[1])
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9348 self.assertEqual('c684b0050dc2523041240bf2d26dc85e', ComputeMD5(DoGet(_REMOTE, uri)))
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9349
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9350 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9351 a = UploadInstance(_REMOTE, '2023-04-21-RLEPlanarConfigurationYBR_FULL.dcm') ['ID']
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9352 uri = '/instances/%s/preview' % a
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9353 im = GetImage(_REMOTE, uri)
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9354 pprint.pprint(im)
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9355 self.assertEqual('RGB', im.mode)
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9356 self.assertEqual(1260, im.size[0])
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9357 self.assertEqual(910, im.size[1])
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9358 self.assertEqual('07a3ea7ea08d54362f744cc5945e8743', ComputeMD5(DoGet(_REMOTE, uri)))
8a920ab91cf4 YBR_FULL RLE
Alain Mazy <am@osimis.io>
parents: 530
diff changeset
9359
512
e2ce0edb9002 /system
Alain Mazy <am@osimis.io>
parents: 511
diff changeset
9360
e2ce0edb9002 /system
Alain Mazy <am@osimis.io>
parents: 511
diff changeset
9361 def test_rest_api_write_to_file_system(self):
e2ce0edb9002 /system
Alain Mazy <am@osimis.io>
parents: 511
diff changeset
9362 if IsOrthancVersionAbove(_REMOTE, 1, 12, 0):
e2ce0edb9002 /system
Alain Mazy <am@osimis.io>
parents: 511
diff changeset
9363 a = UploadInstance(_REMOTE, '2022-11-14-RLEPlanarConfiguration.dcm') ['ID']
e2ce0edb9002 /system
Alain Mazy <am@osimis.io>
parents: 511
diff changeset
9364 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
9365
515
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9366 def test_overwrite_generates_stable_study(self):
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9367
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9368 # 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
9369 # 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
9370 # 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
9371 # 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
9372 # 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
9373
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9374
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9375 def GetAllStableStudyChangesIds(studyId, timeout):
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9376 # 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
9377 fromSeq = DoGet(_REMOTE, '/changes')["Last"]
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9378
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9379 endTime = time.time() + timeout
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9380 newStableStudyFound = False
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9381 while not newStableStudyFound and time.time() < endTime:
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9382 time.sleep(0.1)
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9383 changes = DoGet(_REMOTE, '/changes')
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9384 stableStudyChangesIds = []
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9385
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9386 for change in changes["Changes"]:
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9387 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
9388 stableStudyChangesIds.append(change["Seq"])
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9389 if change["Seq"] > fromSeq:
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9390 newStableStudyFound = True
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9391
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9392 return stableStudyChangesIds
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9393
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9394 if True:
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9395 DropOrthanc(_REMOTE)
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9396 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
9397 # 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
9398 changes1 = GetAllStableStudyChangesIds(upload1["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9399 self.assertEqual(1, len(changes1))
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9400
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9401 # 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
9402 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
9403 changes1b = GetAllStableStudyChangesIds(upload1b["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9404 self.assertEqual(1, len(changes1b))
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9405 self.assertNotEqual(changes1[0], changes1b[0])
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9406
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9407 if True:
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9408 DropOrthanc(_REMOTE)
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9409 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
9410 # 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
9411 changes1 = GetAllStableStudyChangesIds(upload1["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9412 self.assertEqual(1, len(changes1))
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9413
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9414 # 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
9415 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
9416 json.dumps({
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9417 "Replace" : {
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9418 "InstitutionName" : "hello",
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9419 "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
9420 },
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9421 "Force": True
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9422 }),
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9423 'application/json')
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9424 upload1b = DoPost(_REMOTE, '/instances', modified, 'application/dicom')
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9425 changes1b = GetAllStableStudyChangesIds(upload1b["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9426 self.assertEqual(upload1["ParentStudy"], upload1b["ParentStudy"])
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9427 self.assertEqual(1, len(changes1b))
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9428 self.assertNotEqual(changes1[0], changes1b[0])
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
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9431 if True:
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9432 DropOrthanc(_REMOTE)
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9433 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
9434 # 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
9435 changes1 = GetAllStableStudyChangesIds(upload1["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9436 self.assertEqual(1, len(changes1))
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9437
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9438 # 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
9439 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
9440 changes2 = GetAllStableStudyChangesIds(upload2["ParentStudy"], 4)
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9441 self.assertEqual(upload1["ParentStudy"], upload2["ParentStudy"])
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9442 self.assertEqual(2, len(changes2))
5dca7ef42156 added a non-regression test wrt StableStudy
Alain Mazy <am@osimis.io>
parents: 512
diff changeset
9443 self.assertEqual(changes1[0], changes2[0])
516
Alain Mazy <am@osimis.io>
parents: 515 514
diff changeset
9444
513
5824f0545d5b added test_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 512
diff changeset
9445 def test_labels(self):
523
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9446 def CheckAllLabels(expected):
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9447 actual = DoGet(_REMOTE, '/tools/labels')
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9448 self.assertEqual(len(actual), len(expected))
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9449 for i in expected:
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9450 self.assertTrue(i in actual)
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9451 for i in actual:
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9452 self.assertTrue(i in expected)
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9453
517
692f2956ddab test HasLabels in /system
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 516
diff changeset
9454 if (IsOrthancVersionAbove(_REMOTE, 1, 12, 0) and
692f2956ddab test HasLabels in /system
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 516
diff changeset
9455 DoGet(_REMOTE, '/system') ['HasLabels']):
513
5824f0545d5b added test_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 512
diff changeset
9456 u = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
5824f0545d5b added test_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 512
diff changeset
9457 patient = DoGet(_REMOTE, '/instances/%s/patient' % u) ['ID']
5824f0545d5b added test_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 512
diff changeset
9458 study = DoGet(_REMOTE, '/instances/%s/study' % u) ['ID']
5824f0545d5b added test_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 512
diff changeset
9459 series = DoGet(_REMOTE, '/instances/%s/series' % u) ['ID']
5824f0545d5b added test_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 512
diff changeset
9460
5824f0545d5b added test_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 512
diff changeset
9461 for base in [ '/instances/%s' % u,
5824f0545d5b added test_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 512
diff changeset
9462 '/series/%s' % series,
5824f0545d5b added test_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 512
diff changeset
9463 '/studies/%s' % study,
519
b1991073e4d1 test alphanumeric labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 518
diff changeset
9464 '/patients/%s' % patient ]:
521
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9465
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9466 # no tags by default
513
5824f0545d5b added test_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 512
diff changeset
9467 self.assertEqual(0, len(DoGet(_REMOTE, base) ['Labels']))
523
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9468 CheckAllLabels([])
521
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9469
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9470 # 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
9471 self.assertRaises(Exception, lambda: DoGet(_REMOTE, '%s/labels/hello' % base))
521
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9472
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9473 # 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
9474 self.assertEqual('', DoDelete(_REMOTE, '%s/labels/hello' % base))
5824f0545d5b added test_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 512
diff changeset
9475 self.assertEqual(0, len(DoGet(_REMOTE, base) ['Labels']))
521
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9476
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9477 # Not an alphanumeric label -> 400
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9478 self.assertRaises(Exception, lambda: DoPut(_REMOTE, '%s/labels/@' % base))
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9479
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9480 # add a tag
513
5824f0545d5b added test_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 512
diff changeset
9481 self.assertEqual('', DoPut(_REMOTE, '%s/labels/hello' % base))
521
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9482 self.assertEqual(1, len(DoGet(_REMOTE, base) ['Labels']))
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9483 self.assertEqual('hello', DoGet(_REMOTE, base) ['Labels'][0])
523
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9484 CheckAllLabels([ 'hello' ])
521
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9485
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9486 # double tagging does not generate any error
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9487 self.assertEqual('', DoPut(_REMOTE, '%s/labels/hello' % base))
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9488 self.assertEqual('', DoGet(_REMOTE, '%s/labels/hello' % base))
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9489 self.assertEqual(1, len(DoGet(_REMOTE, base) ['Labels']))
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9490 self.assertEqual('hello', DoGet(_REMOTE, base) ['Labels'][0])
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9491
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9492 # add a second tag
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9493 self.assertEqual('', DoPut(_REMOTE, '%s/labels/world' % base))
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9494 self.assertEqual('', DoGet(_REMOTE, '%s/labels/world' % base))
513
5824f0545d5b added test_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 512
diff changeset
9495 self.assertEqual('', DoGet(_REMOTE, '%s/labels/hello' % base))
521
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9496 self.assertEqual(2, len(DoGet(_REMOTE, base) ['Labels']))
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9497 self.assertIn(DoGet(_REMOTE, base) ['Labels'][0], ['hello', 'world'])
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9498 self.assertIn(DoGet(_REMOTE, base) ['Labels'][1], ['hello', 'world'])
523
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9499 CheckAllLabels([ 'hello', 'world' ])
521
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9500
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9501 # delete the first tag
513
5824f0545d5b added test_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 512
diff changeset
9502 self.assertEqual('', DoDelete(_REMOTE, '%s/labels/hello' % base))
521
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9503 self.assertEqual(1, len(DoGet(_REMOTE, base) ['Labels']))
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9504 self.assertEqual('world', DoGet(_REMOTE, base) ['Labels'][0])
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9505 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
9506 CheckAllLabels([ 'world' ])
521
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9507
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9508 # delete the second tag
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9509 self.assertEqual('', DoDelete(_REMOTE, '%s/labels/world' % base))
513
5824f0545d5b added test_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 512
diff changeset
9510 self.assertEqual(0, len(DoGet(_REMOTE, base) ['Labels']))
521
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9511 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
9512 CheckAllLabels([ ])
521
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9513
8114f67e0f7f labels: doc
Alain Mazy <am@osimis.io>
parents: 519
diff changeset
9514 # test all valid chars
523
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9515 VALID = r'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-'
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9516 self.assertEqual('', DoPut(_REMOTE, '%s/labels/%s' % (base, VALID)))
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9517 CheckAllLabels([ VALID ])
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9518 DoDelete(_REMOTE, '%s/labels/%s' % (base, VALID))
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9519 CheckAllLabels([ ])
767840cb4d3f test /tools/labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 522
diff changeset
9520
517
692f2956ddab test HasLabels in /system
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 516
diff changeset
9521 else:
692f2956ddab test HasLabels in /system
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 516
diff changeset
9522 print("Your database backend doesn't support labels")
518
43a323de0b02 added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 517
diff changeset
9523
43a323de0b02 added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 517
diff changeset
9524 def test_find_labels(self):
548
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9525 def Execute(labels, constraint, query = { }, level='Instance'):
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9526 return DoPost(_REMOTE, '/tools/find', { 'Level' : level,
525
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9527 'Query' : query,
522
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 521
diff changeset
9528 'Labels' : labels,
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 521
diff changeset
9529 'LabelsConstraint' : constraint, })
518
43a323de0b02 added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 517
diff changeset
9530
43a323de0b02 added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 517
diff changeset
9531 if (IsOrthancVersionAbove(_REMOTE, 1, 12, 0) and
43a323de0b02 added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 517
diff changeset
9532 DoGet(_REMOTE, '/system') ['HasLabels']):
548
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9533 u = UploadInstance(_REMOTE, 'DummyCT.dcm')
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9534 studyId = u["ParentStudy"]
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9535 seriesId = u["ParentSeries"]
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9536 patientId = u["ParentPatient"]
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9537 u = u["ID"]
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9538 self.assertEqual(1, len(Execute([ 'a' ], 'None')))
518
43a323de0b02 added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 517
diff changeset
9539
522
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 521
diff changeset
9540 # The instance has no label
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([], 'All')))
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([], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 521
diff changeset
9543 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
9544 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
9545 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
9546 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
9547 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
9548 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
9549 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
9550 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
9551 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
9552 self.assertEqual(1, len(Execute([ 'a', 'b' ], 'None')))
518
43a323de0b02 added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 517
diff changeset
9553
43a323de0b02 added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 517
diff changeset
9554 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
9555 # The instance has label "a"
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([], 'All')))
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([], 'Any')))
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([], 'None')))
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' ], 'All')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 521
diff changeset
9560 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
9561 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
9562 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
9563 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
9564 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
9565 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
9566 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
9567 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'None')))
518
43a323de0b02 added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 517
diff changeset
9568
525
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9569 self.assertEqual(0, len(Execute([ 'a' ], 'All', { 'PatientID' : 'nope' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9570 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'PatientID' : '' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9571 self.assertEqual(0, len(Execute([ 'a' ], 'All', { 'StudyInstanceUID' : 'nope' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9572 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'StudyInstanceUID' : '' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9573 self.assertEqual(0, len(Execute([ 'a' ], 'All', { 'SeriesInstanceUID' : 'nope' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9574 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'SeriesInstanceUID' : '' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9575 self.assertEqual(0, len(Execute([ 'a' ], 'All', { 'SOPInstanceUID' : 'nope' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9576 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'SOPInstanceUID' : '' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9577
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9578 self.assertEqual(1, len(Execute([ 'a' ], 'All', { 'PatientID' : 'ozp00SjY2xG' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9579
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9580 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
9581 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
9582 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
9583 self.assertEqual(1, len(Execute([ 'a' ], 'All', {
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9584 'PatientID' : 'ozp00SjY2xG',
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9585 '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
9586 '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
9587 '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
9588 })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9589
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9590 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'PatientID' : 'nope' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9591 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'PatientID' : '' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9592 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'StudyInstanceUID' : 'nope' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9593 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'StudyInstanceUID' : '' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9594 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SeriesInstanceUID' : 'nope' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9595 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SeriesInstanceUID' : '' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9596 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SOPInstanceUID' : 'nope' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9597 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'SOPInstanceUID' : '' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9598
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9599 self.assertEqual(0, len(Execute([ 'b' ], 'All', { 'PatientID' : 'ozp00SjY2xG' })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9600 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
9601 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
9602 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
9603 self.assertEqual(0, len(Execute([ 'b' ], 'All', {
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9604 'PatientID' : 'ozp00SjY2xG',
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9605 '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
9606 '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
9607 '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
9608 })))
b60a0cc28c34 added test
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 523
diff changeset
9609
518
43a323de0b02 added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 517
diff changeset
9610 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
9611 # 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
9612 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
9613 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
9614 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
9615 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
9616 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
9617 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
9618 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
9619 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
9620 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
9621 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
9622 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
9623 self.assertEqual(0, len(Execute([ 'a', 'b' ], 'None')))
524
0699890b9961 more tests for label
Alain Mazy <am@osimis.io>
parents: 523
diff changeset
9624 self.assertEqual(0, len(Execute([ 'b', 'c' ], 'All')))
0699890b9961 more tests for label
Alain Mazy <am@osimis.io>
parents: 523
diff changeset
9625 self.assertEqual(1, len(Execute([ 'b', 'c' ], 'Any')))
0699890b9961 more tests for label
Alain Mazy <am@osimis.io>
parents: 523
diff changeset
9626 self.assertEqual(0, len(Execute([ 'b', 'c' ], 'None')))
0699890b9961 more tests for label
Alain Mazy <am@osimis.io>
parents: 523
diff changeset
9627 self.assertEqual(0, len(Execute([ 'c', 'd' ], 'All')))
0699890b9961 more tests for label
Alain Mazy <am@osimis.io>
parents: 523
diff changeset
9628 self.assertEqual(0, len(Execute([ 'c', 'd' ], 'Any')))
0699890b9961 more tests for label
Alain Mazy <am@osimis.io>
parents: 523
diff changeset
9629 self.assertEqual(1, len(Execute([ 'c', 'c' ], 'None')))
518
43a323de0b02 added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 517
diff changeset
9630
43a323de0b02 added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 517
diff changeset
9631 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
9632 # The instance has label "b"
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([], 'All')))
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([], 'Any')))
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 521
diff changeset
9635 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
9636 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
9637 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
9638 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
9639 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
9640 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
9641 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
9642 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
9643 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
9644 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
9645
fce9e90acdc2 replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 521
diff changeset
9646 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
9647 # 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
9648 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
9649 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
9650 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
9651 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
9652 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
9653 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
9654 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
9655 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
9656 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
9657 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
9658 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
9659 self.assertEqual(1, len(Execute([ 'a', 'b' ], 'None')))
548
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
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9662 # 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
9663 DoPut(_REMOTE, '/series/%s/labels/b' % seriesId)
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9664 self.assertEqual(1, len(Execute([ 'a' ], 'None', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9665 '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
9666 }, 'Series')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9667 self.assertEqual(0, len(Execute([ 'a' ], 'Any', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9668 '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
9669 }, 'Series')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9670 self.assertEqual(1, len(Execute([ 'b' ], 'Any', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9671 '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
9672 }, 'Series')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9673 self.assertEqual(1, len(Execute([ 'b' ], 'All', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9674 '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
9675 }, 'Series')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9676 self.assertEqual(1, len(Execute([ 'a' ], 'None', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9677 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9678 }, 'Series')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9679 self.assertEqual(0, len(Execute([ 'a' ], 'Any', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9680 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9681 }, 'Series')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9682 self.assertEqual(1, len(Execute([ 'b' ], 'Any', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9683 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9684 }, 'Series')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9685 self.assertEqual(1, len(Execute([ 'b' ], 'All', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9686 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9687 }, 'Series')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9688
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9689 # 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
9690 DoPut(_REMOTE, '/studies/%s/labels/b' % studyId)
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9691 self.assertEqual(1, len(Execute([ 'a' ], 'None', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9692 '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
9693 }, 'Study')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9694 self.assertEqual(0, len(Execute([ 'a' ], 'Any', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9695 '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
9696 }, 'Study')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9697 self.assertEqual(1, len(Execute([ 'b' ], 'Any', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9698 '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
9699 }, 'Study')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9700 self.assertEqual(1, len(Execute([ 'b' ], 'All', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9701 '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
9702 }, 'Study')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9703 self.assertEqual(1, len(Execute([ 'a' ], 'None', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9704 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9705 }, 'Study')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9706 self.assertEqual(0, len(Execute([ 'a' ], 'Any', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9707 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9708 }, 'Study')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9709 self.assertEqual(1, len(Execute([ 'b' ], 'Any', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9710 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9711 }, 'Study')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9712 self.assertEqual(1, len(Execute([ 'b' ], 'All', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9713 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9714 }, 'Study')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9715
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9716 # tests at patient levels
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9717 DoPut(_REMOTE, '/patients/%s/labels/b' % patientId)
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9718 self.assertEqual(1, len(Execute([ 'a' ], 'None', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9719 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9720 }, 'Patient')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9721 self.assertEqual(0, len(Execute([ 'a' ], 'Any', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9722 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9723 }, 'Patient')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9724 self.assertEqual(1, len(Execute([ 'b' ], 'Any', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9725 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9726 }, 'Patient')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9727 self.assertEqual(1, len(Execute([ 'b' ], 'All', {
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9728 'PatientID' : 'ozp00SjY2xG',
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9729 }, 'Patient')))
3933237d1958 more tools/find tests
Alain Mazy <am@osimis.io>
parents: 547
diff changeset
9730
518
43a323de0b02 added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 517
diff changeset
9731 else:
43a323de0b02 added test_find_labels
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 517
diff changeset
9732 print("Your database backend doesn't support labels")
527
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
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9735 def test_numeric_metadata(self):
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9736 if IsOrthancVersionAbove(_REMOTE, 1, 12, 0):
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9737 instance = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID']
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9738 study = DoGet(_REMOTE, '/instances/%s/study' % instance)['ID']
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9739
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9740 m = DoGet(_REMOTE, '/studies/%s/metadata' % study)
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9741 self.assertEqual(2, len(m))
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9742 self.assertTrue('LastUpdate' in m)
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9743 self.assertTrue('MainDicomTagsSignature' in m)
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9744 lastUpdate = DoGet(_REMOTE, '/studies/%s/metadata/%s' % (study, 'LastUpdate'))
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9745 signature = DoGet(_REMOTE, '/studies/%s/metadata/%s' % (study, 'MainDicomTagsSignature'))
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9746
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9747 m = DoGet(_REMOTE, '/studies/%s/metadata?numeric' % study)
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9748 self.assertEqual(2, len(m))
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9749 self.assertTrue(7 in m) # MetadataType_LastUpdate
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9750 self.assertTrue(15 in m) # MetadataType_MainDicomTagsSignature
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9751 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
9752 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
9753
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9754 m = DoGet(_REMOTE, '/studies/%s/metadata?expand' % study)
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9755 self.assertEqual(2, len(m))
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9756 self.assertTrue('LastUpdate' in m)
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9757 self.assertTrue('MainDicomTagsSignature' in m)
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9758 self.assertEqual(lastUpdate, m['LastUpdate'])
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9759 self.assertEqual(signature, m['MainDicomTagsSignature'])
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9760
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9761 m = DoGet(_REMOTE, '/studies/%s/metadata?expand&numeric' % study)
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9762 self.assertEqual(2, len(m))
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9763 self.assertTrue('7' in m)
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9764 self.assertTrue('15' in m)
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9765 self.assertEqual(lastUpdate, m['7'])
86456045ac80 added test_numeric_metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 526
diff changeset
9766 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
9767
31f70bfd86a7 Fix orphan files remaining in storage when working with MaximumStorageSize
Alain Mazy <am@osimis.io>
parents: 533
diff changeset
9768 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
9769 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
9770 (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
9771 self.assertEqual('404', headers['status'])
538
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9772
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9773 def test_delete_updates_parents_last_update_metadata(self):
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9774 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9775 i = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9776 j = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0002.dcm')
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9777
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9778 #instanceLastUpdate1 = DoGet(_REMOTE, '/instances/%s/metadata/LastUpdate' % i['ID'])
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9779 seriesLastUpdate1 = DoGet(_REMOTE, '/series/%s/metadata/LastUpdate' % i['ParentSeries'])
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9780 studyLastUpdate1 = DoGet(_REMOTE, '/studies/%s/metadata/LastUpdate' % i['ParentStudy'])
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9781 patientLastUpdate1 = DoGet(_REMOTE, '/patients/%s/metadata/LastUpdate' % i['ParentPatient'])
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9782
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9783 time.sleep(1.01)
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9784 DoDelete(_REMOTE, '/instances/%s' % j['ID'])
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9785
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9786 #instanceLastUpdate2 = DoGet(_REMOTE, '/instances/%s/metadata/LastUpdate' % i['ID'])
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9787 seriesLastUpdate2 = DoGet(_REMOTE, '/series/%s/metadata/LastUpdate' % i['ParentSeries'])
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9788 studyLastUpdate2 = DoGet(_REMOTE, '/studies/%s/metadata/LastUpdate' % i['ParentStudy'])
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9789 patientLastUpdate2 = DoGet(_REMOTE, '/patients/%s/metadata/LastUpdate' % i['ParentPatient'])
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9790
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9791 #self.assertEqual(instanceLastUpdate1, instanceLastUpdate2)
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9792 self.assertNotEqual(seriesLastUpdate1, seriesLastUpdate2)
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9793 self.assertNotEqual(studyLastUpdate1, studyLastUpdate2)
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9794 self.assertNotEqual(patientLastUpdate1, patientLastUpdate2)
7a83a8f087c7 LastUpdate when deleting resources
Alain Mazy <am@osimis.io>
parents: 535
diff changeset
9795
554
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9796 def test_pixel_data_vr(self):
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9797 def Check(path, hasPixelData, hasMetadata, expectedVR):
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9798 i = UploadInstance(_REMOTE, path) ['ID']
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9799 m = DoGet(_REMOTE, '/instances/%s/metadata?expand' % i)
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9800 if hasMetadata:
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9801 self.assertTrue('PixelDataVR' in m)
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9802 self.assertEqual(expectedVR, m['PixelDataVR'])
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9803 else:
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9804 self.assertFalse('PixelDataVR' in m)
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9805
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9806 if hasPixelData:
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9807 self.assertTrue('PixelDataOffset' in m)
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9808 j = DoGet(_REMOTE, '/instances/%s/file?expand' % i, headers = {
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9809 'Accept': 'application/dicom+json'
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9810 })
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9811 self.assertEqual(expectedVR, j['7FE00010']['vr'])
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9812
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9813 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9814 # File without pixel data
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9815 Check('MarekLatin2.dcm', False, False, None)
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9816
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9817 # Those files are badly formatted, and should be 'OB'
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9818 # according to the DICOM standard => medata is present
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9819 Check('Issue143.dcm', True, True, 'OW') # Little Endian Explicit, 8bpp
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9820 Check('KarstenHilbertRF.dcm', True, True, 'OW') # Little Endian Explicit, 8bpp
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9821 Check('PilatesArgenturGEUltrasoundOsiriX.dcm', True, True, 'OW') # Little Endian Explicit, 8bpp
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9822
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9823 # Those files are formatted as expected
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9824 Check('ColorTestMalaterre.dcm', True, False, 'OW') # Implicit Little Endian, 8bpp
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9825 Check('Issue94.dcm', True, False, 'OW') # Implicit Little Endian, 16bpp
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9826 Check('TransferSyntaxes/1.2.840.10008.1.2.1.dcm', True, False, 'OB') # Explicit Little Endian, 8bpp
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9827 Check('Phenix/IM-0001-0001.dcm', True, False, 'OW') # Explicit Little Endian, 16bpp
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9828 Check('TransferSyntaxes/1.2.840.10008.1.2.2.dcm', True, False, 'OB') # Explicit Big Endian, 8bpp
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9829 Check('TransferSyntaxes/1.2.840.10008.1.2.4.50.dcm', True, False, 'OB') # JPEG
ede184638961 added test_pixel_data_vr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 548
diff changeset
9830 Check('Knee/T1/IM-0001-0001.dcm', True, False, 'OB') # JPEG2k
565
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9831
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9832 def test_encapsulate_stl(self):
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9833 if IsOrthancVersionAbove(_REMOTE, 1, 12, 1):
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9834 stl = b'Hello, world'
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9835
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9836 i = DoPost(_REMOTE, '/tools/create-dicom', json.dumps({
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9837 'Content' : 'data:model/stl;base64,%s' % base64.b64encode(stl).decode(),
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9838 'Force' : True,
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9839 'Tags' : {
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9840 'PatientName' : 'Jodogne'
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9841 }
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9842 })) ['ID']
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9843
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9844 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9845 self.assertEqual('Jodogne', tags['PatientName'])
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9846 self.assertEqual('M3D', tags['Modality'])
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9847 self.assertEqual('model/stl', tags['MIMETypeOfEncapsulatedDocument'])
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9848 self.assertEqual('1.2.840.10008.5.1.4.1.1.104.3', tags['SOPClassUID'])
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9849
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9850 i = DoPost(_REMOTE, '/tools/create-dicom', json.dumps({
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9851 'Content' : 'data:model/mtl;base64,%s' % base64.b64encode(stl).decode(),
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9852 'Tags' : {}
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9853 })) ['ID']
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9854
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9855 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9856 self.assertFalse('PatientName' in tags)
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9857 self.assertEqual('M3D', tags['Modality'])
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9858 self.assertEqual('model/mtl', tags['MIMETypeOfEncapsulatedDocument'])
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9859 self.assertEqual('1.2.840.10008.5.1.4.1.1.104.5', tags['SOPClassUID'])
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9860
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9861 i = DoPost(_REMOTE, '/tools/create-dicom', json.dumps({
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9862 'Content' : 'data:model/obj;base64,%s' % base64.b64encode(stl).decode(),
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9863 'Tags' : {}
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9864 })) ['ID']
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9865
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9866 tags = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9867 self.assertFalse('PatientName' in tags)
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9868 self.assertEqual('M3D', tags['Modality'])
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9869 self.assertEqual('model/obj', tags['MIMETypeOfEncapsulatedDocument'])
855c3720902a added test_encapsulate_stl
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 557
diff changeset
9870 self.assertEqual('1.2.840.10008.5.1.4.1.1.104.4', tags['SOPClassUID'])